diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2012-06-10 21:46:54 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:07 +0200 |
| commit | 34fe984fc64a9f51d5b2d563eedac6f5163b250a (patch) | |
| tree | c474a459929028ed8a0f85fa0491b5a283820c92 | |
| parent | 23d5e850653e92a97bb06a678e5bc07249427f57 (diff) | |
| download | meta-openembedded-contrib-34fe984fc64a9f51d5b2d563eedac6f5163b250a.tar.gz | |
xinput-calibrator: : move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
| -rw-r--r-- | meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bb | 8 | ||||
| -rw-r--r-- | meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service (renamed from meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service) | 0 | ||||
| -rw-r--r-- | meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/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 fc5da49427..edc10bda40 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 index e23bfc4f1f..e23bfc4f1f 100644 --- 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 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 0000000000..e12abec4cc --- /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" |