From 00fd0c56399ae5566eadca8941bee767cb7e5a9c Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Wed, 18 Aug 2021 12:11:09 +0200 Subject: [PATCH] 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 --- conf/distro/netmodule-linux.conf | 2 +- recipes-core/images/netmodule-linux-image.bb | 2 -- .../packagegroups-features/packagegroup-nm-bluetooth.bb | 1 - recipes-core/packagegroups-features/packagegroup-nm-wifi.bb | 3 --- recipes-core/packagegroups-sets/packagegroup-nm-base.bb | 1 - recipes-core/packagegroups-sets/packagegroup-nm-extended.bb | 3 +-- 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/conf/distro/netmodule-linux.conf b/conf/distro/netmodule-linux.conf index b0ada85..f0c8cfb 100644 --- a/conf/distro/netmodule-linux.conf +++ b/conf/distro/netmodule-linux.conf @@ -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. diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb index 19f9aa5..cd653ad 100644 --- a/recipes-core/images/netmodule-linux-image.bb +++ b/recipes-core/images/netmodule-linux-image.bb @@ -1,7 +1,5 @@ require netmodule-linux-image-minimal.bb -NO_RECOMMENDATIONS = "0" - require includes/image-preprocessing.inc SUMMARY = "NetModule Linux Distro Image" diff --git a/recipes-core/packagegroups-features/packagegroup-nm-bluetooth.bb b/recipes-core/packagegroups-features/packagegroup-nm-bluetooth.bb index cfae016..a1f73ee 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-bluetooth.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-bluetooth.bb @@ -6,7 +6,6 @@ require packagegroup-feature.inc PACKAGE_ARCH = "${MACHINE_ARCH}" RDEPENDS_${PN}-base = " \ - bluez5 \ ${@bb.utils.contains("MACHINE_FEATURES", "tibluetooth", "tibluetooth", "", d)} \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-wifi.bb b/recipes-core/packagegroups-features/packagegroup-nm-wifi.bb index 347a67c..0470824 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-wifi.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-wifi.bb @@ -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 \ " diff --git a/recipes-core/packagegroups-sets/packagegroup-nm-base.bb b/recipes-core/packagegroups-sets/packagegroup-nm-base.bb index f3a3fd3..cfcfcb2 100644 --- a/recipes-core/packagegroups-sets/packagegroup-nm-base.bb +++ b/recipes-core/packagegroups-sets/packagegroup-nm-base.bb @@ -10,6 +10,5 @@ RDEPENDS_${PN} = " \ curl \ parted \ mmc-utils \ - usbutils \ udev-rules-nmhw \ " diff --git a/recipes-core/packagegroups-sets/packagegroup-nm-extended.bb b/recipes-core/packagegroups-sets/packagegroup-nm-extended.bb index c528e7d..69c74ac 100644 --- a/recipes-core/packagegroups-sets/packagegroup-nm-extended.bb +++ b/recipes-core/packagegroups-sets/packagegroup-nm-extended.bb @@ -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