summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2013-07-26 20:24:02 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2013-09-22 11:09:16 +0200
commite1d1c86ee9f14c93100fc706c1a3f7db03a0301f (patch)
tree7e2558a6cafad336766fa0fa12adeccf922ebd15
parentbb284933997c40ee86b4243e77f331d1b3fc6f7e (diff)
systemd: adapt to new systemd handling
with the move from meta-openembedded to oe-core some things have changed, e.g. the config files have to explicitly installed
-rw-r--r--recipes-connectivity/connman/connman_1.12.bbappend2
-rw-r--r--recipes-core/fs-init/fs-init.bb3
-rw-r--r--recipes-core/usb-rndis/usb-rndis-systemd.bb3
-rw-r--r--recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend6
-rw-r--r--recipes-qt/qt4/qt4-x11-free-systemd.bb3
5 files changed, 13 insertions, 4 deletions
diff --git a/recipes-connectivity/connman/connman_1.12.bbappend b/recipes-connectivity/connman/connman_1.12.bbappend
index 53e7eb6..94fcfd6 100644
--- a/recipes-connectivity/connman/connman_1.12.bbappend
+++ b/recipes-connectivity/connman/connman_1.12.bbappend
@@ -5,5 +5,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
file://dont_start_connman_on_nfsboot.patch \
"
-
-SYSTEMD_PACKAGES = "${PN}-systemd"
diff --git a/recipes-core/fs-init/fs-init.bb b/recipes-core/fs-init/fs-init.bb
index b2b61a8..1a06a7e 100644
--- a/recipes-core/fs-init/fs-init.bb
+++ b/recipes-core/fs-init/fs-init.bb
@@ -16,6 +16,9 @@ do_compile () {
do_install () {
install -d ${D}/${sbindir}
install -m 0755 ${WORKDIR}/*.sh ${D}/${sbindir}
+
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/resizefs.service ${D}${systemd_unitdir}/system
}
NATIVE_SYSTEMD_SUPPORT = "1"
diff --git a/recipes-core/usb-rndis/usb-rndis-systemd.bb b/recipes-core/usb-rndis/usb-rndis-systemd.bb
index 5d18b7a..ec4f4cf 100644
--- a/recipes-core/usb-rndis/usb-rndis-systemd.bb
+++ b/recipes-core/usb-rndis/usb-rndis-systemd.bb
@@ -25,6 +25,9 @@ do_install() {
install -m 0755 ${WORKDIR}/start-rndis.sh ${D}/${bindir}/
install -m 0644 ${WORKDIR}/usb-rndis.rules ${D}/${sysconfdir}/udev/rules.d/
install -m 0644 ${WORKDIR}/udhcpd-usb-rndis.conf ${D}/${sysconfdir}/
+
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/usb-rndis.service ${D}${systemd_unitdir}/system
}
NATIVE_SYSTEMD_SUPPORT = "1"
diff --git a/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend b/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
index 2d5a610..bfeb99e 100644
--- a/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
+++ b/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend
@@ -6,11 +6,13 @@ inherit systemd
SRC_URI += "file://xinput-calibrator.service"
-SYSTEMD_PACKAGES = "${PN}-systemd"
SYSTEMD_SERVICE = "${PN}.service"
# menu entry should make the calibration permanent instead of printing cal data into a terminal
do_install_append() {
install -m 0755 ${D}/usr/share/applications/xinput_calibrator.desktop ${D}/usr/share/applications/xinput_calibrator.desktop.old
sed -i -e 's/xinput_calibrator; cat/rm -f \/etc\/pointercal.xinput; xinput_calibrator_once.sh/' ${D}/usr/share/applications/xinput_calibrator.desktop
-} \ No newline at end of file
+
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system
+}
diff --git a/recipes-qt/qt4/qt4-x11-free-systemd.bb b/recipes-qt/qt4/qt4-x11-free-systemd.bb
index 2c8227c..3e426f9 100644
--- a/recipes-qt/qt4/qt4-x11-free-systemd.bb
+++ b/recipes-qt/qt4/qt4-x11-free-systemd.bb
@@ -17,6 +17,9 @@ FILES_${PN} += " ${sysconfdir}/init.d "
do_install () {
install -d ${D}/${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/qtdemo-init ${D}/${sysconfdir}/init.d/
+
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/qtdemo.service ${D}${systemd_unitdir}/system
}
NATIVE_SYSTEMD_SUPPORT = "1"