From 5da8c4a3d8a08d400fdbad7a0adbd530230bb213 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 24 Jun 2008 11:01:06 +0000 Subject: xserver-kdrive-common, xtscal: move the X session script from former to latter git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4725 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate | 10 ---------- .../xserver-kdrive-common/xserver-kdrive-common_0.1.bb | 2 +- meta/packages/xtscal/xtscal/30xTs_Calibrate | 10 ++++++++++ meta/packages/xtscal/xtscal_0.6.3.bb | 10 ++++++++-- 4 files changed, 19 insertions(+), 13 deletions(-) delete mode 100644 meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate create mode 100644 meta/packages/xtscal/xtscal/30xTs_Calibrate (limited to 'meta') diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate deleted file mode 100644 index ee5578454..000000000 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession.d/30xTs_Calibrate +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -. /etc/formfactor/config - -if [ "$HAVE_TOUCHSCREEN" = "1" ]; then - while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] - do - /usr/bin/xtscal - done -fi diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index fa579a4a7..813123fc2 100644 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor" -PR = "r28" +PR = "r29" SRC_URI = "file://etc" S = ${WORKDIR} diff --git a/meta/packages/xtscal/xtscal/30xTs_Calibrate b/meta/packages/xtscal/xtscal/30xTs_Calibrate new file mode 100644 index 000000000..ee5578454 --- /dev/null +++ b/meta/packages/xtscal/xtscal/30xTs_Calibrate @@ -0,0 +1,10 @@ +#!/bin/sh + +. /etc/formfactor/config + +if [ "$HAVE_TOUCHSCREEN" = "1" ]; then + while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] + do + /usr/bin/xtscal + done +fi diff --git a/meta/packages/xtscal/xtscal_0.6.3.bb b/meta/packages/xtscal/xtscal_0.6.3.bb index c2ecb5952..f518d68f3 100644 --- a/meta/packages/xtscal/xtscal_0.6.3.bb +++ b/meta/packages/xtscal/xtscal_0.6.3.bb @@ -4,10 +4,16 @@ SECTION = "x11/base" DEPENDS = "virtual/libx11 libxft libxcalibrate" -PR = "r8" +PR = "r9" SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ file://change-cross.patch;patch=1 \ - file://cleanup.patch;patch=1" + file://cleanup.patch;patch=1 \ + file://30xTs_Calibrate" inherit autotools + +do_install_append() { + install -d ${D}${sysconfdir}/X11/Xsession.d/ + install -m 0755 ${WORKDIR}/30xTs_Calibrate ${D}${sysconfdir}/X11/Xsession.d/ +} -- cgit v1.2.3