diff options
| -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 | 42 |
2 files changed, 0 insertions, 53 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 deleted file mode 100644 index 23018768d9..0000000000 --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | [Unit] | ||
| 2 | Description=Loads xinput calibration data | ||
| 3 | ConditionPathExists=/etc/pointercal.xinput | ||
| 4 | Requires=display-manager.service | ||
| 5 | After=display-manager.service | ||
| 6 | |||
| 7 | [Service] | ||
| 8 | ExecStart=/usr/bin/xinput_calibrator_once.sh | ||
| 9 | |||
| 10 | [Install] | ||
| 11 | 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 deleted file mode 100644 index 640aef1fc0..0000000000 --- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ /dev/null | |||
| @@ -1,42 +0,0 @@ | |||
| 1 | DESCRIPTION = "A generic touchscreen calibration program for X.Org" | ||
| 2 | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/xinput_calibrator" | ||
| 3 | LICENSE = "MIT-X" | ||
| 4 | LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f34021557898e4b5a" | ||
| 5 | DEPENDS = "virtual/libx11 libxi" | ||
| 6 | |||
| 7 | PV = "0.7.5+git${SRCPV}" | ||
| 8 | PR = "r6" | ||
| 9 | |||
| 10 | inherit autotools systemd | ||
| 11 | |||
| 12 | SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" | ||
| 13 | SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \ | ||
| 14 | file://xinput-calibrator.service" | ||
| 15 | |||
| 16 | S = "${WORKDIR}/git" | ||
| 17 | |||
| 18 | # force native X11 ui as we don't have gtk+ in DEPENDS | ||
| 19 | EXTRA_OECONF += "--with-gui=x11" | ||
| 20 | |||
| 21 | do_install_append() { | ||
| 22 | install -d ${D}${bindir} | ||
| 23 | install -m 0755 scripts/xinput_calibrator_pointercal.sh ${D}${bindir}/xinput_calibrator_once.sh | ||
| 24 | |||
| 25 | install -d ${D}${sysconfdir}/xdg/autostart | ||
| 26 | sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop | ||
| 27 | install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart | ||
| 28 | |||
| 29 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | ||
| 30 | install -d ${D}${systemd_unitdir}/system | ||
| 31 | install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system | ||
| 32 | fi | ||
| 33 | } | ||
| 34 | |||
| 35 | FILES_${PN} += "${sysconfdir}/xdg/autostart" | ||
| 36 | RDEPENDS_${PN} = "xinput xterm" | ||
| 37 | RRECOMMENDS_${PN} = "pointercal-xinput" | ||
| 38 | |||
| 39 | RPROVIDES_${PN} += "${PN}-systemd" | ||
| 40 | RREPLACES_${PN} += "${PN}-systemd" | ||
| 41 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
| 42 | SYSTEMD_SERVICE_${PN} = "${PN}.service" | ||
