3 files changed, 15 insertions, 11 deletions

diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 4b0cb26525..2628742c39 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -33,7 +33,7 @@ SRCREV_pn-clutter-gst ?= "fb05a1ec0d9c5980744822009c2486da3780c794"
 SRCREV_pn-clutter-gtk ?= "5dfc07761adf3ab3d1c9ee97b92bc4a65473db36"
 SRCREV_pn-clutter-imcontext ?= "69cae7b2b9f863fe1e0d392825508e63b8a107a4"
 SRCREV_pn-clutter-mozembed ?= "5a5329425aec7fe7749e97fd8c430457259f6165"
-SRCREV_pn-connman ?= "6af0b24817b8712c755ef24ed0ee4c5e84550657"
+SRCREV_pn-connman ?= "5a6c0166e6c7309e3ae28f0edbf6055fed61b07b"
 SRCREV_pn-connman-gnome ?= "4e38b3885654ee9256416e985b7fc615d18462b9"
 SRCREV_pn-contacts ?= "c8e6b16222d5bc9d8f60ae6594af4933613a4e25"
 SRCREV_pn-dalston ?= "b4d03283cb8aa2b76014eeb20e78cd13c14012ae"
diff --git a/meta/packages/connman/connman_git.bb b/meta/packages/connman/connman_git.bb
index f590b3f10f..b7da708e06 100644
--- a/meta/packages/connman/connman_git.bb
+++ b/meta/packages/connman/connman_git.bb
@@ -27,6 +27,7 @@ INITSCRIPT_PARAMS = "start 05 5 2 . stop 22 0 1 6 ."
 inherit autotools_stage pkgconfig update-rc.d
 
 do_install_append() {
+    install -d ${D}${sysconfdir}/init.d/
     install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
 }
 
diff --git a/meta/packages/connman/files/connman-install-tests.patch b/meta/packages/connman/files/connman-install-tests.patch
index 3deda9d72c..0ea3758f2d 100644
--- a/meta/packages/connman/files/connman-install-tests.patch
+++ b/meta/packages/connman/files/connman-install-tests.patch
@@ -1,12 +1,15 @@
-Index: git/test/Makefile.am
+Index: git/Makefile.am
 ===================================================================
---- git.orig/test/Makefile.am   2009-07-24 16:14:10.000000000 +0100
-+++ git/test/Makefile.am        2009-07-24 16:16:18.000000000 +0100
-@@ -1,5 +1,6 @@
-+testdir = $(pkgdatadir)/tests
+--- git.orig/Makefile.am        2009-08-24 15:56:33.000000000 +0100
++++ git/Makefile.am     2009-08-24 16:02:38.000000000 +0100
+@@ -115,7 +115,9 @@
+ tools_wifi_scan_LDADD = @GLIB_LIBS@ @NETLINK_LIBS@
+ endif
  
--EXTRA_DIST = get-state list-profiles list-services connect-service \
-+test_SCRIPTS = get-state list-profiles list-services connect-service \
-                list-connections select-connection \
-                list-devices enable-device disable-device start-scanning \
-                list-networks select-network disable-network create-network \
+-EXTRA_DIST += test/get-state test/list-profiles test/list-services \
++testdir = $(pkgdatadir)/tests
++
++test_SCRIPTS = test/get-state test/list-profiles test/list-services \
+                test/connect-service test/list-connections \
+                test/select-connection test/list-devices test/enable-device \
+                test/disable-device test/start-scanning test/list-networks \