Merge changes from mainline OE to try and keep us in sync.

git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 12 insertions, 4 deletions

diff --git a/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb
index 5c52147e1c..0a79a492a3 100644
--- a/openembedded/packages/tslib/tslib_cvs.bb
+++ b/openembedded/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0cvs${CVSDATE}"
-PR = "r31"
+PR = "r32"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@@ -9,8 +9,9 @@ PACKAGE_ARCH_mnci = "${MACHINE}"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
            file://ts.conf \
-           file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \
+           file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h6300 \
            file://ts.conf-corgi file://ts.conf-corgi-2.4 \
+           file://ts.conf-simpad file://ts.conf-simpad-2.4 \
            file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
@@ -40,9 +41,9 @@ do_install_append() {
         install -d ${D}${sysconfdir}/profile.d/
         install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
         case ${MACHINE} in
-        h3600 | h3900 | h1940 | h6300 | ipaq-pxa270)
+        h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270)
                 install -d ${D}${datadir}/tslib
-                for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do
+                for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do
                         install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
                 done
                 rm -f ${D}${sysconfdir}/ts.conf
@@ -54,6 +55,13 @@ do_install_append() {
                 done
                 rm -f ${D}${sysconfdir}/ts.conf
                 ;;
+        simpad )
+                install -d ${D}${datadir}/tslib
+                for f in ts.conf-simpad ts.conf-simpad-2.4; do
+                        install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
+                done
+                rm -f ${D}${sysconfdir}/ts.conf
+                ;;
         *)
                 ;;
         esac