diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 14:40:23 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:04 +0200 |
| commit | f2b3287cc162169028ad59e9fc5ebde8e03cbb04 (patch) | |
| tree | f149602f36a6a9c1bbd7cf3f7bd2c584e202003a /meta-oe/recipes-graphics | |
| parent | ca1f7c0399905206be0bc5f36fc0c881b915e4f0 (diff) | |
| download | meta-openembedded-f2b3287cc162169028ad59e9fc5ebde8e03cbb04.tar.gz | |
xinput-calibrator: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
| -rw-r--r-- | meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service | 11 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 15 |
2 files changed, 23 insertions, 3 deletions
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 new file mode 100644 index 0000000000..23018768d9 --- /dev/null +++ b/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=display-manager.service +After=display-manager.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_git.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index 97f9343804..b01f62dab0 100644 --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb @@ -5,12 +5,13 @@ LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f340 DEPENDS = "virtual/libx11 libxi" PV = "0.7.5+git${SRCPV}" -PR = "r1" +PR = "r5" -inherit autotools +inherit autotools systemd SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" -SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git" +SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \ + file://xinput-calibrator.service" S = "${WORKDIR}/git" @@ -24,8 +25,16 @@ do_install_append() { install -d ${D}${sysconfdir}/xdg/autostart sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system } FILES_${PN} += "${sysconfdir}/xdg/autostart" RDEPENDS_${PN} = "xinput xterm" RRECOMMENDS_${PN} = "pointercal-xinput" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "${PN}.service" |