From 34fe984fc64a9f51d5b2d563eedac6f5163b250a Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 10 Jun 2012 21:46:54 +0000 Subject: xinput-calibrator: : move systemd support to meta-systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../xinput-calibrator/xinput-calibrator.service | 11 ----------- .../xinput-calibrator/xinput-calibrator_0.7.5.bb | 8 ++------ .../xinput-calibrator/xinput-calibrator.service | 11 +++++++++++ .../xinput-calibrator/xinput-calibrator_0.7.5.bbappend | 10 ++++++++++ 4 files changed, 23 insertions(+), 17 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service create mode 100644 meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service create mode 100644 meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_0.7.5.bbappend diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service deleted file mode 100644 index e23bfc4f1f..0000000000 --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Loads xinput calibration data -ConditionPathExists=/etc/pointercal.xinput -Requires=xserver-nodm.service -After=xserver-nodm.service - -[Service] -ExecStart=/usr/bin/xinput_calibrator_once.sh - -[Install] -WantedBy=multi-user.target 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-systemd/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 new file mode 100644 index 0000000000..e23bfc4f1f --- /dev/null +++ b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service @@ -0,0 +1,11 @@ +[Unit] +Description=Loads xinput calibration data +ConditionPathExists=/etc/pointercal.xinput +Requires=xserver-nodm.service +After=xserver-nodm.service + +[Service] +ExecStart=/usr/bin/xinput_calibrator_once.sh + +[Install] +WantedBy=multi-user.target 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" -- cgit v1.2.3-54-g00ecf