summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@iot.bzh>2016-08-14 18:12:34 +0000
committerStephane Desneux <stephane.desneux@iot.bzh>2016-08-14 18:12:34 +0000
commitc5fa38b84355c652b375f08550792ec6b4a2f149 (patch)
treed9ff23aafe62904a17fc97933db839dfdd3a1a2e
parent744c7b109356ca76ed3e97a1858c64a54cc9310f (diff)
nativesdk-dbus: fix spurious unpackaged files
When building agl-demo-platform-crosssdk, the package nativesdk-dbus is required. In the post-install step for the normal package dbus, some systemd files and symbolic links are added, but this shouldn't happen when building the nativesdk package, as those added files are not packaged, thus creating a QA Error (some files are installed in sysroot but not packaged) Bug-AGL: SPEC-235 Change-Id: Ib4894309355b807d52b34934a2f8a0bdebe3a01a Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
-rw-r--r--meta-agl/recipes-core/dbus/dbus_%.bbappend18
1 files changed, 10 insertions, 8 deletions
diff --git a/meta-agl/recipes-core/dbus/dbus_%.bbappend b/meta-agl/recipes-core/dbus/dbus_%.bbappend
index b27e44d99..e65fe9ede 100644
--- a/meta-agl/recipes-core/dbus/dbus_%.bbappend
+++ b/meta-agl/recipes-core/dbus/dbus_%.bbappend
@@ -8,15 +8,17 @@ SRC_URI_append = "file://dbus.service \
inherit systemd
do_install_append() {
- if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
- install -m 644 -p -D ${WORKDIR}/dbus.service ${D}${systemd_user_unitdir}/dbus.service
- install -m 644 -p -D ${WORKDIR}/dbus.socket ${D}${systemd_user_unitdir}/dbus.socket
- install -m 644 -p -D ${WORKDIR}/dbus_env.conf ${D}${systemd_system_unitdir}/user@.service.d/dbus_env.conf
+ if [ "${PN}" != "nativesdk-dbus" ]; then
+ if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+ install -m 644 -p -D ${WORKDIR}/dbus.service ${D}${systemd_user_unitdir}/dbus.service
+ install -m 644 -p -D ${WORKDIR}/dbus.socket ${D}${systemd_user_unitdir}/dbus.socket
+ install -m 644 -p -D ${WORKDIR}/dbus_env.conf ${D}${systemd_system_unitdir}/user@.service.d/dbus_env.conf
- # Execute these manually on behalf of systemctl script (from systemd-systemctl-native.bb)
- # because it does not support systemd's user mode.
- mkdir -p ${D}/etc/systemd/user/default.target.wants/
- ln -sf ${systemd_user_unitdir}/dbus.socket ${D}/etc/systemd/user/default.target.wants/dbus.socket
+ # Execute these manually on behalf of systemctl script (from systemd-systemctl-native.bb)
+ # because it does not support systemd's user mode.
+ mkdir -p ${D}/etc/systemd/user/default.target.wants/
+ ln -sf ${systemd_user_unitdir}/dbus.socket ${D}/etc/systemd/user/default.target.wants/dbus.socket
+ fi
fi
}