summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-12 19:08:51 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:08:27 +0000
commit03ab499a0546b7b98e3496223a8d1d18d3305564 (patch)
tree74ceaa006f5f62ff93d99b5bef8f727c955b6ae2
parent55a45864ead1a47b144b3c4583e82c086700d16f (diff)
downloadpoky-03ab499a0546b7b98e3496223a8d1d18d3305564.tar.gz
connman: fix B != S
And bump the PR to avoid: configure: error: source directory already configured; run "make distclean" there first (From OE-Core rev: 38aa1ef57392fcb726fcdd0b708b9d76f0279c77) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman.inc14
-rw-r--r--meta/recipes-connectivity/connman/connman_1.26.bb2
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ddabdb96f5..736b324704 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -67,18 +67,18 @@ SYSTEMD_SERVICE_${PN} = "connman.service"
67SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" 67SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
68SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" 68SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
69 69
70inherit autotools-brokensep pkgconfig systemd update-rc.d 70inherit autotools pkgconfig systemd update-rc.d
71 71
72do_configure_append () { 72do_configure_append () {
73 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service 73 sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service
74} 74}
75 75
76# This allows *everyone* to access ConnMan over DBus, without any access 76# This allows *everyone* to access ConnMan over DBus, without any access
77# control. Really the at_console flag should work, which would mean that 77# control. Really the at_console flag should work, which would mean that
78# both this and the xuser patch can be dropped. 78# both this and the xuser patch can be dropped.
79do_compile_append() { 79do_compile_append() {
80 sed -i -e s:deny:allow:g src/connman-dbus.conf 80 sed -i -e s:deny:allow:g ${S}/src/connman-dbus.conf
81 sed -i -e s:deny:allow:g vpn/vpn-dbus.conf 81 sed -i -e s:deny:allow:g ${S}/vpn/vpn-dbus.conf
82} 82}
83 83
84do_install_append() { 84do_install_append() {
@@ -89,9 +89,9 @@ do_install_append() {
89 fi 89 fi
90 90
91 install -d ${D}${bindir} 91 install -d ${D}${bindir}
92 install -m 0755 ${S}/tools/*-test ${D}${bindir} 92 install -m 0755 ${B}/tools/*-test ${D}${bindir}
93 if [ -e ${S}/tools/wispr ]; then 93 if [ -e ${B}/tools/wispr ]; then
94 install -m 0755 ${S}/tools/wispr ${D}${bindir} 94 install -m 0755 ${B}/tools/wispr ${D}${bindir}
95 fi 95 fi
96 install -m 0755 ${B}/client/connmanctl ${D}${bindir} 96 install -m 0755 ${B}/client/connmanctl ${D}${bindir}
97 97
diff --git a/meta/recipes-connectivity/connman/connman_1.26.bb b/meta/recipes-connectivity/connman/connman_1.26.bb
index b93f1cd6c3..7c0c4f7863 100644
--- a/meta/recipes-connectivity/connman/connman_1.26.bb
+++ b/meta/recipes-connectivity/connman/connman_1.26.bb
@@ -9,3 +9,5 @@ SRC_URI[md5sum] = "ba05b110b7c81e5fa14e8b402ef37a9e"
9SRC_URI[sha256sum] = "7184e4b6d954449ee00a30e188924b3e37a20ad2fd9a0b76a2bdd82c863dcf8a" 9SRC_URI[sha256sum] = "7184e4b6d954449ee00a30e188924b3e37a20ad2fd9a0b76a2bdd82c863dcf8a"
10 10
11RRECOMMENDS_${PN} = "connman-conf" 11RRECOMMENDS_${PN} = "connman-conf"
12
13PR = "r1"