[oe-commits] Andreas Müller : xinput-calibrator: : move systemd support to meta-systemd
git at git.openembedded.org
git at git.openembedded.org
Mon Jul 16 07:43:03 UTC 2012
Module: meta-openembedded.git
Branch: master
Commit: 34fe984fc64a9f51d5b2d563eedac6f5163b250a
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=34fe984fc64a9f51d5b2d563eedac6f5163b250a
Author: Andreas Müller <schnitzeltony at googlemail.com>
Date: Sun Jun 10 21:46:54 2012 +0000
xinput-calibrator: : move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
.../xinput-calibrator/xinput-calibrator_0.7.5.bb | 8 ++------
.../xinput-calibrator/xinput-calibrator.service | 0
.../xinput-calibrator_0.7.5.bbappend | 10 ++++++++++
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
index fc5da49..edc10bd 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb
@@ -4,13 +4,12 @@ LICENSE = "MIT-X"
LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=998e238a7638a7446eaeb02398f691fc"
DEPENDS = "virtual/libx11 libxi"
-PR = "r7"
+PR = "r8"
-inherit autotools systemd
+inherit autotools
SRC_URI = "http://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-${PV}.tar.gz \
file://0001-xinput_calibrator_pointercal.sh-specify-output-type-.patch \
- file://xinput-calibrator.service \
file://xinput-calibrator-autostart.desktop \
"
SRC_URI[md5sum] = "20da0a2055a5a75962add8c6b44f60fa"
@@ -29,9 +28,6 @@ do_install_append() {
install -m 0644 ${WORKDIR}/xinput-calibrator-autostart.desktop ${D}${sysconfdir}/xdg/autostart
}
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "${PN}.service"
-
FILES_${PN} += "${sysconfdir}/xdg/autostart"
RDEPENDS_${PN} = "xinput xterm"
RRECOMMENDS_${PN} = "pointercal-xinput"
diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
similarity index 100%
rename from meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
rename to meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service
diff --git a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend
new file mode 100644
index 0000000..e12abec
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+inherit systemd
+
+SRC_URI += "file://xinput-calibrator.service"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
More information about the Openembedded-commits
mailing list