* Please review, update, cleanup before pushing to oe.dev!
---
recipes/connman/connman.inc | 4 ++-
recipes/connman/connman_0.46.bb | 3 +-
recipes/connman/connman_git.bb | 4 ++-
recipes/connman/files/no_system_user_perms.patch | 14 +++++++
recipes/connman/files/shr/connman | 42 ++++++++++++++++++++++
5 files changed, 64 insertions(+), 3 deletions(-)
create mode 100644 recipes/connman/files/no_system_user_perms.patch
create mode 100644 recipes/connman/files/shr/connman
diff --git a/recipes/connman/connman.inc b/recipes/connman/connman.inc
index eb7aa1a..5b2f0cc 100644
--- a/recipes/connman/connman.inc
+++ b/recipes/connman/connman.inc
@@ -54,7 +54,7 @@ python populate_packages_prepend() {
PACKAGES_DYNAMIC = "${PN}-plugin-*"
-PACKAGES += "${PN}-scripts"
+PACKAGES += "${PN}-scripts ${PN}-test-utils"
FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
${sysconfdir} ${sharedstatedir} ${localstatedir} \
@@ -64,6 +64,8 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/*
${libdir}/lib*.so.* \
${libdir}/bonobo/servers \
${datadir}/dbus-1/system-services/*"
+FILES_${PN}-test-utils += "${libdir}/connman/test/*"
+
FILES_${PN}-scripts += "${libdir}/connman/scripts"
FILES_${PN}-dbg += "${libdir}/connman/*/.debug"
FILES_${PN}-dev += "${libdir}/connman/*/*.la"
diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb
index 26b7b82..cfcab38 100644
--- a/recipes/connman/connman_0.46.bb
+++ b/recipes/connman/connman_0.46.bb
@@ -1,6 +1,6 @@
require connman.inc
-PR = "r1"
+PR = "r2"
EXTRA_OECONF += "\
--disable-gtk-doc \
@@ -32,6 +32,7 @@ EXTRA_OECONF += "\
SRC_URI = "\
http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
+ file://no_system_user_perms.patch;patch=1 \
file://connman \
"
diff --git a/recipes/connman/connman_git.bb b/recipes/connman/connman_git.bb
index 523d39b..c0cb890 100644
--- a/recipes/connman/connman_git.bb
+++ b/recipes/connman/connman_git.bb
@@ -20,12 +20,14 @@ EXTRA_OECONF = " \
--enable-fake \
"
+EXTRA_OECONF_append_shr += "--disable-tools"
+
require connman.inc
SRCREV = "1a94db417ecaba20a609ff4b4431a3f67c5dcbc6"
PV = "0.42+git"
-PR = "r0"
+PR = "r2"
PR_append = ".gitr${SRCREV}"
DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/connman/files/no_system_user_perms.patch
b/recipes/connman/files/no_system_user_perms.patch
new file mode 100644
index 0000000..e02bd30
--- /dev/null
+++ b/recipes/connman/files/no_system_user_perms.patch
@@ -0,0 +1,14 @@
+diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf
+index 2be3764..b4d4acd 100644
+--- a/src/connman-dbus.conf
++++ b/src/connman-dbus.conf
+@@ -6,9 +6,6 @@
+ <allow send_destination="org.moblin.connman"/>
+ <allow send_interface="org.moblin.connman.Agent"/>
+ </policy>
+- <policy user="system">
+- <allow send_destination="org.moblin.connman"/>
+- </policy>
+ <policy at_console="true">
+ <allow send_destination="org.moblin.connman"/>
+ </policy>
diff --git a/recipes/connman/files/shr/connman
b/recipes/connman/files/shr/connman
new file mode 100644
index 0000000..708b1b4
--- /dev/null
+++ b/recipes/connman/files/shr/connman
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+DAEMON="/usr/sbin/connmand -I usb0"
+PIDFILE=/var/run/connmand.pid
+DESC="Connection Manager"
+
+if [ -f /etc/default/connman ] ; then
+ . /etc/default/connman
+fi
+
+set -e
+
+do_start() {
+ $DAEMON
+}
+
+do_stop() {
+ start-stop-daemon --stop --name connmand --quiet
+}
+
+case "$1" in
+ start)
+ echo "Starting $DESC"
+ do_start
+ ;;
+ stop)
+ echo "Stopping $DESC"
+ do_stop
+ ;;
+ restart|force-reload)
+ echo "Restarting $DESC"
+ do_stop
+ sleep 1
+ do_start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
--
1.6.5.3
_______________________________________________
Shr-devel mailing list
[email protected]
http://lists.shr-project.org/mailman/listinfo/shr-devel
