summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2015-05-04 17:15:39 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-05 22:15:18 +0100
commitfd584e0ad7946aa8170a5203145c2ec1fdc29f2c (patch)
treec15bc83b73afa68b1c3f2abd76311a97beee3110 /meta/recipes-connectivity/connman
parent1f6d4cc971da5ad04d5ceb52337116a2016560c9 (diff)
downloadpoky-fd584e0ad7946aa8170a5203145c2ec1fdc29f2c.tar.gz
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. (From OE-Core rev: 4563788a21fb1715920cd5056b43d85c69563c32) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-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.29.bb (renamed from meta/recipes-connectivity/connman/connman_1.28.bb)5
2 files changed, 49 insertions, 2 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
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 @@
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.28.bb b/meta/recipes-connectivity/connman/connman_1.29.bb
index 53e71fa000..3bcd778ddb 100644
--- a/meta/recipes-connectivity/connman/connman_1.28.bb
+++ b/meta/recipes-connectivity/connman/connman_1.29.bb
@@ -3,10 +3,11 @@ 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 \
6 file://connman \ 7 file://connman \
7 " 8 "
8SRC_URI[md5sum] = "6e07c93877f80bb73c9d4dbfc697f3fc" 9SRC_URI[md5sum] = "5283884504860f5fba2e6f489f517293"
9SRC_URI[sha256sum] = "b1d5e7dd2652725906e220a8b0206477e97080e835272971e3b2fd10943c5c94" 10SRC_URI[sha256sum] = "2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594"
10 11
11RRECOMMENDS_${PN} = "connman-conf" 12RRECOMMENDS_${PN} = "connman-conf"
12 13