@@ -26,7 +26,7 @@ DISTRO_FEATURES_OPTED_OUT:append:microblaze = "seccomp"
DISTRO_FEATURES_OPTED_OUT:append:loongarch64 = "seccomp"
DISTRO_FEATURES_DEFAULTS ?= " \
- acl alsa bluetooth debuginfod ext2 ipv4 ipv6 usbgadget usbhost \
+ acl alsa bluetooth debuginfod ext2 ipv4 ipv6 \
wifi xattr nfs zeroconf pci 3g nfc x11 vfat seccomp pulseaudio \
gobject-introspection-data ldconfig opengl ptest multiarch wayland vulkan \
"
@@ -51,14 +51,14 @@ RDEPENDS:packagegroup-base = "\
${@bb.utils.contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', 'packagegroup-base-pcmcia', '',d)} \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'usbgadget', 'packagegroup-base-usbgadget', '',d)} \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'usbhost', 'packagegroup-base-usbhost', '',d)} \
\
${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'packagegroup-base-alsa', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'ext2', 'packagegroup-base-ext2', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'vfat', 'packagegroup-base-vfat', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'pci', 'packagegroup-base-pci', '',d)} \
- ${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', 'packagegroup-base-usbgadget', '',d)} \
- ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'packagegroup-base-usbhost', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \
@@ -199,7 +199,7 @@ RRECOMMENDS:packagegroup-base-bluetooth = "\
kernel-module-hidp \
kernel-module-hci-uart \
kernel-module-sco \
- ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \
@@ -265,7 +265,7 @@ RDEPENDS:packagegroup-base-wifi = "\
"
RRECOMMENDS:packagegroup-base-wifi = "\
- ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \
kernel-module-ieee80211-crypt \
kernel-module-ieee80211-crypt-ccmp \
kernel-module-ieee80211-crypt-tkip \
Whilst the intention was good, nobody really needs to exclude usbhost/usbgadget from a distro level any more, it is sufficient to have it as a machine feature which configuraitons could disable. At the distro level it just confuses people and looks very dated, so drop it to a machine feature only. Instead, for distro level control you could simply now do: MACHINE_FEATURES:remove = "usbgadget usbhost" Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/conf/distro/include/default-distrovars.inc | 2 +- meta/recipes-core/packagegroups/packagegroup-base.bb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)