summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-06-20 12:27:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:03:05 +0100
commit36f08d973fda175c4bfc661acbb1e1d872fe3dc1 (patch)
tree64b369c9345bdd774e80660ab09665cf12481fca /meta/recipes-connectivity
parent89eebaa03a40e3e3b3710acc972d550da4709a80 (diff)
downloadpoky-36f08d973fda175c4bfc661acbb1e1d872fe3dc1.tar.gz
connman: add compat RPROVIDES for older packaging
wifi, bluetooth and 3g used to be plugins so were packaged separately, but not anymore. (From OE-Core rev: be2ce372863ef56a33ad4e4d4ddeec22873a6b8b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc21
1 files changed, 17 insertions, 4 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 7a1061571b..7215f2564b 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ 20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
21 " 21 "
22 22
23INC_PR = "r7" 23INC_PR = "r8"
24 24
25TIST = "--enable-tist" 25TIST = "--enable-tist"
26TIST_powerpc = "" 26TIST_powerpc = ""
@@ -74,13 +74,26 @@ do_install_append() {
74 rmdir ${D}${libdir}/connman/scripts 74 rmdir ${D}${libdir}/connman/scripts
75} 75}
76 76
77# These used to be plugins, but now they are core
78RPROVIDES_${PN} = "\
79 connman-plugin-loopback \
80 connman-plugin-ethernet \
81 ${@base_contains('DISTRO_FEATURES', 'bluetooth','connman-plugin-bluetooth', '', d)} \
82 ${@base_contains('DISTRO_FEATURES', 'wifi','connman-plugin-wifi', '', d)} \
83 ${@base_contains('DISTRO_FEATURES', '3g','connman-plugin-ofono', '', d)} \
84 "
85
86RDEPENDS_${PN} = "\
87 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
88 ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
89 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
90 "
91
77PACKAGES_DYNAMIC = "${PN}-plugin-*" 92PACKAGES_DYNAMIC = "${PN}-plugin-*"
78 93
79python populate_packages_prepend() { 94python populate_packages_prepend() {
80 depmap = dict( pppd="ppp", 95 depmap = dict( pppd="ppp",
81 wifi="wpa-supplicant", 96 )
82 bluetooth="bluez4",
83 ofono="ofono" )
84 packages = [] 97 packages = []
85 multilib_prefix = (d.getVar("MLPREFIX", True) or "") 98 multilib_prefix = (d.getVar("MLPREFIX", True) or "")
86 hook = lambda file,pkg,b,c,d:packages.append((file,pkg)) 99 hook = lambda file,pkg,b,c,d:packages.append((file,pkg))