ConnMan upgrades, split up

index 3412323..7a10615 100644
@@ -20,7 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r6"
+INC_PR = "r7"
 
 TIST = "--enable-tist"
 TIST_powerpc = ""

@@ -35,14 +35,12 @@ EXTRA_OECONF += "\
     --enable-ethernet \
     ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
     ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
-    --enable-dnsproxy \
     ${@base_contains('DISTRO_FEATURES', '3g', '', '--disable-ofono', d)} \
     --enable-tools \
     --enable-test \
     --disable-polkit \
-    --enable-client \
+    --disable-client \
     --enable-fake \
-    --disable-ntpd \
 "
 
 INITSCRIPT_NAME = "connman"

index 7a10615..7215f25 100644
@@ -20,7 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 TIST = "--enable-tist"
 TIST_powerpc = ""

@@ -74,13 +74,26 @@ do_install_append() {
 	rmdir ${D}${libdir}/connman/scripts
 }
 
+# These used to be plugins, but now they are core
+RPROVIDES_${PN} = "\
+	connman-plugin-loopback \
+	connman-plugin-ethernet \
+	${@base_contains('DISTRO_FEATURES', 'bluetooth','connman-plugin-bluetooth', '', d)} \
+	${@base_contains('DISTRO_FEATURES', 'wifi','connman-plugin-wifi', '', d)} \
+	${@base_contains('DISTRO_FEATURES', '3g','connman-plugin-ofono', '', d)} \
+	"
+
+RDEPENDS_${PN} = "\
+	${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
+	${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
+	${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
+	"
+
 PACKAGES_DYNAMIC = "${PN}-plugin-*"
 
 python populate_packages_prepend() {
 	depmap = dict( pppd="ppp",
-	               wifi="wpa-supplicant",
-	               bluetooth="bluez4",
-	               ofono="ofono" )
+				 )
 	packages = []
 	multilib_prefix = (d.getVar("MLPREFIX", True) or "")
 	hook = lambda file,pkg,b,c,d:packages.append((file,pkg))

index 7215f25..ae26689 100644
@@ -11,7 +11,7 @@ HOMEPAGE = "http://connman.net/"
 BUGTRACKER = "http://bugs.meego.com/buglist.cgi?quicksearch=connman"
 LICENSE  = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
-                    file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e"
+                    file://src/main.c;beginline=1;endline=20;md5=d6a1ac98a6791c5294e8a7f176ecd66d"
 
 # we need to define the depends here, the dynamic stuff is too late
 DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \

@@ -20,7 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r8"
+INC_PR = "r9"
 
 TIST = "--enable-tist"
 TIST_powerpc = ""

46 lines not on this page · raw message

deleted file mode 100644
index 6dae2aa..0000000
@@ -1,22 +0,0 @@
-Default to enabling the ethernet interface. If we don't do this, connman
-will shut down all the networking when it starts without any configuration
-which is usualy not what the users expects. This is particularly
-problematic with our qemu images and runtime testing using qemu.
-
-Upstream-Status: Inappropriate [Configuration]
-
-RP 2011/12/12
-
-Index: git/src/storage.c
-===================================================================
---- git.orig/src/storage.c	2011-12-12 16:14:10.892316565 +0000
-+++ git/src/storage.c	2011-12-12 16:14:13.788316431 +0000
-@@ -367,7 +367,7 @@
- 					"Enable", FALSE);
- 
- 		g_key_file_set_boolean(keyfile, "Wired",
--					"Enable", FALSE);
-+					"Enable", TRUE);
- 
- 		g_key_file_set_boolean(keyfile, "3G",
- 					"Enable", FALSE);

50 lines not on this page · raw message

55 lines not on this page · raw message

similarity index 53%
rename from meta/recipes-connectivity/connman/connman_0.79.bb
rename to meta/recipes-connectivity/connman/connman_1.0.bb
index 898fb11..926d22e 100644
@@ -1,14 +1,10 @@
 require connman.inc
 
-# 0.79 tag
-SRCREV = "442b1fe603e005814f592a3dbcf0d0bfb13f961c"
+# 1.0 tag
+SRCREV = "6d6f312fb2b751b4cf7037f2a526c7785364732f"
 SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
-            file://add_xuser_dbus_permission.patch \
-            file://ethernet_default.patch \
-            file://disable_alg-test.patch \
             file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
-            file://test-set-ipv4-method-api-fix.patch \
-            file://test-set-ipv6-method-api-fix.patch \
+            file://add_xuser_dbus_permission.patch \
             file://connman"
 S = "${WORKDIR}/git"
 PR = "${INC_PR}.0"

index e2e8deb..a4327f5 100644
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
                     file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
                     file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
 
-DEPENDS = "gtk+ dbus"
+DEPENDS = "gtk+ dbus-glib"
 
-PR = "r10"
+PR = "r11"
 
 SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5"
 SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \

index a4327f5..8a6878c 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
 DEPENDS = "gtk+ dbus-glib"
 
-PR = "r11"
+PR = "r12"
 
 SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5"
 SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \

@@ -24,15 +24,4 @@ S = "${WORKDIR}/git"
 
 inherit autotools gtk-icon-cache
 
-RRECOMMENDS_${PN} = "python  \
-                     python-dbus \
-                     connman \
-                     connman-plugin-ethernet \
-                     connman-plugin-loopback \
-                     connman-plugin-udhcp \
-                     connman-plugin-wifi \
-                     connman-plugin-fake \
-                     connman-plugin-bluetooth \
-                     connman-plugin-dnsproxy \
-                     connman-plugin-ofono \
-                    "
+RDEPENDS_${PN} = "connman"

similarity index 45%
rename from meta/recipes-connectivity/connman/connman-gnome_0.5.bb
rename to meta/recipes-connectivity/connman/connman-gnome_0.7.bb
index 8a6878c..6cceb2d 100644
@@ -8,17 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
 DEPENDS = "gtk+ dbus-glib"
 
-PR = "r12"
-
-SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5"
-SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman-gnome.git \
-           file://0001-Monitor-the-Manager-s-State-property.patch \
-           file://0002-Update-for-ConnMan-0.79-API-changes.patch \
-           file://0003-Fix-setting-IPv4-configuration.patch \
-           file://0004-Handle-WiFi-authentication-using-an-agent.patch \
-           file://0005-Remove-all-handling-of-Passphrase-property.patch \
-           file://0006-Fix-status-descriptions-in-properties-tree.patch \
-           file://0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch"
+# 0.7 tag
+SRCREV = "cf3c325b23dae843c5499a113591cfbc98acb143"
+SRC_URI = "git://github.com/connectivity/connman-gnome.git;protocol=git"
 
 S = "${WORKDIR}/git"