From c01c3948066ef73e3c46d3ff8554640916d6404e Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 22 Mar 2023 11:46:53 +0100 Subject: [PATCH] meta-digi: rework distro features configuration Instead of changing POKY_DEFAULT_DISTRO_FEATURES, do the distro features configuration directly in the DISTRO_FEATURES variable. Also, add a couple of variables (MACHINE_DISTRO_FEATURES_ADD/REMOVE) that allow machines for extra tweaking the distro features. While on it, clean up some distro features: - pulseaudio: already added by DISTRO_FEATURES_BACKFILL - bluez5, splashscreen, initrd, gplv3: not used (dead code) Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 26 ++------------- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 33 ++----------------- meta-digi-arm/conf/machine/include/ccimx6.inc | 5 ++- .../conf/machine/include/ccimx6ul.inc | 3 ++ .../conf/machine/include/ccimx8m.inc | 4 --- .../conf/machine/include/ccimx8x.inc | 4 --- .../conf/machine/include/ccimx93.inc | 4 +-- .../conf/machine/include/imx-digi-base.inc | 3 -- meta-digi-dey/conf/distro/dey.conf | 13 ++++---- 9 files changed, 20 insertions(+), 75 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 957c25b07..312cade48 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -144,29 +144,9 @@ XBEE_TTY ?= "ttySTM2" # ========================================================================= ALSA_LIST = "" -# ========================================================================= -# DISTRO features -# ========================================================================= -DISTRO_FEATURES:remove = " opengl " -DISTRO_FEATURES:remove = " x11 " - -# add support of optee -DISTRO_FEATURES:append = " optee " - -# add support of splashscreen -#DISTRO_FEATURES:append = " splashscreen " - -# add support of systemd -DISTRO_FEATURES:append = " systemd " - -# add support of efi -DISTRO_FEATURES:append = " efi " - -# add support of InitRD installation package -DISTRO_FEATURES:append = " initrd " - -# add support to pulseaudio -DISTRO_FEATURES:append = "pulseaudio" +# Per-machine DISTRO_FEATURES customization +MACHINE_DISTRO_FEATURES_ADD = "efi optee" +MACHINE_DISTRO_FEATURES_REMOVE = "gstreamer opengl vulkan wayland x11" # Disable use of vendorfs partition ST_VENDORFS = "0" diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 6b41a8368..4167d6ef5 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -148,36 +148,9 @@ XBEE_TTY ?= "ttySTM2" # ========================================================================= ALSA_LIST = "" -# ========================================================================= -# DISTRO features -# ========================================================================= -DISTRO_FEATURES:append = " opengl" -DISTRO_FEATURES:remove = " x11 " -DISTRO_FEATURES:append = " gplv3 " - -# add support of gstreamer -DISTRO_FEATURES:append = " gstreamer " - -# add support of optee -DISTRO_FEATURES:append = " optee " - -# add support of splashscreen -DISTRO_FEATURES:append = " splashscreen " - -# add support of wayland -DISTRO_FEATURES:append = " wayland pam " - -# add support of systemd -DISTRO_FEATURES:append = " systemd " - -# add support of efi -DISTRO_FEATURES:append = " efi " - -# add support of InitRD installation package -DISTRO_FEATURES:append = " initrd " - -# add support to pulseaudio -DISTRO_FEATURES:append = "pulseaudio" +# Per-machine DISTRO_FEATURES customization +MACHINE_DISTRO_FEATURES_ADD = "efi optee" +MACHINE_DISTRO_FEATURES_REMOVE = "vulkan x11" # Disable use of vendorfs partition ST_VENDORFS = "0" diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 23f07ccb0..38882221d 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -33,9 +33,8 @@ MACHINE_FEATURES += "accel-graphics wifi bluetooth pci" # TrustFence TRUSTFENCE_SIGN_MODE = "HAB" -# Adding 'wayland' along with 'x11' enables the xwayland backend -# Adding pam is required for SELinux functionality -DISTRO_FEATURES:append = " wayland pam" +# Per-machine DISTRO_FEATURES customization +MACHINE_DISTRO_FEATURES_REMOVE = "vulkan" # SWUpdate sw-description configuration BOOTFS_EXT ?= ".boot.vfat" diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index d3d18ed42..91c661949 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -47,6 +47,9 @@ MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191" # TrustFence TRUSTFENCE_SIGN_MODE = "HAB" +# Per-machine DISTRO_FEATURES customization +MACHINE_DISTRO_FEATURES_REMOVE = "vulkan wayland" + # SWUpdate sw-description configuration BOOTFS_EXT ?= ".boot.ubifs" ROOTFS_EXT ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", ".squashfs", ".ubifs", d)}' diff --git a/meta-digi-arm/conf/machine/include/ccimx8m.inc b/meta-digi-arm/conf/machine/include/ccimx8m.inc index 5d7b62240..b16546ddf 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8m.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8m.inc @@ -52,10 +52,6 @@ MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip mca optee" # TrustFence TRUSTFENCE_SIGN_MODE = "HAB" -# Adding 'wayland' along with 'x11' enables the xwayland backend -# Vulkan is necessary for wayland to build -DISTRO_FEATURES:append = " wayland vulkan systemd pam" - # SWUpdate sw-description configuration BOOTFS_EXT ?= ".boot.vfat" ROOTFS_EXT ?= ".ext4.gz" diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 4a18f5d11..de3e67177 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -69,10 +69,6 @@ MACHINE_FEATURES += "accel-graphics wifi bluetooth cryptochip pci mca" # TrustFence TRUSTFENCE_SIGN_MODE = "AHAB" -# Adding 'wayland' along with 'x11' enables the xwayland backend -# Vulkan is necessary for wayland to build -DISTRO_FEATURES:append = " wayland vulkan systemd pam" - # SWUpdate sw-description configuration BOOTFS_EXT ?= ".boot.vfat" ROOTFS_EXT ?= ".ext4.gz" diff --git a/meta-digi-arm/conf/machine/include/ccimx93.inc b/meta-digi-arm/conf/machine/include/ccimx93.inc index 55243d83a..92559f51a 100644 --- a/meta-digi-arm/conf/machine/include/ccimx93.inc +++ b/meta-digi-arm/conf/machine/include/ccimx93.inc @@ -62,8 +62,8 @@ BT_TTY ?= "ttyLP0" # Add additional firmware MACHINE_FIRMWARE:append = " ethos-u-firmware" -# Adding 'wayland' along with 'x11' enables the xwayland backend -DISTRO_FEATURES:append = " wayland pam" +# Per-machine DISTRO_FEATURES customization +MACHINE_DISTRO_FEATURES_REMOVE = "vulkan" # SWUpdate sw-description configuration BOOTFS_EXT ?= ".boot.vfat" diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index e0492d86a..71f58f7bc 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -292,9 +292,6 @@ MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" # IMX specific udev extra rules added when device manager is systemd/udev UDEV_EXTRA_RULES:append = " udev-rules-imx" -# Add a generic gstreamer distro feature for all IMX platforms -DISTRO_FEATURES:append = " gstreamer" - # U-Boot 2017.X requires a specific dtc version. PREFERRED_VERSION_dtc-native:ccimx6 ?= "1.4.5" PREFERRED_VERSION_nativesdk-dtc:ccimx6 ?= "1.4.5" diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 227a01230..eab3cf9bf 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -10,15 +10,16 @@ MAINTAINER = "Digi Support " TARGET_VENDOR = "-dey" -POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland bluez5 cellular" POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-dey-core" POKY_DEFAULT_EXTRA_RRECOMMENDS = "" -# Removed DISTRO_FEATURES -# 'wayland' -> only supported on the i.MX8 QXP -# 'ptest' -> fails to build QT5 toolchain -DISTRO_FEATURES_DEFAULT:remove = "3g nfc nfs zeroconf" -POKY_DEFAULT_DISTRO_FEATURES:remove = "ptest wayland" +# +# Rework distro features for DEY distribution +# +MACHINE_DISTRO_FEATURES_ADD ?= "" +MACHINE_DISTRO_FEATURES_REMOVE ?= "" +DISTRO_FEATURES:append = " cellular gstreamer pam ${MACHINE_DISTRO_FEATURES_ADD}" +DISTRO_FEATURES:remove = "3g nfc nfs ptest zeroconf ${MACHINE_DISTRO_FEATURES_REMOVE}" GRAPHICAL_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \