Change master to Magic Marlin

[AGL/meta-agl.git] / meta-agl-core / conf / distro / poky-agl.conf

diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 344da3e..e13dff4 100644 (file)
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -6,9 +6,9 @@ DISTRO_NAME = "Automotive Grade Linux"
 
 
 # Release flags
-DISTRO_CODENAME = "koi"
+DISTRO_CODENAME = "marlin"
 AGL_BRANCH = "master"
-AGLVERSION = "10.92.0"
+AGLVERSION = "12.90.0"
 # switch  devel/release
 AGLRELEASETYPE ?= "agldevelopment"
 #AGLRELEASETYPE ?= "aglrelease"
@@ -38,7 +38,6 @@ INHERIT += "reproducible_build"
 
 # SDK
 SDK_VENDOR = "-aglsdk"
-SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
 # SDKPATH is the folder where the SDK is going to be installed
 # Due to an issue with the qt5 environment (see SPEC-1667),
@@ -51,10 +50,23 @@ MAINTAINER = "AGL https://lists.automotivelinux.org/g/agl-dev-community"
 TARGET_VENDOR = "-agl"
 
 # Override these in poky based distros
-AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5 3g polkit"
+AGL_DEFAULT_DISTRO_FEATURES = "largefile opengl wayland pam bluetooth bluez5 3g polkit"
 POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}"
 OVERRIDES .= ":${DISTRO_CODENAME}"
 
+DISTRO_FEATURES_remove = "x11"
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
+
+INIT_MANAGER = "systemd"
+# Override default of "systemd-compat-units"
+VIRTUAL-RUNTIME_initscripts = ""
+# Override default of "busybox-syslog"
+VIRTUAL-RUNTIME_base-utils-syslog = ""
+
+# network manager to use (possible values: systemd, connman)
+VIRTUAL-RUNTIME_net_manager = "connman"
+
+
 QEMU_TARGETS ?= "arm aarch64 i386 x86_64 riscv64"
 # Other QEMU_TARGETS "mips mips64 mips64el ppc sh4"
 
@@ -90,31 +102,6 @@ https://.*/.*    http://download.automotivelinux.org/AGL/mirror/  \n \
 # Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=HEAD
 CONNECTIVITY_CHECK_URIS ?= ""
 
-PREFERRED_PROVIDER_udev ?= "systemd"
-PREFERRED_PROVIDER_udev-utils ?= "systemd"
-
-VIRTUAL-RUNTIME_init_manager = "systemd"
-VIRTUAL-RUNTIME_initscripts = ""
-
-# network manager to use (possible values: systemd, connman)
-VIRTUAL-RUNTIME_net_manager = "connman" 
-
-DISTRO_FEATURES_APPEND = " "
-DISTRO_FEATURES_remove = "x11"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit pulseaudio"
-
-# Prefer GStreamer 1.16.x by default
-PREFERRED_VERSION_gstreamer1.0              ?= "1.16.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad  ?= "1.16.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.16.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.16.%"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.16.%"
-PREFERRED_VERSION_gstreamer1.0-libav        ?= "1.16.%"
-PREFERRED_VERSION_gstreamer1.0-omx          ?= "1.16.%"
-
-# Prefer libjpeg-turbo
-PREFERRED_PROVIDER_jpeg = "libjpeg-turbo"
-
 # using multiple BSP layers causes dangling bbappends in meta-agl-bsp
 # turn it into a warning
 #BB_DANGLINGAPPENDS_WARNONLY = "1"
@@ -159,19 +146,12 @@ AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz"
 
 # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this)
 #
-IMAGE_FSTYPES := "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
-INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}"
+IMAGE_FSTYPES = "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
+INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}"
 #
 # THE FUTURE is 'wic'
 # IMAGE_FSTYPES_append = " wic"
 
-# enable the packagemanagement
-IMAGE_FEATURES =+ "package-management"
-PACKAGE_FEED_URIS = "http://192.168.7.1:8000/tmp/deploy/"
-PACKAGE_FEED_BASE_PATHS = "rpm"
-PACKAGE_FEED_ARCHS = ""
-#${PACKAGE_ARCHS}"
-
 # Complementary package definitions for agl-test-wgt and agl-devel-wgt
 # image features
 COMPLEMENTARY_GLOB[agl-test-wgt] = '*-test'