summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/connman/connman/build-create-dirs-before-putting-files-in-them.patch46
-rw-r--r--meta/recipes-connectivity/connman/connman_1.30.bb (renamed from meta/recipes-connectivity/connman/connman_1.29.bb)5
2 files changed, 2 insertions, 49 deletions
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
index 260d68d3df..0000000000
--- a/meta/recipes-connectivity/connman/connman/build-create-dirs-before-putting-files-in-them.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1When automake's dependency tracking is enabled a mirror of the source tree is
2created in the build directory as it writes the dependency information.
3
4However, if dependency tracking is disabled on an out-of-tree build this mirror
5isn't created and it's possible that the .service files can't be written as the
6directories they go into haven't been created yet (racing against the compiles,
7which do create directories).
8
9Upstream-Status: Pending
10Signed-off-by: Ross Burton <ross.burton@intel.com>
11
12---
13 Makefile.am | 4 ++++
14 1 file changed, 4 insertions(+)
15
16diff --git a/Makefile.am b/Makefile.am
17index 507736d..bc3c695 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -410,9 +410,11 @@ MAINTAINERCLEANFILES = Makefile.in \
21
22
23 src/builtin.h: src/genbuiltin $(builtin_sources)
24+ $(AM_V_AT)$(MKDIR_P) $(dir $@)
25 $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
26
27 vpn/builtin.h: src/genbuiltin $(builtin_vpn_sources)
28+ $(AM_V_AT)$(MKDIR_P) $(dir $@)
29 $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_vpn_modules) > $@
30
31 src/connman.conf: src/connman-dbus.conf src/connman-polkit.conf
32@@ -449,9 +451,11 @@ do_subst = $(AM_V_GEN)$(SED) \
33 -e 's,[@]sysconfdir[@],$(sysconfdir),g'
34
35 %.service: %.service.in Makefile
36+ $(AM_V_AT)$(MKDIR_P) $(dir $@)
37 $(do_subst) < $< > $@
38
39 scripts/connman: scripts/connman.in Makefile
40+ $(AM_V_at)$(MKDIR_P) scripts
41 $(do_subst) < $< > $@
42
43 include/connman/version.h: include/version.h
44--
452.1.4
46
diff --git a/meta/recipes-connectivity/connman/connman_1.29.bb b/meta/recipes-connectivity/connman/connman_1.30.bb
index 3bcd778ddb..8c47353bcf 100644
--- 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
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ 3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
5 file://add_xuser_dbus_permission.patch \ 5 file://add_xuser_dbus_permission.patch \
6 file://build-create-dirs-before-putting-files-in-them.patch \
7 file://connman \ 6 file://connman \
8 " 7 "
9SRC_URI[md5sum] = "5283884504860f5fba2e6f489f517293" 8SRC_URI[md5sum] = "4a3efdbd6796922db9c6f66da57887fa"
10SRC_URI[sha256sum] = "2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594" 9SRC_URI[sha256sum] = "5c5e464bacc9c27ed4e7269fb9b5059f07947f5be26433b59212133663ffa991"
11 10
12RRECOMMENDS_${PN} = "connman-conf" 11RRECOMMENDS_${PN} = "connman-conf"
13 12