diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-12 19:08:51 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 23:08:27 +0000 |
| commit | 03ab499a0546b7b98e3496223a8d1d18d3305564 (patch) | |
| tree | 74ceaa006f5f62ff93d99b5bef8f727c955b6ae2 /meta/recipes-connectivity/connman | |
| parent | 55a45864ead1a47b144b3c4583e82c086700d16f (diff) | |
| download | ast2050-yocto-poky-03ab499a0546b7b98e3496223a8d1d18d3305564.zip ast2050-yocto-poky-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>
Diffstat (limited to 'meta/recipes-connectivity/connman')
| -rw-r--r-- | meta/recipes-connectivity/connman/connman.inc | 14 | ||||
| -rw-r--r-- | meta/recipes-connectivity/connman/connman_1.26.bb | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index ddabdb9..736b324 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -67,18 +67,18 @@ SYSTEMD_SERVICE_${PN} = "connman.service" SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup" -inherit autotools-brokensep pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd update-rc.d do_configure_append () { - sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service + sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${B}/src/connman.service } # This allows *everyone* to access ConnMan over DBus, without any access # control. Really the at_console flag should work, which would mean that # both this and the xuser patch can be dropped. do_compile_append() { - sed -i -e s:deny:allow:g src/connman-dbus.conf - sed -i -e s:deny:allow:g vpn/vpn-dbus.conf + sed -i -e s:deny:allow:g ${S}/src/connman-dbus.conf + sed -i -e s:deny:allow:g ${S}/vpn/vpn-dbus.conf } do_install_append() { @@ -89,9 +89,9 @@ do_install_append() { fi install -d ${D}${bindir} - install -m 0755 ${S}/tools/*-test ${D}${bindir} - if [ -e ${S}/tools/wispr ]; then - install -m 0755 ${S}/tools/wispr ${D}${bindir} + install -m 0755 ${B}/tools/*-test ${D}${bindir} + if [ -e ${B}/tools/wispr ]; then + install -m 0755 ${B}/tools/wispr ${D}${bindir} fi install -m 0755 ${B}/client/connmanctl ${D}${bindir} diff --git a/meta/recipes-connectivity/connman/connman_1.26.bb b/meta/recipes-connectivity/connman/connman_1.26.bb index b93f1cd..7c0c4f7 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" SRC_URI[sha256sum] = "7184e4b6d954449ee00a30e188924b3e37a20ad2fd9a0b76a2bdd82c863dcf8a" RRECOMMENDS_${PN} = "connman-conf" + +PR = "r1" |
