summaryrefslogtreecommitdiff
path: root/tslib
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-05-22 16:47:36 +0000
committerChris Larson <clarson@kergoth.com>2004-05-22 16:47:36 +0000
commit2b8f679ffe5929b5a11eb71e514aa4997c36f13e (patch)
treecab0f25aca03f6162bd268a401945fbfbb63bff9 /tslib
parent5df179157f90b18f437c6978efb451f515e3d1c9 (diff)
Merges.
2004/05/22 12:46:48-04:00 local!kergoth Bugfixes per the recent FILESDIR cleanup. 2004/05/22 01:03:38-04:00 local!kergoth Run a perl script against the repo to kill off direct FILESDIR usage in favor of relative file:// paths in SRC_URI, and WORKDIR references in functions. 2004/05/21 23:07:58-04:00 local!kergoth Switch file:// FILESDIR uris in SRC_URI to the new relative path format. BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w
Diffstat (limited to 'tslib')
-rw-r--r--tslib/tslib.oe36
1 files changed, 21 insertions, 15 deletions
diff --git a/tslib/tslib.oe b/tslib/tslib.oe
index dcf0ba433a..576c4fe8cc 100644
--- a/tslib/tslib.oe
+++ b/tslib/tslib.oe
@@ -3,22 +3,28 @@ PV = "0.0cvs${CVSDATE}"
DEPENDS = "virtual/libc"
DESCRIPTION = "tslib is a touchscreen access library."
-SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib"
-SRC_URI_append = " file://${FILESDIR}/automake.patch;patch=1"
-SRC_URI_append = " file://${FILESDIR}/doc.patch;patch=1"
-SRC_URI_append = " file://${FILESDIR}/zap.patch;patch=1"
-SRC_URI_append = " file://${FILESDIR}/pthres.patch;patch=1"
-SRC_URI_append = " file://${FILESDIR}/raw.patch;patch=1"
-SRC_URI_append = " file://${FILESDIR}/raw-hwread.patch;patch=1"
-#SRC_URI_append = " file://${FILESDIR}/collie-module.patch;patch=1"
-#SRC_URI_append = " file://${FILESDIR}/devfs.patch;patch=1"
-#SRC_URI_append = " file://${FILESDIR}/event1.patch;patch=1"
-#SRC_URI_append = " file://${FILESDIR}/multievent.patch;patch=1"
-#SRC_URI_append = " file://${FILESDIR}/pointercal.patch;patch=1"
-#SRC_URI_append = " file://${FILESDIR}/ts_calibrate.patch;patch=1"
+SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
+ file://automake.patch;patch=1 \
+ file://doc.patch;patch=1 \
+ file://zap.patch;patch=1 \
+ file://pthres.patch;patch=1 \
+ file://raw.patch;patch=1 \
+ file://raw-hwread.patch;patch=1 \
+ file://collie/ts.conf \
+ file://corgi/ts.conf \
+ file://h3600/ts.conf \
+ file://husky/ts.conf \
+ file://poodle/ts.conf \
+ file://shepherd/ts.conf"
+# file://collie-module.patch;patch=1
+# file://devfs.patch;patch=1
+# file://event1.patch;patch=1
+# file://multievent.patch;patch=1
+# file://pointercal.patch;patch=1
+# file://ts_calibrate.patch;patch=1
S = "${WORKDIR}/tslib"
-inherit autotools
+inherit autotools
EXTRA_OECONF = "--enable-shared"
@@ -30,7 +36,7 @@ do_stage () {
}
do_install_prepend () {
- oe_machinstall -m 0644 ${FILESDIR}/ts.conf ${S}/etc/ts.conf
+ oe_machinstall -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf
}
FILES_tslib_append = " ${datadir}/ts/plugins/*.so"