From 708749b6b99848be51d0cc592acf8fcc8c956c3f Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 8 Jun 2005 20:40:13 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/08 22:37:47+02:00 opfer.lan!dirk tosa 2.6 kernelupdate, load tosakeymap-2.6 and set propper TSLIB_TSDEVICE 2005/06/08 22:27:08+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/08 22:26:45+02:00 utwente.nl!koen xfonts-xorg_6.8.bb: remove spurious inheritance BKrev: 42a757adZFKZWxIqPymCZREVyFRQfQ --- packages/tslib/tslib/tosa/tslib.sh | 16 ++++++++++++++++ packages/tslib/tslib_cvs.bb | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'packages/tslib') diff --git a/packages/tslib/tslib/tosa/tslib.sh b/packages/tslib/tslib/tosa/tslib.sh index e69de29bb2..dc7484cada 100644 --- a/packages/tslib/tslib/tosa/tslib.sh +++ b/packages/tslib/tslib/tosa/tslib.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +case `uname -r` in +2.4*) + TSLIB_TSDEVICE=/dev/ts + TSLIB_TSEVENTTYPE=CORGI + TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4 + ;; +*) + TSLIB_TSDEVICE=/dev/input/event1 + TSLIB_TSEVENTTYPE=INPUT + TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi + ;; +esac + +export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index e731699aee..79dca31b22 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,7 +1,7 @@ SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library." PV = "0.0cvs${CVSDATE}" -PR = "r18" +PR = "r19" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE}" @@ -47,7 +47,7 @@ do_install_append() { done rm -f ${D}${sysconfdir}/ts.conf ;; - c7x0 | spitz | akita) + c7x0 | spitz | akita | tosa) install -d ${D}${datadir}/tslib for f in ts.conf-corgi ts.conf-corgi-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ -- cgit v1.2.3