meta-agl-core: update poky-agl distro configuration

Changes to match current poky:
- Remove SDK_VERSION definition since the one inherited from
  poky.conf should be fine
- Replace explicit systemd enabling with use of INIT_MANAGER variable
- Moved some of the DISTRO_FEATURES variables together to improve
  readability
- Remove gstreamer1.0* PREFERRED_VERSION overrides, as they no longer
  seem required
- Remove PREFERRED_PROVIDER_jpeg as it no longer is required

Note that these are in part cleanup to match poky dunfell, and also
to reduce the amount of changes required to support current upstream
poky master.

Bug-AGL: SPEC-3819

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I540dd97eef147201446021dbe0bda5289e34a18f
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26100
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 461ca8a..495959d 100644 (file)
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -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,21 @@ 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 = ""
+
+# 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 +100,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"