mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

connman: fix B != S

Browse Source 
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>
This commit is contained in:
Robert Yang
2015-01-12 19:08:51 -08:00
committed by Richard Purdie
parent 55a45864ea
commit 03ab499a05
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/connman/connman.inc
+7 -7
View 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}
meta/recipes-connectivity/connman/connman_1.26.bb
+2
View File
@@ -9,3 +9,5 @@ SRC_URI[md5sum] = "ba05b110b7c81e5fa14e8b402ef37a9e"
SRC_URI[sha256sum] = "7184e4b6d954449ee00a30e188924b3e37a20ad2fd9a0b76a2bdd82c863dcf8a"
RRECOMMENDS_${PN} = "connman-conf"
PR = "r1"