diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-07-12 10:48:13 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-15 09:29:59 +0100 |
commit | a9bbda96ebebe9b7b57afdb96f0606c207835d7b (patch) | |
tree | 1c21694ad877b6739d676f2be00c37ddfb2192db /meta/recipes-connectivity/libpcap | |
parent | 7a6b2ce603a44db60a3ba7a4a62ec3c04c1db656 (diff) | |
download | poky-a9bbda96ebebe9b7b57afdb96f0606c207835d7b.tar.gz |
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 <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/libpcap')
-rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ | |||
16 | SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33" | 16 | SRC_URI[md5sum] = "dffd65cb14406ab9841f421732eb0f33" |
17 | SRC_URI[sha256sum] = "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019" | 17 | SRC_URI[sha256sum] = "2edb88808e5913fdaa8e9c1fcaf272e19b2485338742b5074b9fe44d68f37019" |
18 | 18 | ||
19 | inherit autotools binconfig-disabled pkgconfig bluetooth | 19 | inherit autotools binconfig-disabled pkgconfig |
20 | 20 | ||
21 | BINCONFIG = "${bindir}/pcap-config" | 21 | BINCONFIG = "${bindir}/pcap-config" |
22 | 22 | ||
@@ -29,7 +29,7 @@ EXTRA_OECONF = " \ | |||
29 | " | 29 | " |
30 | EXTRA_AUTORECONF += "--exclude=aclocal" | 30 | EXTRA_AUTORECONF += "--exclude=aclocal" |
31 | 31 | ||
32 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ | 32 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ |
33 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ | 33 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ |
34 | " | 34 | " |
35 | PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5" | 35 | PACKAGECONFIG[bluez5] = "--enable-bluetooth,--disable-bluetooth,bluez5" |