summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-07-12 07:48:13 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-15 08:29:59 (GMT)
commita9bbda96ebebe9b7b57afdb96f0606c207835d7b (patch)
tree1c21694ad877b6739d676f2be00c37ddfb2192db /meta/recipes-connectivity/connman
parent7a6b2ce603a44db60a3ba7a4a62ec3c04c1db656 (diff)
downloadpoky-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/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ae67079..ee00479 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -13,7 +13,7 @@ LICENSE = "GPLv2"
13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 13LIC_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
16inherit autotools pkgconfig systemd update-rc.d bluetooth update-alternatives 16inherit autotools pkgconfig systemd update-rc.d update-alternatives
17 17
18DEPENDS = "dbus glib-2.0 ppp readline" 18DEPENDS = "dbus glib-2.0 ppp readline"
19 19
@@ -42,7 +42,7 @@ PACKAGECONFIG ??= "wispr \
42 42
43PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''" 43PACKAGECONFIG[systemd] = "--with-systemdunitdir=${systemd_unitdir}/system/ --with-tmpfilesdir=${sysconfdir}/tmpfiles.d/,--with-systemdunitdir='' --with-tmpfilesdir=''"
44PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant" 44PACKAGECONFIG[wifi] = "--enable-wifi, --disable-wifi, wpa-supplicant, wpa-supplicant"
45PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, ${BLUEZ}, ${BLUEZ}" 45PACKAGECONFIG[bluez] = "--enable-bluetooth, --disable-bluetooth, bluez5, bluez5"
46PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono" 46PACKAGECONFIG[3g] = "--enable-ofono, --disable-ofono, ofono, ofono"
47PACKAGECONFIG[tist] = "--enable-tist,--disable-tist," 47PACKAGECONFIG[tist] = "--enable-tist,--disable-tist,"
48PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn" 48PACKAGECONFIG[openvpn] = "--enable-openvpn --with-openvpn=${sbindir}/openvpn,--disable-openvpn,,openvpn"