[oe-commits] org.oe.dev tslib: Have a sane default tslib.sh file to match what nearly all 2.6 udev devices are now using. Drop 2.4 kernel support for all Zaurii except collie. Only machine tslib-conf machine specific for those that need it

[rpurdie commit]

tslib: Have a sane default tslib.sh file to match what nearly all 2.6 udev devices are now using. Drop 2.4 kernel support for all Zaurii except collie. Only machine tslib-conf machine specific for those that need it

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 5e90ea32d08c39dcb59801e6c3df234c974417a7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5e90ea32d08c39dcb59801e6c3df234c974417a7
Files:
1
packages/tslib/tslib/akita
packages/tslib/tslib/akita/tslib.sh
packages/tslib/tslib/c7x0
packages/tslib/tslib/c7x0/tslib.sh
packages/tslib/tslib/h1940
packages/tslib/tslib/h1940/tslib.sh
packages/tslib/tslib/h2200
packages/tslib/tslib/h2200/tslib.sh
packages/tslib/tslib/h3600
packages/tslib/tslib/h3600/tslib.sh
packages/tslib/tslib/h3900
packages/tslib/tslib/h3900/tslib.sh
packages/tslib/tslib/h4000
packages/tslib/tslib/h4000/tslib.sh
packages/tslib/tslib/h5000
packages/tslib/tslib/h5000/tslib.sh
packages/tslib/tslib/h6300
packages/tslib/tslib/h6300/tslib.sh
packages/tslib/tslib/htcblueangel
packages/tslib/tslib/htcblueangel/tslib.sh
packages/tslib/tslib/htcuniversal
packages/tslib/tslib/htcuniversal/tslib.sh
packages/tslib/tslib/hx2000
packages/tslib/tslib/hx2000/tslib.sh
packages/tslib/tslib/hx4700
packages/tslib/tslib/hx4700/tslib.sh
packages/tslib/tslib/nokia770
packages/tslib/tslib/nokia770/tslib.sh
packages/tslib/tslib/poodle
packages/tslib/tslib/poodle/tslib.sh
packages/tslib/tslib/qemuarm
packages/tslib/tslib/qemuarm/tslib.sh
packages/tslib/tslib/smdk2440
packages/tslib/tslib/smdk2440/tslib.sh
packages/tslib/tslib/spitz
packages/tslib/tslib/spitz/tslib.sh
packages/tslib/tslib/tosa
packages/tslib/tslib/tosa/tslib.sh
packages/tslib/tslib/ts.conf-corgi-2.4
packages/tslib/tslib/ts.conf-h3600-2.4
packages/tslib/tslib-maemo
packages/tslib/tslib-maemo/multievent.patch
packages/tslib/tslib-maemo/nokia770
packages/tslib/tslib/tslib.sh
packages/tslib/tslib_1.0.bb
Diffs:

