Upgrade connman to 1.0

Below is a patch set upgrading connman to 1.0, and cleaning up the packaging somewhat.

It Works For Me, but my current available hardware is limited to qemux86 and a headless Atom machine. In particular the non-root-X permission changes look to be correct (where they were previously obviously wrong) but I haven't verified that they work. Also the packaging has changed quite dramatically since <0.79 becaus what used to be plugins is now in the core, which has the potential to break any explicit dependencies on the plugin packages. I've added suitable RPROVIDES which should mitigate that.

(note that this is against poky master, not oe-core)

Ross

The following changes since commit f28209d9d3c67203a2c7a2b25cacfe31643d1bfa:

cooker.py: terminate the Parser processes (2012-05-25 11:39:33 +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=connman

Ross Burton (4):
connman: just give xuser the extra rights it needs
connman: remove a deliberate sed that breaks all DBus access control
for connman
connman: respect the 3g feature and enable/disable ofono support
connman: upgrade to 1.0

 meta/recipes-connectivity/connman/connman.inc      |   34 +++++++-----
 ...ange-visibility-to-default-for-debug-symb.patch |   35 ------------
 .../connman/add_xuser_dbus_permission.patch        |   14 ++---
 .../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 --------------------
 meta/recipes-connectivity/connman/connman_0.79.bb  |   14 -----
 meta/recipes-connectivity/connman/connman_1.0.bb   |    9 +++
 9 files changed, 34 insertions(+), 245 deletions(-)
 delete mode 100644 meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
 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
 delete mode 100644 meta/recipes-connectivity/connman/connman_0.79.bb
 create mode 100644 meta/recipes-connectivity/connman/connman_1.0.bb

1.7.7.6

---
 .../connman/add_xuser_dbus_permission.patch        |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

index aa7a910..707b3ca 100644
@@ -1,24 +1,20 @@
-Some platform (like atom-pc) enables rootless X,
-thus we need to add the xuser in the list.
+Because Poky doesn't support at_console we need to special-case the session
+user.
 
 Upstream-Status: Inappropriate [configuration]
 
-Signed-off-by: Dongxiao Xu <[email protected]>
+Signed-off-by: Ross Burton <[email protected]>
 
 diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf
-index 98a773e..cbe2ba3 100644
+index 98a773e..466809c 100644
 --- a/src/connman-dbus.conf
 +++ b/src/connman-dbus.conf
-@@ -8,6 +8,13 @@
+@@ -8,6 +8,9 @@
          <allow send_interface="net.connman.Counter"/>
          <allow send_interface="net.connman.Notification"/>
      </policy>
 +    <policy user="xuser">
-+        <allow own="net.connman"/>
 +        <allow send_destination="net.connman"/>
-+        <allow send_interface="net.connman.Agent"/>
-+        <allow send_interface="net.connman.Counter"/>
-+        <allow send_interface="net.connman.Notification"/>
 +    </policy>
      <policy at_console="true">
          <allow send_destination="net.connman"/>

1.7.7.6

The patches are semantically different - Dongxiao's solution was to copy the root rules, my solution is to copy the at_console rules. He didn't sign off my solution, so I removed his sign-off.

Ross

The filename is sensible, the comment was entirely rewritten, as was the actual delta of the patch. I don't see how this could be any more clear really.

Ross

Not an issue. usually editing same patch gives the impression of update not rewrite
But you explained it

Merged into OE-Core

Thanks

-b

Elizabeth Flanagan
Yocto Project
Build and Release

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

index f2da8d9..b6b0253 100644
@@ -53,10 +53,6 @@ USERADD_PARAM_${PN} = "--system --no-create-home \
 
 inherit autotools pkgconfig update-rc.d useradd
 
-do_compile_append() {
-	sed -i -e s:deny:allow:g src/connman-dbus.conf
-}
-
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman

1.7.7.6

[YOCTO #2357]

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

index b6b0253..28f5f00 100644
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
 DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)} \
             ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
-            ofono \
+            ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
 TIST = "--enable-tist"

