summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/connman/connman.inc5
-rw-r--r--packages/connman/connman_0.8.bb2
-rw-r--r--packages/connman/connman_git.bb2
3 files changed, 5 insertions, 4 deletions
diff --git a/packages/connman/connman.inc b/packages/connman/connman.inc
index 902949a4d7..5ca77231bf 100644
--- a/packages/connman/connman.inc
+++ b/packages/connman/connman.inc
@@ -2,7 +2,8 @@ DESCRIPTION = "The Moblin Connection Manager"
HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
SECTION = "libs/network"
LICENSE = "GPL"
-DEPENDS = "dbus glib-2.0 ppp"
+# we need to define the depends here, the dynamic stuff is too late
+DEPENDS = "dbus glib-2.0 ppp busybox dhclient resolvconf bluez4"
EXTRA_OECONF += "\
ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
@@ -32,7 +33,7 @@ do_stage() {
}
python populate_packages_prepend() {
- depmap = dict( pppd="pppd", udhcp="udhcpc", dhclient="dhcp-client", wifi="wpa-supplicant", resolvconf="resolvconf", bluetooth="bluez4" )
+ depmap = dict( pppd="ppp", udhcp="busybox", dhclient="dhclient", wifi="wpa-supplicant", resolvconf="resolvconf", bluetooth="bluez4" )
packages = []
hook = lambda file,pkg,b,c,d:packages.append((file,pkg))
plugin_dir = bb.data.expand('${libdir}/connman/plugins/', d)
diff --git a/packages/connman/connman_0.8.bb b/packages/connman/connman_0.8.bb
index 95970cd5ae..c8f0d2ba55 100644
--- a/packages/connman/connman_0.8.bb
+++ b/packages/connman/connman_0.8.bb
@@ -1,5 +1,5 @@
require connman.inc
-PR = "r3"
+PR = "r4"
EXTRA_OECONF += "\
--disable-gtk-doc \
diff --git a/packages/connman/connman_git.bb b/packages/connman/connman_git.bb
index a41149e3f7..7b7522fbb7 100644
--- a/packages/connman/connman_git.bb
+++ b/packages/connman/connman_git.bb
@@ -1,6 +1,6 @@
require connman.inc
PV = "0.8+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"