From 4563788a21fb1715920cd5056b43d85c69563c32 Mon Sep 17 00:00:00 2001
From: Cristian Iorga <cristian.iorga@intel.com>
Date: Mon, 4 May 2015 17:15:39 +0300
Subject: connman: upgrade to 1.29

- Add support for Ethernet and VLAN usage;
- Fixes.

Added build-create-dirs-before-putting-files-in-them.patch,
already submitted upstream.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 ...-create-dirs-before-putting-files-in-them.patch | 46 ++++++++++++++++++++++
 meta/recipes-connectivity/connman/connman_1.28.bb  | 12 ------
 meta/recipes-connectivity/connman/connman_1.29.bb  | 13 ++++++
 3 files changed, 59 insertions(+), 12 deletions(-)
 create mode 100644 meta/recipes-connectivity/connman/connman/build-create-dirs-before-putting-files-in-them.patch
 delete mode 100644 meta/recipes-connectivity/connman/connman_1.28.bb
 create mode 100644 meta/recipes-connectivity/connman/connman_1.29.bb

diff --git a/meta/recipes-connectivity/connman/connman/build-create-dirs-before-putting-files-in-them.patch b/meta/recipes-connectivity/connman/connman/build-create-dirs-before-putting-files-in-them.patch
new file mode 100644
index 0000000000..260d68d3df
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/build-create-dirs-before-putting-files-in-them.patch
@@ -0,0 +1,46 @@
+When automake's dependency tracking is enabled a mirror of the source tree is
+created in the build directory as it writes the dependency information.
+
+However, if dependency tracking is disabled on an out-of-tree build this mirror
+isn't created and it's possible that the .service files can't be written as the
+directories they go into haven't been created yet (racing against the compiles,
+which do create directories).
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+---
+ Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 507736d..bc3c695 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -410,9 +410,11 @@ MAINTAINERCLEANFILES = Makefile.in \
+
+
+ src/builtin.h: src/genbuiltin $(builtin_sources)
++	$(AM_V_AT)$(MKDIR_P) $(dir $@)
+ 	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
+
+ vpn/builtin.h: src/genbuiltin $(builtin_vpn_sources)
++	$(AM_V_AT)$(MKDIR_P) $(dir $@)
+ 	$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_vpn_modules) > $@
+
+ src/connman.conf: src/connman-dbus.conf src/connman-polkit.conf
+@@ -449,9 +451,11 @@ do_subst = $(AM_V_GEN)$(SED) \
+ 		-e 's,[@]sysconfdir[@],$(sysconfdir),g'
+
+ %.service: %.service.in Makefile
++	$(AM_V_AT)$(MKDIR_P) $(dir $@)
+ 	$(do_subst) < $< > $@
+
+ scripts/connman: scripts/connman.in Makefile
++	$(AM_V_at)$(MKDIR_P) scripts
+ 	$(do_subst) < $< > $@
+
+ include/connman/version.h: include/version.h
+--
+2.1.4
+
diff --git a/meta/recipes-connectivity/connman/connman_1.28.bb b/meta/recipes-connectivity/connman/connman_1.28.bb
deleted file mode 100644
index 53e71fa000..0000000000
--- a/meta/recipes-connectivity/connman/connman_1.28.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require connman.inc
-
-SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
-            file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
-            file://add_xuser_dbus_permission.patch \
-            file://connman \
-            "
-SRC_URI[md5sum] = "6e07c93877f80bb73c9d4dbfc697f3fc"
-SRC_URI[sha256sum] = "b1d5e7dd2652725906e220a8b0206477e97080e835272971e3b2fd10943c5c94"
-
-RRECOMMENDS_${PN} = "connman-conf"
-
diff --git a/meta/recipes-connectivity/connman/connman_1.29.bb b/meta/recipes-connectivity/connman/connman_1.29.bb
new file mode 100644
index 0000000000..3bcd778ddb
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman_1.29.bb
@@ -0,0 +1,13 @@
+require connman.inc
+
+SRC_URI  = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
+            file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
+            file://add_xuser_dbus_permission.patch \
+            file://build-create-dirs-before-putting-files-in-them.patch \
+            file://connman \
+            "
+SRC_URI[md5sum] = "5283884504860f5fba2e6f489f517293"
+SRC_URI[sha256sum] = "2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594"
+
+RRECOMMENDS_${PN} = "connman-conf"
+
-- 
cgit 1.2.3-korg