ConnMan 1.0 upgrade

PATCH Applied Ross Burton 2 participants 8 messages Jun 20, 2012 – Jun 21, 2012

lore

Share & tools

lore

Ross Burton

author

2012-06-20 11:37 UTC #0 lore raw

cover ConnMan 1.0 upgrade

Same as before, but I signed it all off this time.

The following changes since commit e0a70547069fe7e8a2d6bdaffc985fb172d46c31:

perl: Allow perl to cross build and native build in a directory named "t" (2012-06-18 17:33:04 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ross/connman
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ross/connman

Ross Burton (6):
connman: rationalise configure options
connman: add compat RPROVIDES for older packaging
connman: upgrade to 1.0
connman-gnome: fix build depends (Yocto #2556)
connman-gnome: clean up runtime dependencies
connman-gnome: upgrade to 0.7, which works with connman 1.0

 .../connman/connman-gnome_0.5.bb                   |   38 --------------
 .../connman/connman-gnome_0.7.bb                   |   19 +++++++
 meta/recipes-connectivity/connman/connman.inc      |   27 +++++++---
 .../connman/connman/disable_alg-test.patch         |   46 ----------------
 .../connman/connman/ethernet_default.patch         |   22 --------
 .../connman/test-set-ipv4-method-api-fix.patch     |   50 ------------------
 .../connman/test-set-ipv6-method-api-fix.patch     |   55 --------------------
 .../connman/{connman_0.79.bb => connman_1.0.bb}    |   10 +---
 8 files changed, 41 insertions(+), 226 deletions(-)
 delete mode 100644 meta/recipes-connectivity/connman/connman-gnome_0.5.bb
 create mode 100644 meta/recipes-connectivity/connman/connman-gnome_0.7.bb
 delete mode 100644 meta/recipes-connectivity/connman/connman/disable_alg-test.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/ethernet_default.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
 rename meta/recipes-connectivity/connman/{connman_0.79.bb => connman_1.0.bb} (53%)

Signature · 1 line

1.7.7.6

Ross Burton

author

2012-06-20 11:38 UTC #1 lore raw

PATCH 1/6 connman: rationalise configure options

dnsproxy and ntpd don't exist anymore, and the client is almost entirely useless.

Signed-off-by Ross Burton <[email protected]>

---
 meta/recipes-connectivity/connman/connman.inc |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

meta/recipes-connectivity/connman/connman.inc +2 -4

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"

Signature · 1 line

1.7.7.6

Ross Burton

author

2012-06-20 11:38 UTC #2 lore raw

PATCH 2/6 connman: add compat RPROVIDES for older packaging

wifi, bluetooth and 3g used to be plugins so were packaged separately, but not anymore.

Signed-off-by Ross Burton <[email protected]>

---
 meta/recipes-connectivity/connman/connman.inc |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

meta/recipes-connectivity/connman/connman.inc +17 -4

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))

Signature · 1 line

1.7.7.6

Ross Burton

author

2012-06-20 11:38 UTC #3 lore raw

PATCH 3/6 connman: upgrade to 1.0

In reply to Ross Burton

Drop patches that have been merged upstream, or are not relevant any more.

License checksums changed because the (C) years were updated.

Signed-off-by Ross Burton <[email protected]>

---
 meta/recipes-connectivity/connman/connman.inc      |    4 +-
 .../connman/connman/disable_alg-test.patch         |   46 ----------------
 .../connman/connman/ethernet_default.patch         |   22 --------
 .../connman/test-set-ipv4-method-api-fix.patch     |   50 ------------------
 .../connman/test-set-ipv6-method-api-fix.patch     |   55 --------------------
 .../connman/{connman_0.79.bb => connman_1.0.bb}    |   10 +---
 6 files changed, 5 insertions(+), 182 deletions(-)
 delete mode 100644 meta/recipes-connectivity/connman/connman/disable_alg-test.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/ethernet_default.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch
 rename meta/recipes-connectivity/connman/{connman_0.79.bb => connman_1.0.bb} (53%)

meta/recipes-connectivity/connman/connman.inc +2 -2

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 = ""

meta/recipes-connectivity/connman/connman/disable_alg-test.patch deleted +0 ~~-46~~

46 lines not on this page · raw message

meta/recipes-connectivity/connman/connman/ethernet_default.patch deleted +0 ~~-22~~

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);

meta/recipes-connectivity/connman/connman/test-set-ipv4-method-api-fix.patch deleted +0 ~~-50~~

50 lines not on this page · raw message

meta/recipes-connectivity/connman/connman/test-set-ipv6-method-api-fix.patch deleted +0 ~~-55~~

55 lines not on this page · raw message

meta/recipes-connectivity/connman/connman_1.0.bb renamed from meta/recipes-connectivity/connman/connman_0.79.bb +3 -7

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"

Signature · 1 line

1.7.7.6

Ross Burton

author

2012-06-20 11:38 UTC #4 lore raw

PATCH 4/6 connman-gnome: fix build depends (Yocto #2556)

In reply to Ross Burton

Signed-off-by Ross Burton <[email protected]>

---
 .../connman/connman-gnome_0.5.bb                   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-connectivity/connman/connman-gnome_0.5.bb +2 -2

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 \

Signature · 1 line

1.7.7.6

Ross Burton

author

2012-06-20 11:38 UTC #5 lore raw

PATCH 5/6 connman-gnome: clean up runtime dependencies

In reply to Ross Burton

There is no need to recommend Python as it isn't used, and specifying the connman plugins should be done by the image.

Add a dependency on connman itself as otherwise connman-gnome doesn't do much.

Signed-off-by Ross Burton <[email protected]>

---
 .../connman/connman-gnome_0.5.bb                   |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

meta/recipes-connectivity/connman/connman-gnome_0.5.bb +2 ~~-13~~

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"

Signature · 1 line

1.7.7.6

Ross Burton

author

2012-06-20 11:38 UTC #6 lore raw

PATCH 6/6 connman-gnome: upgrade to 0.7, which works with connman 1.0

In reply to Ross Burton

Signed-off-by Ross Burton <[email protected]>

---
 .../{connman-gnome_0.5.bb => connman-gnome_0.7.bb} |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)
 rename meta/recipes-connectivity/connman/{connman-gnome_0.5.bb => connman-gnome_0.7.bb} (45%)

meta/recipes-connectivity/connman/connman-gnome_0.7.bb renamed from meta/recipes-connectivity/connman/connman-gnome_0.5.bb +3 ~~-11~~

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"

Signature · 1 line

1.7.7.6

Richard Purdie

Applied

2012-06-21 12:33 UTC #7 lore raw

In reply to Ross Burton

Quoted 10 lines · Ross Burton

Same as before, but I signed it all off this time.
The following changes since commit e0a70547069fe7e8a2d6bdaffc985fb172d46c31:
perl: Allow perl to cross build and native build in a directory named "t" (2012-06-18 17:33:04 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ross/connman
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ross/connman

Quoted 7 lines

Ross Burton (6):
connman: rationalise configure options
connman: add compat RPROVIDES for older packaging
connman: upgrade to 1.0
connman-gnome: fix build depends (Yocto #2556)
connman-gnome: clean up runtime dependencies
connman-gnome: upgrade to 0.7, which works with connman 1.0

Merged to master, thanks.

Richard