summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2014-04-30 11:33:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-29 13:42:20 +0100
commit651f3dc07815724ed70389425579227a3881d6cf (patch)
tree4295d5022eeff9fbe10307f03f9569ecce78b099 /meta
parent8333887235a2e1765a07daef24b912e046a9d7e0 (diff)
downloadpoky-651f3dc07815724ed70389425579227a3881d6cf.tar.gz
xinput-calibrator: fix XDG launch
In the move from meta-oe to OE-core XDG based launched was dropped without noting it in the commit message, so fix that regression. Gnome-session will now launch the calibrator again. (From OE-Core rev: 64e0c8a7585a36964988f2f00ac89eda514d5f7b) (From OE-Core rev: 956b39c3d01141402af7d98a2c60097b2db0030f) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 3f97e197ad..95abfce816 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -25,7 +25,11 @@ do_install_append() {
25 25
26 install -d ${D}${sysconfdir}/X11/Xsession.d/ 26 install -d ${D}${sysconfdir}/X11/Xsession.d/
27 install -m 0755 ${WORKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ 27 install -m 0755 ${WORKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/
28
29 install -d ${D}${sysconfdir}/xdg/autostart
30 sed -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' ${S}/scripts/xinput_calibrator.desktop > ${D}${sysconfdir}/xdg/autostart/xinput_calibrator.desktop
28} 31}
29 32
33FILES_${PN} += "${sysconfdir}/xdg/autostart"
30RDEPENDS_${PN} = "xinput formfactor" 34RDEPENDS_${PN} = "xinput formfactor"
31RRECOMMENDS_${PN} = "pointercal-xinput" 35RRECOMMENDS_${PN} = "pointercal-xinput"