diff mbox series

[meta-oe,v3] initial configs: set initial {DISTRO|MACHINE|IMAGE}FEATUREs as weak as possible

Message ID 20221113102444.8267-1-christoph.lauer@email.de
State New
Headers show
Series [meta-oe,v3] initial configs: set initial {DISTRO|MACHINE|IMAGE}FEATUREs as weak as possible | expand

Commit Message

Christoph Lauer Nov. 13, 2022, 10:24 a.m. UTC 
From: Christoph Lauer <christoph.lauer@xtronic.de>

This gives BSP creators the flexibility to change features with weak defaults.
Non-empty FEATURES must not be weaker because then the empty weaker value from bitbake.conf might be applied.

Signed-off-by: Christoph Lauer <christoph.lauer@xtronic.de>
---
 meta/conf/bitbake.conf                        | 28 +++++++++----------
 .../distro/include/default-distrovars.inc     |  4 +--
 meta/conf/machine/include/qemu.inc            |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

--
2.17.1
diff mbox series

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index dea573986d..b2540bb3f5 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -885,31 +885,31 @@  OES_BITBAKE_CONF = "1"
 # Machine properties and packagegroup-base stuff
 ##################################################################

-MACHINE_FEATURES ?= ""
-DISTRO_FEATURES ?= ""
+MACHINE_FEATURES ??= ""
+DISTRO_FEATURES ??= ""

-DISTRO_EXTRA_RDEPENDS ?= ""
-DISTRO_EXTRA_RRECOMMENDS ?= ""
-MACHINE_EXTRA_RDEPENDS ?= ""
-MACHINE_EXTRA_RRECOMMENDS ?= ""
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+DISTRO_EXTRA_RDEPENDS ??= ""
+DISTRO_EXTRA_RRECOMMENDS ??= ""
+MACHINE_EXTRA_RDEPENDS ??= ""
+MACHINE_EXTRA_RRECOMMENDS ??= ""
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ??= ""
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ??= ""

 EXTRA_IMAGE_FEATURES ??= ""
 IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"

 # Native distro features (will always be used for -native, even if they
 # are not enabled for target)
-DISTRO_FEATURES_NATIVE ?= "x11 ipv6 xattr"
-DISTRO_FEATURES_NATIVESDK ?= "x11"
+DISTRO_FEATURES_NATIVE ??= "x11 ipv6 xattr"
+DISTRO_FEATURES_NATIVESDK ??= "x11"

 # Normally target distro features will not be applied to native builds:
 # Native distro features on this list will use the target feature value
-DISTRO_FEATURES_FILTER_NATIVE ?= "api-documentation debuginfod opengl wayland"
-DISTRO_FEATURES_FILTER_NATIVESDK ?= "api-documentation debuginfod opengl wayland"
+DISTRO_FEATURES_FILTER_NATIVE ??= "api-documentation debuginfod opengl wayland"
+DISTRO_FEATURES_FILTER_NATIVESDK ??= "api-documentation debuginfod opengl wayland"

-DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit gobject-introspection-data ldconfig"
-MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
+DISTRO_FEATURES_BACKFILL ??= "pulseaudio sysvinit gobject-introspection-data ldconfig"
+MACHINE_FEATURES_BACKFILL ??= "rtc qemu-usermode"

 COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}"
 COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index abf48f79f0..3ef8117bfa 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -19,9 +19,9 @@  DISTRO_FEATURES_DEFAULT:remove:arc = "seccomp"
 # seccomp is not yet ported to microblaze
 DISTRO_FEATURES_DEFAULT:remove:microblaze = "seccomp"

-DISTRO_FEATURES_DEFAULT ?= "acl alsa bluetooth debuginfod ext2 ipv4 ipv6 pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp"
+DISTRO_FEATURES_DEFAULT ??= "acl alsa bluetooth debuginfod ext2 ipv4 ipv6 pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp"
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}"
-IMAGE_FEATURES ?= ""
+IMAGE_FEATURES ??= ""

 COMMERCIAL_AUDIO_PLUGINS ?= ""
 # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index d9bed7708d..3cda8be06f 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -10,7 +10,7 @@  XSERVER ?= "xserver-xorg \
             xf86-video-fbdev \
             "

-MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat"
+MACHINE_FEATURES ?= "alsa bluetooth usbgadget screen vfat"

 MACHINEOVERRIDES =. "qemuall:"