#
# mt diff -r40c134102c7bb4e96d009f6f0bdf0e23d7c9ddbc -r5e90ea32d08c39dcb59801e6c3df234c974417a7
#
# 
# 
# delete "packages/tslib/tslib/akita"
# 
# delete "packages/tslib/tslib/akita/tslib.sh"
# 
# delete "packages/tslib/tslib/c7x0"
# 
# delete "packages/tslib/tslib/c7x0/tslib.sh"
# 
# delete "packages/tslib/tslib/h1940"
# 
# delete "packages/tslib/tslib/h1940/tslib.sh"
# 
# delete "packages/tslib/tslib/h2200"
# 
# delete "packages/tslib/tslib/h2200/tslib.sh"
# 
# delete "packages/tslib/tslib/h3600"
# 
# delete "packages/tslib/tslib/h3600/tslib.sh"
# 
# delete "packages/tslib/tslib/h3900"
# 
# delete "packages/tslib/tslib/h3900/tslib.sh"
# 
# delete "packages/tslib/tslib/h4000"
# 
# delete "packages/tslib/tslib/h4000/tslib.sh"
# 
# delete "packages/tslib/tslib/h5000"
# 
# delete "packages/tslib/tslib/h5000/tslib.sh"
# 
# delete "packages/tslib/tslib/h6300"
# 
# delete "packages/tslib/tslib/h6300/tslib.sh"
# 
# delete "packages/tslib/tslib/htcblueangel"
# 
# delete "packages/tslib/tslib/htcblueangel/tslib.sh"
# 
# delete "packages/tslib/tslib/htcuniversal"
# 
# delete "packages/tslib/tslib/htcuniversal/tslib.sh"
# 
# delete "packages/tslib/tslib/hx2000"
# 
# delete "packages/tslib/tslib/hx2000/tslib.sh"
# 
# delete "packages/tslib/tslib/hx4700"
# 
# delete "packages/tslib/tslib/hx4700/tslib.sh"
# 
# delete "packages/tslib/tslib/nokia770"
# 
# delete "packages/tslib/tslib/nokia770/tslib.sh"
# 
# delete "packages/tslib/tslib/poodle"
# 
# delete "packages/tslib/tslib/poodle/tslib.sh"
# 
# delete "packages/tslib/tslib/qemuarm"
# 
# delete "packages/tslib/tslib/qemuarm/tslib.sh"
# 
# delete "packages/tslib/tslib/smdk2440"
# 
# delete "packages/tslib/tslib/smdk2440/tslib.sh"
# 
# delete "packages/tslib/tslib/spitz"
# 
# delete "packages/tslib/tslib/spitz/tslib.sh"
# 
# delete "packages/tslib/tslib/tosa"
# 
# delete "packages/tslib/tslib/tosa/tslib.sh"
# 
# delete "packages/tslib/tslib/ts.conf-corgi-2.4"
# 
# delete "packages/tslib/tslib/ts.conf-h3600-2.4"
# 
# delete "packages/tslib/tslib-maemo"
# 
# delete "packages/tslib/tslib-maemo/multievent.patch"
# 
# delete "packages/tslib/tslib-maemo/nokia770"
# 
# patch "packages/tslib/tslib/tslib.sh"
#  from [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#    to [a0c9d88f09b0a6e1e290af234fd795ba8be538d9]
# 
# patch "packages/tslib/tslib_1.0.bb"
#  from [cb615dad10fc9df7bc2f12a35fc2a88e41e19bb9]
#    to [85038c188dab56a0433f47451af0e48afde5c177]
# 
============================================================
--- packages/tslib/tslib/tslib.sh	da39a3ee5e6b4b0d3255bfef95601890afd80709
+++ packages/tslib/tslib/tslib.sh	a0c9d88f09b0a6e1e290af234fd795ba8be538d9
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+
+export TSLIB_TSDEVICE
+
============================================================
--- packages/tslib/tslib_1.0.bb	cb615dad10fc9df7bc2f12a35fc2a88e41e19bb9
+++ packages/tslib/tslib_1.0.bb	85038c188dab56a0433f47451af0e48afde5c177
@@ -1,16 +1,14 @@ LICENSE = "LGPL"
 DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
 HOMEPAGE = "http://tslib.berlios.de/"
 AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://ts.conf \
-           file://ts.conf-h3600-2.4 \
            file://ts.conf-simpad-2.4 \
-           file://ts.conf-corgi-2.4 \
            file://ts.conf-collie-2.4 \
            file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
@@ -33,19 +31,10 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/profile.d/
 	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 	case ${MACHINE} in
-	a780 | e680 )
+	collie )
 		install -d ${D}${datadir}/tslib
-		install -m 0644 ${WORKDIR}/ts.conf-h3600-2.4 ${D}${datadir}/tslib/
-		;;
-	c7x0 | spitz | akita | tosa )
-		install -d ${D}${datadir}/tslib
-		install -m 0644 ${WORKDIR}/ts.conf-corgi-2.4 ${D}${datadir}/tslib/
-		;;
-	collie | poodle )
-		install -d ${D}${datadir}/tslib
 		install -m 0644 ${WORKDIR}/ts.conf-collie-2.4 ${D}${datadir}/tslib/
 		;;
-
 	simpad )
 		install -d ${D}${datadir}/tslib
 		install -m 0644 ${WORKDIR}/ts.conf-simpad-2.4 ${D}${datadir}/tslib/
@@ -62,8 +51,19 @@ RPROVIDES_tslib-conf = "libts-0.0-conf"
 #RDEPENDS_tslib-conf_weird-machine = "detect-stylus"
 RPROVIDES_tslib-conf = "libts-0.0-conf"
 
-PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
+# Machines with machine specific patches
 PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
+# Machines with machine specific config files (tslib.sh)
+PACKAGE_ARCH_tslib-conf_a780 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_collie = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_e680 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_jornada56x = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_jornada6xx = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_jornada7xx = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_netbook-pro = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_omap1610h2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_omap5912osk = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_simpad = "${MACHINE_ARCH}"
 
 PACKAGES =+ "tslib-conf libts-dev tslib-tests tslib-calibrate"
 DEBIAN_NOAUTONAME_tslib-conf = "1"