@@ -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}"
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. Signed-off-by: Paul Barker <paul@pbarker.dev> --- meta-poky/conf/distro/poky-tiny.conf | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)