diff options
-rw-r--r-- | meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service (renamed from meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 15 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend | 18 |
3 files changed, 12 insertions, 21 deletions
diff --git a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service index 23018768d..23018768d 100644 --- a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service +++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator/xinput-calibrator.service | |||
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 97f934380..b01f62dab 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 | |||
5 | DEPENDS = "virtual/libx11 libxi" | 5 | DEPENDS = "virtual/libx11 libxi" |
6 | 6 | ||
7 | PV = "0.7.5+git${SRCPV}" | 7 | PV = "0.7.5+git${SRCPV}" |
8 | PR = "r1" | 8 | PR = "r5" |
9 | 9 | ||
10 | inherit autotools | 10 | inherit autotools systemd |
11 | 11 | ||
12 | SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" | 12 | SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" |
13 | SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git" | 13 | SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \ |
14 | file://xinput-calibrator.service" | ||
14 | 15 | ||
15 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
16 | 17 | ||
@@ -24,8 +25,16 @@ do_install_append() { | |||
24 | install -d ${D}${sysconfdir}/xdg/autostart | 25 | install -d ${D}${sysconfdir}/xdg/autostart |
25 | sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop | 26 | sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop |
26 | install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart | 27 | install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart |
28 | |||
29 | install -d ${D}${systemd_unitdir}/system | ||
30 | install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system | ||
27 | } | 31 | } |
28 | 32 | ||
29 | FILES_${PN} += "${sysconfdir}/xdg/autostart" | 33 | FILES_${PN} += "${sysconfdir}/xdg/autostart" |
30 | RDEPENDS_${PN} = "xinput xterm" | 34 | RDEPENDS_${PN} = "xinput xterm" |
31 | RRECOMMENDS_${PN} = "pointercal-xinput" | 35 | RRECOMMENDS_${PN} = "pointercal-xinput" |
36 | |||
37 | RPROVIDES_${PN} += "${PN}-systemd" | ||
38 | RREPLACES_${PN} += "${PN}-systemd" | ||
39 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
40 | SYSTEMD_SERVICE_${PN} = "${PN}.service" | ||
diff --git a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend b/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend deleted file mode 100644 index 5c143467d..000000000 --- a/meta-systemd/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | PRINC := "${@int(PRINC) + 3}" | ||
4 | |||
5 | inherit systemd | ||
6 | |||
7 | SRC_URI += "file://xinput-calibrator.service" | ||
8 | |||
9 | RPROVIDES_${PN} += "${PN}-systemd" | ||
10 | RREPLACES_${PN} += "${PN}-systemd" | ||
11 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
12 | SYSTEMD_SERVICE_${PN} = "${PN}.service" | ||
13 | |||
14 | do_install_append() { | ||
15 | install -d ${D}${systemd_unitdir}/system | ||
16 | install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system | ||
17 | } | ||
18 | |||