diff options
author | Rene Wagner <rw@handhelds.org> | 2006-04-19 19:51:46 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-19 19:51:46 +0000 |
commit | 037f03de83391a9d5dba8dc9de7113bea2d511bb (patch) | |
tree | 586cbdc1e71fc1e4c58710768e56cc602d4566b5 | |
parent | 1ba8f5307fffbbf05c9cc880869b7195b6351b61 (diff) | |
download | openembedded-037f03de83391a9d5dba8dc9de7113bea2d511bb.tar.gz |
tslib: use detect-tsdevice rather than detect-stylus and fix dependencies
-rw-r--r-- | packages/tslib/tslib/h1940/tslib.sh | 2 | ||||
-rw-r--r-- | packages/tslib/tslib/h2200/tslib.sh | 2 | ||||
-rw-r--r-- | packages/tslib/tslib/h3600/tslib.sh | 2 | ||||
-rw-r--r-- | packages/tslib/tslib/h3900/tslib.sh | 2 | ||||
-rw-r--r-- | packages/tslib/tslib/h6300/tslib.sh | 2 | ||||
-rw-r--r-- | packages/tslib/tslib/ipaq-pxa270/tslib.sh | 2 | ||||
-rw-r--r-- | packages/tslib/tslib_cvs.bb | 16 |
7 files changed, 21 insertions, 7 deletions
diff --git a/packages/tslib/tslib/h1940/tslib.sh b/packages/tslib/tslib/h1940/tslib.sh index 5e5e283962..6183d43fba 100644 --- a/packages/tslib/tslib/h1940/tslib.sh +++ b/packages/tslib/tslib/h1940/tslib.sh @@ -1,6 +1,6 @@ #!/bin/sh -TSLIB_TSDEVICE=`detect-stylus --device` +TSLIB_TSDEVICE=`detect-tsdevice` TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 QWS_MOUSE_PROTO=TPanel diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh index be9448b1dc..7fa6492ce0 100644 --- a/packages/tslib/tslib/h2200/tslib.sh +++ b/packages/tslib/tslib/h2200/tslib.sh @@ -10,7 +10,7 @@ case `uname -r` in TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 ;; *) - TSLIB_TSDEVICE=`detect-stylus --device` + TSLIB_TSDEVICE=`detect-tsdevice` TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 ;; esac diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh index 5c446c2610..b07fce0aea 100644 --- a/packages/tslib/tslib/h3600/tslib.sh +++ b/packages/tslib/tslib/h3600/tslib.sh @@ -6,7 +6,7 @@ case `uname -r` in TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 ;; *) - TSLIB_TSDEVICE=`detect-stylus --device` + TSLIB_TSDEVICE=`detect-tsdevice` TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 ;; esac diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh index be9448b1dc..7fa6492ce0 100644 --- a/packages/tslib/tslib/h3900/tslib.sh +++ b/packages/tslib/tslib/h3900/tslib.sh @@ -10,7 +10,7 @@ case `uname -r` in TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4 ;; *) - TSLIB_TSDEVICE=`detect-stylus --device` + TSLIB_TSDEVICE=`detect-tsdevice` TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 ;; esac diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh index 21aaad9ca4..95e6a2d02b 100644 --- a/packages/tslib/tslib/h6300/tslib.sh +++ b/packages/tslib/tslib/h6300/tslib.sh @@ -1,6 +1,6 @@ #!/bin/sh -TSLIB_TSDEVICE=`detect-stylus --device` +TSLIB_TSDEVICE=`detect-tsdevice` TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300 export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh index 72ebcba7c2..a3eb096a30 100644 --- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh +++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh @@ -1,6 +1,6 @@ #!/bin/sh -TSLIB_TSDEVICE=`detect-stylus --device` +TSLIB_TSDEVICE=`detect-tsdevice` TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 0a79a492a3..53b4a0217c 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,12 +1,26 @@ SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library." PV = "0.0cvs${CVSDATE}" -PR = "r32" +PR = "r33" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE}" PACKAGE_ARCH_mnci = "${MACHINE}" +DEPENDS_h1940_append = " detect-tsdevice" +DEPENDS_h2200_append = " detect-tsdevice" +DEPENDS_h3600_append = " detect-tsdevice" +DEPENDS_h3900_append = " detect-tsdevice" +DEPENDS_h6300_append = " detect-tsdevice" +DEPENDS_ipaq-pxa270_append = " detect-tsdevice" + +RDEPENDS_tslib-conf_h1940_append = " detect-tsdevice" +RDEPENDS_tslib-conf_h2200_append = " detect-tsdevice" +RDEPENDS_tslib-conf_h3600_append = " detect-tsdevice" +RDEPENDS_tslib-conf_h3900_append = " detect-tsdevice" +RDEPENDS_tslib-conf_h6300_append = " detect-tsdevice" +RDEPENDS_tslib-conf_ipaq-pxa270_append = " detect-tsdevice" + 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-h6300 \ |