DISTRO_FEATURES: Let oe-core handle bt, usb, pci and wifi tools

By adding bluetooth, usbhost, pci and wifi to DISTRO_FEATURES and
MACHINE_FEATURES, oe-core is handling the base tools through
packagegroup-base. We can therefore remove them from our own
packagegroups.

Removing the recommendations, is not an issue, most of the
recommendations are actually kernel modules.

BugzID: 73589
This commit is contained in:
Alexandre Bard 2021-08-18 12:11:09 +02:00
parent 30125e61c0
commit 00fd0c5639
6 changed files with 2 additions and 10 deletions

View File

@ -21,7 +21,7 @@ INIT_MANAGER = "systemd"
PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule"
KERNEL_MODULE_AUTOLOAD += "cryptodev"
DISTRO_FEATURES = "bluetooth ext2 ipv4 ipv6 wifi ptest multiarch usrmerge"
DISTRO_FEATURES = "bluetooth usbhost pci ipv4 ipv6 wifi ptest multiarch usrmerge"
# The BACKFILLed features are features which were defaults in previous
# yocto versions but are now optional.

View File

@ -1,7 +1,5 @@
require netmodule-linux-image-minimal.bb
NO_RECOMMENDATIONS = "0"
require includes/image-preprocessing.inc
SUMMARY = "NetModule Linux Distro Image"

View File

@ -6,7 +6,6 @@ require packagegroup-feature.inc
PACKAGE_ARCH = "${MACHINE_ARCH}"
RDEPENDS_${PN}-base = " \
bluez5 \
${@bb.utils.contains("MACHINE_FEATURES", "tibluetooth", "tibluetooth", "", d)} \
"

View File

@ -25,7 +25,6 @@ UBLOX_WIFI = " \
RDEPENDS_${PN}-minimal = " \
wireless-regdb-static \
${@bb.utils.contains("MACHINE_FEATURES", "ti-wifi", "${TI_WIFI}", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "ath-wifi", "${ATH_WIFI}", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "ublox-wifi", "${UBLOX_WIFI}", "", d)} \
@ -34,6 +33,4 @@ RDEPENDS_${PN}-minimal = " \
RDEPENDS_${PN}-extended = " \
hostapd \
iw \
wpa-supplicant \
"

View File

@ -10,6 +10,5 @@ RDEPENDS_${PN} = " \
curl \
parted \
mmc-utils \
usbutils \
udev-rules-nmhw \
"

View File

@ -6,6 +6,7 @@ FEATURE_LEVEL = "extended"
RDEPENDS_${PN} = " \
packagegroup-nm-base \
packagegroup-base \
nmhw-auto-part \
nmhw-fwupdate \
packagegroup-system-state-framework \
@ -14,8 +15,6 @@ RDEPENDS_${PN} = " \
rng-tools \
cryptodev-module \
kernel-modules \
\
pciutils \
"
# Hacks for V2X-GNSS-HUB power sequence on HW23