[OE-core] [PATCH 2/2] xinput-calibrator: fix XDG launch

[Koen Kooi]

Op 30 apr. 2014, om 01:04 heeft Saul Wold <sgw at linux.intel.com> het volgende geschreven:

> On 04/28/2014 10:37 PM, Koen Kooi wrote:
>> 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.
>> 
>> Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
>> ---
>>  meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 4 ++++
>>  1 file changed, 4 insertions(+)
>> 
>> diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
>> index 3f97e19..f942c55 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() {
>> 
>>      install -d ${D}${sysconfdir}/X11/Xsession.d/
>>      install -m 0755 ${WORKDIR}/30xinput_calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/
>> +
>> +    install -d ${D}${sysconfdir}/xdg/autostart
>> +    sed -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop > ${D}${sysconfdir}/xdg/autostart/xinput_calibrator.desktop
> 
> This sed line is not quite right:
>> | sed: can't read scripts/xinput_calibrator.desktop: No such file or directory
>> | WARNING: /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/xinput-calibrator/0.7.5+gitAUTOINC+c01c5af807-r6/temp/run.do_install.23227:1 exit 2 from
>> |   sed -e 's,^Exec=.*,Exec=/usr/bin/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop > /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/xinput-calibrator/0.7.5+gitAUTOINC+c01c5af807-r6/image/etc/xdg/autostart/xinput_calibrator.desktop
>> | ERROR: Function failed: do_install (log file is located at /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/xinput-calibrator/0.7.5+gitAUTOINC+c01c5af807-r6/temp/log.do_install.23227)
>> ERROR: Task 2 (/srv/hdd/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb, do_install) failed with exit code '1'

Ouch! I only tested this pre autotools seperation. V2 coming up!

> 
> 
> Sau!
> 
> 
>>  }
>> 
>> +FILES_${PN} += "${sysconfdir}/xdg/autostart"
>>  RDEPENDS_${PN} = "xinput formfactor"
>>  RRECOMMENDS_${PN} = "pointercal-xinput"