From 38db27a2d693c0399b1af53e54c128b60b370258 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 2 Oct 2009 10:06:06 +0200
Subject: connman: update git version connman-gnome: update git version
---
recipes/connman/connman-gnome_git.bb | 7 +++++--
recipes/connman/connman.inc | 3 ++-
recipes/connman/connman_git.bb | 30 +++++++++++++++++++++++++++++-
3 files changed, 36 insertions(+), 4 deletions(-)
(limited to 'recipes/connman')
diff --git a/recipes/connman/connman-gnome_git.bb b/recipes/connman/connman-gnome_git.bb
index cd244b84ca..34175b71d9 100644
--- a/recipes/connman/connman-gnome_git.bb
+++ b/recipes/connman/connman-gnome_git.bb
@@ -4,14 +4,17 @@ SECTION = "libs/network"
LICENSE = "GPL"
DEPENDS = "gtk+ dbus"
-RRECOMMENDS_${PN} = "connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi"
+RRECOMMENDS_${PN} = "connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi connman-plugin-bluetooth"
PV = "0.5+git"
+PR = "r3"
PR_append = ".gitr${SRCREV}"
DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+
+SRCREV = "bdc9164b405d18cfc5dbde2a33f070341d5ad673"
-SRCREV = "0059a16915d65880e3f9892a8f0a25f65968260e"
SRC_URI = "\
git://git.kernel.org/pub/scm/network/connman/connman-gnome.git;protocol=git \
file://connman-applet.desktop"
diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc
index 516684daa3..eb7aa1ab52 100644
--- a/recipes/connman/connman.inc
+++ b/recipes/connman/connman.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.moblin.org/projects/projects_connman.php"
SECTION = "libs/network"
LICENSE = "GPL"
# we need to define the depends here, the dynamic stuff is too late
-DEPENDS = "wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4"
+DEPENDS = "libnl wpa-supplicant dbus glib-2.0 ppp busybox dhclient resolvconf bluez4"
EXTRA_OECONF += "\
ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
@@ -29,6 +29,7 @@ do_compile_append() {
}
do_install_append() {
+ install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
}
diff --git a/recipes/connman/connman_git.bb b/recipes/connman/connman_git.bb
index 3a04f5f541..523d39ba2f 100644
--- a/recipes/connman/connman_git.bb
+++ b/recipes/connman/connman_git.bb
@@ -1,11 +1,39 @@
+EXTRA_OECONF = " \
+ --enable-threads \
+ --enable-ethernet \
+ --enable-wifi \
+ --enable-bluetooth \
+ --enable-modemmgr \
+ --enable-udhcp \
+ --enable-dhclient \
+ --enable-resolvconf \
+ --enable-loopback \
+ --enable-dnsproxy \
+ --enable-novatel \
+ --enable-huawei \
+ --enable-hso \
+ --enable-mbm \
+ --enable-ppp \
+ --disable-polkit \
+ --enable-client \
+ --enable-tools \
+ --enable-fake \
+"
+
require connman.inc
-PV = "0.12+gitr${SRCREV}"
+
+SRCREV = "1a94db417ecaba20a609ff4b4431a3f67c5dcbc6"
+
+PV = "0.42+git"
PR = "r0"
+PR_append = ".gitr${SRCREV}"
DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
SRC_URI = "\
git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \
file://connman \
"
+
S = "${WORKDIR}/git"
--
cgit v1.2.3