summaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorEnrico Jorns <ejo@pengutronix.de>2016-08-31 11:52:01 +0200
committerEnrico Jorns <ejo@pengutronix.de>2016-09-13 16:40:58 +0200
commit96c1eeffceec3bc8a7f2d1efaca6c0698463c068 (patch)
tree2c09b29681f4976ca676193e2faa16e1a237fc20 /recipes-core
parent434620903fb3dc81f766d4193d8a86ffc0478a56 (diff)
downloadmeta-ptx-96c1eeffceec3bc8a7f2d1efaca6c0698463c068.tar.gz
meta-ptx-96c1eeffceec3bc8a7f2d1efaca6c0698463c068.tar.xz
rauc: no need to install service files manually, anymore
The rauc build system now handles installation of service files. Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/rauc/rauc.inc15
1 files changed, 6 insertions, 9 deletions
diff --git a/recipes-core/rauc/rauc.inc b/recipes-core/rauc/rauc.inc
index 07a4d1f..bc7531a 100644
--- a/recipes-core/rauc/rauc.inc
+++ b/recipes-core/rauc/rauc.inc
@@ -14,8 +14,11 @@ RRECOMMENDS_${PN}_append_class-target = " mtd-utils ${PN}-mark-good"
PACKAGES =+ "${PN}-service ${PN}-mark-good"
FILES_${PN}_append = " /mnt/rauc"
-FILES_${PN}-service = "${sysconfdir}/dbus-1/system.d/de.pengutronix.rauc.conf"
-FILES_${PN}-service += "${systemd_unitdir}/system/rauc.service"
+FILES_${PN}-service = "\
+ ${systemd_unitdir}/system/rauc.service \
+ ${datadir}/dbus-1/system.d/de.pengutronix.rauc.conf \
+ ${datadir}/dbus-1/system-services/de.pengutronix.rauc.service \
+ "
FILES_${PN}-mark-good = "${systemd_unitdir}/system/rauc-mark-good.service"
PACKAGECONFIG ??= "service network json"
@@ -55,13 +58,7 @@ do_install_append_class-target () {
bbwarn "No keyring file provided"
fi
- # D-bus service
- install -d ${D}${sysconfdir}/dbus-1/system.d/
- install -m 0644 ${S}/data/de.pengutronix.rauc.conf ${D}${sysconfdir}/dbus-1/system.d/
-
- # Systemd service
- install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/rauc.service ${D}${systemd_unitdir}/system/
+ install -d ${D}${systemd_unitdir}/system/
install -m 0644 ${WORKDIR}/rauc-mark-good.service ${D}${systemd_unitdir}/system/
sed -i -e 's!@BINDIR@!${bindir}!g' ${D}${systemd_unitdir}/system/*.service