V3 ConnMan 1.0 / connman-gnome

index 3412323..75078d1 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 \

@@ -35,14 +35,11 @@ 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 \
-    --enable-fake \
-    --disable-ntpd \
+    --disable-client \
 "
 
 INITSCRIPT_NAME = "connman"

@@ -76,13 +73,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))

deleted file mode 100644
index e6f03e6..0000000
@@ -1,35 +0,0 @@
-From 4ddaf78dad5a9ee4a0658235f71b75132192123e Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 7 Apr 2012 18:52:12 -0700
-Subject: [PATCH] plugin.h: Change visibility to default for debug symbols
-
-gold refuses to link in undefined weak symbols which
-have hidden visibility
-
-Signed-off-by: Khem Raj <[email protected]>
-
-
-Upstream-Status: Pending
----
- include/plugin.h |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/plugin.h b/include/plugin.h
-index 692a4e5..a9361c3 100644
---- a/include/plugin.h
-+++ b/include/plugin.h
-@@ -89,9 +89,9 @@ struct connman_plugin_desc {
- #else
- #define CONNMAN_PLUGIN_DEFINE(name, description, version, priority, init, exit) \
- 		extern struct connman_debug_desc __start___debug[] \
--				__attribute__ ((weak, visibility("hidden"))); \
-+				__attribute__ ((weak, visibility("default"))); \
- 		extern struct connman_debug_desc __stop___debug[] \
--				__attribute__ ((weak, visibility("hidden"))); \
-+				__attribute__ ((weak, visibility("default"))); \
- 		extern struct connman_plugin_desc connman_plugin_desc \
- 				__attribute__ ((visibility("default"))); \
- 		struct connman_plugin_desc connman_plugin_desc = { \
--- 
-1.7.5.4
-

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

deleted file mode 100644
index 898fb11..0000000
@@ -1,14 +0,0 @@
-require connman.inc
-
-# 0.79 tag
-SRCREV = "442b1fe603e005814f592a3dbcf0d0bfb13f961c"
-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://connman"
-S = "${WORKDIR}/git"
-PR = "${INC_PR}.0"

new file mode 100644
index 0000000..87f4873
@@ -0,0 +1,9 @@
+require connman.inc
+
+# 1.0 tag
+SRCREV = "6d6f312fb2b751b4cf7037f2a526c7785364732f"
+SRC_URI  = "git://git.kernel.org/pub/scm/network/connman/connman.git \
+            file://add_xuser_dbus_permission.patch \
+            file://connman"
+S = "${WORKDIR}/git"
+PR = "${INC_PR}.0"

deleted file mode 100644
index 20cbb30..0000000
@@ -1,48 +0,0 @@
-From 56d307993c0a661c73fcdd72b1392c3719a0c297 Mon Sep 17 00:00:00 2001
-Message-Id: <56d307993c0a661c73fcdd72b1392c3719a0c297.1334369310.git.paul.eggleton@linux.intel.com>
-In-Reply-To: <[email protected]>
-References: <[email protected]>
-From: Joshua Lock <[email protected]>
-Date: Tue, 10 Apr 2012 17:54:56 -0700
-Subject: [PATCH 1/6] Monitor the Manager's State property
-
-Monitor the Manager's State property and update global_ready
-appropriately when it changes.
-
-Without this change using the applet with connman 0.79 and
-starting the applet after the daemon no status icon is shown.
-
-With this change this icon displays an appropriate state when
-the applet launches.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Joshua Lock <[email protected]>
----
- applet/main.c |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/applet/main.c b/applet/main.c
-index 224e2fd..68a77b1 100644
---- a/applet/main.c
-+++ b/applet/main.c
-@@ -111,6 +111,16 @@ static void manager_property_changed(DBusGProxy *proxy, const char *property,
- 						iterate_list, &path);
- 		update_service(proxy, path);
- 		g_free(path);
-+	} else if (g_str_equal(property, "State") == TRUE) {
-+		const gchar *state = g_value_get_string(value);
-+
-+	  	if (g_strcmp0(state, "ready") == 0 || g_strcmp0(state, "online") == 0) {
-+	  		global_ready = TRUE;
-+			status_ready(global_strength);
-+		} else {
-+	  		global_ready = FALSE;
-+			status_offline();
-+		}
- 	}
- }
- 
--- 
-1.7.5.4
-

similarity index 84%
rename from meta/recipes-connectivity/connman/connman-gnome/0007-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch
rename to meta/recipes-connectivity/connman/connman-gnome/0001-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch
index 3e054ba..5056b9e 100644
@@ -1,7 +1,7 @@
-From 7225bf8e8e9bee42d7d7d02ba754b9fb30a877b6 Mon Sep 17 00:00:00 2001
+From c76ed8a95d4d2b8e271a8fe90727a54e575ffa7a Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <[email protected]>
 Date: Mon, 16 Apr 2012 19:15:35 +0100
-Subject: [PATCH] connman-gnome: fix segfault due to unchecked null value
+Subject: [PATCH 1/2] connman-gnome: fix segfault due to unchecked null value
 
 If value is NULL here we should not pass it to g_value_get_boxed().
 

@@ -26,5 +26,5 @@ index 33ac623..822fc98 100644
  	if (!ipv4)
  		goto done;
 -- 
-1.7.5.4
+1.7.7
 

865 lines not on this page · raw message

179 lines not on this page · raw message

85 lines not on this page · raw message

923 lines not on this page · raw message

249 lines not on this page · raw message

42 lines not on this page · raw message

index e2e8deb..09e7fb6 100644
@@ -8,17 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
 DEPENDS = "gtk+ dbus"
 
-PR = "r10"
+PR = "r11"
 
-SRCREV = "42c652d123ea133d0a0930b96e8e39dbd0c597b5"
+SRCREV = "8b8171237e9b3f1d0c360299efd1001368a3bf63"
 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"
+           file://0001-connman-gnome-fix-segfault-due-to-unchecked-null-val.patch \
+           file://0002-Update-for-ConnMan-1.0-DBus-API.patch"
 
 S = "${WORKDIR}/git"