]> code.ossystems Code Review - openembedded-core.git/commitdiff
connman: fix B != S
authorRobert Yang <liezhi.yang@windriver.com>
Tue, 13 Jan 2015 03:08:51 +0000 (19:08 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 16 Jan 2015 23:06:46 +0000 (23:06 +0000)
And bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
meta/recipes-connectivity/connman/connman.inc
meta/recipes-connectivity/connman/connman_1.26.bb

index ddabdb96f5cfff67c03e09e3f0c503670acef291..736b324704541832e6866f21cd8a224ae3b289d7 100644 (file)
@@ -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}
 
index b93f1cd6c3e9a13c0b129830501bff83d7fdc510..7c0c4f78636fd51d1e8db6ad325add279e3d7b3f 100644 (file)
@@ -9,3 +9,5 @@ SRC_URI[md5sum] = "ba05b110b7c81e5fa14e8b402ef37a9e"
 SRC_URI[sha256sum] = "7184e4b6d954449ee00a30e188924b3e37a20ad2fd9a0b76a2bdd82c863dcf8a"
 
 RRECOMMENDS_${PN} = "connman-conf"
+
+PR = "r1"