@@ -34,7 +34,7 @@ EXTRA_OECONF += "\
     ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi ${TIST}', '--disable-wifi', d)} \
     ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth ${TIST}', '--disable-bluetooth', d)} \
     --enable-dnsproxy \
-    --enable-ofono \
+    ${@base_contains('DISTRO_FEATURES', '3g', '', '--disable-ofono', d)} \
     --enable-tools \
     --enable-test \
     --disable-polkit \

1.7.7.6

Drop all upstreamed or irrelevant patches, remove unused configure arguments, and add compatibility rprovides for what used to be plugins but are now integrated into the core.

---
 meta/recipes-connectivity/connman/connman.inc      |   26 ++++++---
 ...ange-visibility-to-default-for-debug-symb.patch |   35 ------------
 .../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 --------------------
 meta/recipes-connectivity/connman/connman_0.79.bb  |   14 -----
 meta/recipes-connectivity/connman/connman_1.0.bb   |    9 +++
 8 files changed, 27 insertions(+), 230 deletions(-)
 delete mode 100644 meta/recipes-connectivity/connman/connman/0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch
 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
 delete mode 100644 meta/recipes-connectivity/connman/connman_0.79.bb
 create mode 100644 meta/recipes-connectivity/connman/connman_1.0.bb

index 28f5f00..5138508 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 \

@@ -33,14 +33,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"

@@ -65,13 +62,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
-

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

deleted file mode 100644
index d7f22b9..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 = "r4"

new file mode 100644
index 0000000..a85a77e
@@ -0,0 +1,9 @@
+require connman.inc
+
+# 0.94 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 = "r1"

1.7.7.6

This will make the build fail with old kernels.

Did you check the network is started by default?

Regards,

Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

commit d9724d24b091a9412992cc6883ca6a225fa1a88c

Author: Marcel Holtmann <[email protected]>
Date:   Sat Apr 21 22:04:29 2012 +0200

build: Remove useless alg-test example program

commit 091347cc83aa28a2395630274b6f1334fcab4f88

Author: Jukka Rissanen <[email protected]>
Date:   Fri Apr 27 16:01:48 2012 +0300

technology: Enable ethernet by default

As I said, irrelevant patches were dropped.

Ross

Op 29 mei 2012, om 22:43 heeft Ross Burton het volgende geschreven:

IIRC the sed was done to get around the 'atconsole' restriction, is that not needed anymore? E.g. can I ssh in as root and run the connman tests and when I log in to gdm as a simple user will connman-gnome work?

regards,

Koen

If that was the intention then it's a very heavy-handed solution...

Out of the box, root can access the service. There is another patch to add "xuser" for systems which run a raw X session as that user. If you're logging in with gdm to an arbitrary user, then the at_console test should work, right?

(one of my plans is to remove hacks like this and have a lightweight way of starting an X session as a normal user and actually registering it as a session)

Ross

Op 29 mei 2012, om 23:05 heeft Burton, Ross het volgende geschreven:

No, our PAM magic is still not strong enough :( And worse, serial console doesn't work with at_console either.

Damn shame - totally bust access control is quite depressing. I'll revert that chunk and throw a large comment around it - can't have something some suspicious without any documentation.

Hopefully without sounding like an ex-MeeGo fanboy, uxlaunch is actually pretty useful for this. It sets up a proper PAM login, brings up X, and handles XDG autostart. Might be worth looking at for single-user environments.

Ross

Hi Ross,

As far as I have seen from the code, between the previous version of connman and version 1.0, the way the default connection is set has changed.

Right now, the default connection is established through an external file.
Before 1.0, the default connection was established via the code (and a patch was added in the recipe against this, and it needs to be adapted).

See bug regarding this:
Bug #2491
https://bugzilla.yoctoproject.org/show_bug.cgi?id=2491

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Burton, Ross
Sent: Wednesday, May 30, 2012 6:13 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 0/4] Upgrade connman to 1.0

Damn shame - totally bust access control is quite depressing. I'll revert that chunk and throw a large comment around it - can't have something some suspicious without any documentation.

Hopefully without sounding like an ex-MeeGo fanboy, uxlaunch is actually pretty useful for this. It sets up a proper PAM login, brings up X, and handles XDG autostart. Might be worth looking at for single-user environments.

Ross

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

With 1.0, if there is no global configuration the technology is enabled if ethernet, otherwise disabled.

Ross