And bump the PR to avoid: configure: error: source directory already configured; run "make distclean" there first
Signed-off-by: Robert Yang <[email protected]> --- meta/recipes-connectivity/connman/connman.inc | 14 +++++++------- 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" -- 1.7.9.5 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
