Skip to contentSkip to conversation

Adapt poky & poky-tiny for default distro features changes

PATCH New Paul Barker 1 participant 5 messages Apr 3

lore
Share & tools
lore
#0 lore raw

cover Adapt poky & poky-tiny for default distro features changes

These patches follow up the conversion of default DISTRO_FEATURES handling in oe-core. They require the patch to support opting out of all default features [1] to be applied in oe-core first.

[1]: https://lore.kernel.org/openembedded-core/[email protected]/

---
Paul Barker (4):
poky: Drop use of DISTRO_FEATURES_DEFAULT
poky-tiny: Drop use of DISTRO_FEATURES_DEFAULT
poky-tiny: Opt out of all default distro features
poky-tiny: Simplify distro features

 meta-poky/conf/distro/poky-tiny.conf | 22 ++++++----------------
 meta-poky/conf/distro/poky.conf      |  2 +-
 2 files changed, 7 insertions(+), 17 deletions(-)

---
base-commit: ac300baea7314ea3c80f2330b2a993f729f32150
change-id: 20260403-default-features-2-1ecfb4924557

Best regards,

Signature · 1 line
Paul Barker
#1 lore raw

PATCH 1/4 poky: Drop use of DISTRO_FEATURES_DEFAULT

DISTRO_FEATURES_DEFAULT is now obsolete, default features will be appended to DISTRO_FEATURES automatically and you can now use DISTRO_FEATURES_OPTED_OUT to opt out of any features.

---
 meta-poky/conf/distro/poky.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-poky/conf/distro/poky.conf +1 -1
index 5e1dc28c25fa..968dcb3cbfa7 100644
@@ -17,7 +17,7 @@ POKY_DEFAULT_DISTRO_FEATURES = ""
 POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
 POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
 
-DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
+DISTRO_FEATURES ?= "${POKY_DEFAULT_DISTRO_FEATURES}"
 
 PREFERRED_VERSION_linux-yocto ?= "6.18%"
 PREFERRED_VERSION_linux-yocto-rt ?= "6.18%"
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/4 poky-tiny: Drop use of DISTRO_FEATURES_DEFAULT

In reply to Paul Barker

DISTRO_FEATURES_DEFAULT is now obsolete, default features will be appended to DISTRO_FEATURES automatically and you can now use DISTRO_FEATURES_OPTED_OUT to opt out of any features.

---
 meta-poky/conf/distro/poky-tiny.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-poky/conf/distro/poky-tiny.conf +2 -2
index 43c9baeba7b3..3be3b786510e 100644
@@ -76,8 +76,8 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
                    ${DISTRO_FEATURES_WIFI} \
                   "
 
-DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
-DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
+DISTRO_FEATURES:class-native = "${POKY_DEFAULT_DISTRO_FEATURES}"
+DISTRO_FEATURES:class-nativesdk = "${POKY_DEFAULT_DISTRO_FEATURES}"
 
 # enable mdev/busybox for init
 POKY_INIT_MANAGER:poky-tiny = "mdev-busybox"
Signature · 1 line
2.43.0
#3 lore raw

PATCH 3/4 poky-tiny: Opt out of all default distro features

In reply to Paul Barker

For poky-tiny, we want to directly control the list of DISTRO_FEATURES, with nothing added by default.

The previous list of backfilled distro features (before conversion to DISTRO_FEATURES_DEFAULTS & DISTRO_FEATURES_OPTED_OUT in oe-core) was:

pulseaudio gobject-introspection-data ldconfig opengl ptest multiarch wayland vulkan

Of these, we want to keep:

ldconfig - for ldconfig & ld.so.conf on target. multiarch - for multiple architecture support.
ptest - for building tests (as they aren't installed by default).

The others can go to keep poky-tiny as tiny as possible.

---
 meta-poky/conf/distro/poky-tiny.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-poky/conf/distro/poky-tiny.conf +2 -1
index 3be3b786510e..be28940dd90e 100644
@@ -63,12 +63,13 @@ IMAGE_LINGUAS = ""
 # Comment out any of the lines below to disable them in the build
 # DISTRO_FEATURES options:
 # alsa bluetooth ext2 pcmcia usbgadget usbhost wifi nfs zeroconf pci
-DISTRO_FEATURES_TINY = "pci"
+DISTRO_FEATURES_TINY = "pci ldconfig ptest multiarch"
 DISTRO_FEATURES_NET = "ipv4 ipv6"
 DISTRO_FEATURES_USB = "usbhost"
 #DISTRO_FEATURES_USBGADGET = "usbgadget"
 #DISTRO_FEATURES_WIFI = "wifi"
 
+DISTRO_FEATURES_OPTED_OUT = "*"
 DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
                    ${DISTRO_FEATURES_NET} \
                    ${DISTRO_FEATURES_USB} \
Signature · 1 line
2.43.0
#4 lore raw

PATCH 4/4 poky-tiny: Simplify distro features

In reply to Paul Barker

We can just set DISTRO_FEATURES directly for poky-tiny, it's easy for users to append to this as needed.

This change also removes "\${DISTRO_FEATURES_USBGADGET}" and "\${DISTRO_FEATURES_WIFI}" from the distro features, which were present accidentally as those variables were unset.

---
 meta-poky/conf/distro/poky-tiny.conf | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
meta-poky/conf/distro/poky-tiny.conf +3 -14
index be28940dd90e..0d8b570ede46 100644
@@ -60,21 +60,10 @@ USE_NLS = "no"
 # As we don't have native language support, don't install locales into images
 IMAGE_LINGUAS = ""
 
-# Comment out any of the lines below to disable them in the build
-# DISTRO_FEATURES options:
-# alsa bluetooth ext2 pcmcia usbgadget usbhost wifi nfs zeroconf pci
-DISTRO_FEATURES_TINY = "pci ldconfig ptest multiarch"
-DISTRO_FEATURES_NET = "ipv4 ipv6"
-DISTRO_FEATURES_USB = "usbhost"
-#DISTRO_FEATURES_USBGADGET = "usbgadget"
-#DISTRO_FEATURES_WIFI = "wifi"
-
 DISTRO_FEATURES_OPTED_OUT = "*"
-DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
-                   ${DISTRO_FEATURES_NET} \
-                   ${DISTRO_FEATURES_USB} \
-                   ${DISTRO_FEATURES_USBGADGET} \
-                   ${DISTRO_FEATURES_WIFI} \
+DISTRO_FEATURES = "pci ldconfig ptest multiarch \
+                   ipv4 ipv6 \
+                   usbhost \
                   "
 
 DISTRO_FEATURES:class-native = "${POKY_DEFAULT_DISTRO_FEATURES}"
Signature · 1 line
2.43.0