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 | |
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')
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5_5.50.bb | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap_1.9.0.bb | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/neard/neard_0.16.bb | 4 | ||||
-rw-r--r-- | meta/recipes-connectivity/ofono/ofono.inc | 4 |
5 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5_5.50.bb b/meta/recipes-connectivity/bluez5/bluez5_5.50.bb index 66271432fe..4e443e5fb0 100644 --- a/meta/recipes-connectivity/bluez5/bluez5_5.50.bb +++ b/meta/recipes-connectivity/bluez5/bluez5_5.50.bb | |||
@@ -1,7 +1,5 @@ | |||
1 | require bluez5.inc | 1 | require bluez5.inc |
2 | 2 | ||
3 | REQUIRED_DISTRO_FEATURES = "bluez5" | ||
4 | |||
5 | SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178" | 3 | SRC_URI[md5sum] = "8e35c67c81a55d3ad4c9f22280dae178" |
6 | SRC_URI[sha256sum] = "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911" | 4 | SRC_URI[sha256sum] = "5ffcaae18bbb6155f1591be8c24898dc12f062075a40b538b745bfd477481911" |
7 | 5 | ||
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index ae67079c71..ee00479926 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc | |||
@@ -13,7 +13,7 @@ LICENSE = "GPLv2" | |||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ |
14 | file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" | 14 | file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" |
15 | 15 | ||
16 | inherit autotools pkgconfig systemd update-rc.d bluetooth update-alternatives | 16 | inherit autotools pkgconfig systemd update-rc.d update-alternatives |
17 | 17 | ||
18 | DEPENDS = "dbus glib-2.0 ppp readline" | 18 | DEPENDS = "dbus glib-2.0 ppp readline" |
19 | 19 | ||
@@ -42,7 +42,7 @@ PACKAGECONFIG ??= "wispr \ | |||
42 | 42 | ||
43 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''" | 43 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''" |
44 | PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" | 44 | PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" |
45 | PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, ${BLUEZ}" | 45 | PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5, bluez5" |
46 | PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono" | 46 | PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono" |
47 | PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," | 47 | PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," |
48 | PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" | 48 | PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" |
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" |
diff --git a/meta/recipes-connectivity/neard/neard_0.16.bb b/meta/recipes-connectivity/neard/neard_0.16.bb index cc6af4e1ca..7c124a3c0b 100644 --- a/meta/recipes-connectivity/neard/neard_0.16.bb +++ b/meta/recipes-connectivity/neard/neard_0.16.bb | |||
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | |||
18 | file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ | 18 | file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ |
19 | " | 19 | " |
20 | 20 | ||
21 | inherit autotools pkgconfig systemd update-rc.d bluetooth | 21 | inherit autotools pkgconfig systemd update-rc.d |
22 | 22 | ||
23 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 23 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" |
24 | 24 | ||
@@ -40,7 +40,7 @@ RDEPENDS_${PN} = "dbus" | |||
40 | 40 | ||
41 | # Bluez & Wifi are not mandatory except for handover | 41 | # Bluez & Wifi are not mandatory except for handover |
42 | RRECOMMENDS_${PN} = "\ | 42 | RRECOMMENDS_${PN} = "\ |
43 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ | 43 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ |
44 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ |
45 | " | 45 | " |
46 | 46 | ||
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index e1185c6e6b..03d0fd53a6 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc | |||
@@ -5,7 +5,7 @@ LICENSE = "GPLv2" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ |
6 | file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" | 6 | file://src/ofono.h;beginline=1;endline=20;md5=3ce17d5978ef3445def265b98899c2ee" |
7 | 7 | ||
8 | inherit autotools pkgconfig update-rc.d systemd bluetooth gobject-introspection-data | 8 | inherit autotools pkgconfig update-rc.d systemd gobject-introspection-data |
9 | 9 | ||
10 | DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" | 10 | DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ell" |
11 | 11 | ||
@@ -17,7 +17,7 @@ PACKAGECONFIG ??= "\ | |||
17 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ | 17 | ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ |
18 | " | 18 | " |
19 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" | 19 | PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir=" |
20 | PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}" | 20 | PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5" |
21 | 21 | ||
22 | EXTRA_OECONF += "--enable-test --enable-external-ell" | 22 | EXTRA_OECONF += "--enable-test --enable-external-ell" |
23 | 23 | ||