From 5aea1a72f85f7f61c5f928091302b8d78c150c91 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 26 Jul 2013 20:24:02 +0200 Subject: 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 --- recipes-connectivity/connman/connman_1.12.bbappend | 2 -- recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend | 6 ++++-- recipes-qt/qt4/qt4-x11-free-systemd.bb | 3 +++ 3 files changed, 7 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-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" -- cgit v1.2.3