connman: upgrade to 1.30

Bugfixes.

build-create-dirs-before-putting-files-in-them.patch
patch removed, patch included upstream.

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

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
deleted file mode 100644 (file)
index 260d68d..0000000
--- a/meta/recipes-connectivity/connman/connman/build-create-dirs-before-putting-files-in-them.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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.29.bb b/meta/recipes-connectivity/connman/connman_1.30.bb
similarity index 58%
rename from meta/recipes-connectivity/connman/connman_1.29.bb
rename to meta/recipes-connectivity/connman/connman_1.30.bb
index 3bcd778ddb6303ef240e19c66d19885a64d1246e..8c47353bcfaafad72b0e2c2017f715dbe9a83742 100644 (file)
--- a/meta/recipes-connectivity/connman/connman_1.29.bb
+++ b/meta/recipes-connectivity/connman/connman_1.30.bb
@@ -3,11 +3,10 @@ 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"
+SRC_URI[md5sum] = "4a3efdbd6796922db9c6f66da57887fa"
+SRC_URI[sha256sum] = "5c5e464bacc9c27ed4e7269fb9b5059f07947f5be26433b59212133663ffa991"
 
 RRECOMMENDS_${PN} = "connman-conf"