From a9bbda96ebebe9b7b57afdb96f0606c207835d7b Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Fri, 12 Jul 2019 10:48:13 +0300 Subject: meta: Remove remnants of bluez4 support bluez4 was removed from meta-oe 2 years ago. Simplfy the setup of the two level bluetooth and bluez4/bluez5 distro features by removing the bluez4/bluez5 distro features. This also removes the no longer required bluetooth class. (From OE-Core rev: dcf889e93401f7c4de0055d53271eacc3882eccc) Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-connectivity/libpcap') diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb b/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb index 78361561e6..77bc31af7e 100644 --- a/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb +++ b/meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb @@ -16,7 +16,7 @@ SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \ SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33" SRC_URI[sha256sum] = "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019" -inherit autotools binconfig-disabled pkgconfig bluetooth +inherit autotools binconfig-disabled pkgconfig BINCONFIG = "${bindir}/pcap-config" @@ -29,7 +29,7 @@ EXTRA_OECONF = " \ " EXTRA_AUTORECONF += "--exclude=aclocal" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ " PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5" -- cgit v1.2.3-54-g00ecf