diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-03-31 09:41:37 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-31 09:41:37 +0000 |
| commit | 0f382fd41238a12fc14d8259d7e1eba0457e4fbe (patch) | |
| tree | 14585958c45c7a562788fb4c4910263a26524979 /packages/tslib/tslib_cvs.bb | |
| parent | e3e84da7c3b912a0abbfdda9655fb8402368abc8 (diff) | |
tslib: Add 2.6 kernel handling for collie/poodle. Instead of every device using a different ts.conf file for 2.6, combine it all into one file which can be overridden on a per machine basis if needed (all copies were identical anyway).
Diffstat (limited to 'packages/tslib/tslib_cvs.bb')
| -rw-r--r-- | packages/tslib/tslib_cvs.bb | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 2513a436a6..02f0c555ae 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,17 +1,16 @@ SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library." PV = "0.0+cvs${SRCDATE}" -PR = "r32" +PR = "r33" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" 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 \ - file://ts.conf-corgi file://ts.conf-corgi-2.4 \ - file://ts.conf-simpad file://ts.conf-simpad-2.4 \ + file://ts.conf file://ts-2.6.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" SRC_URI_append_mnci += " file://event1.patch;patch=1" @@ -40,21 +39,29 @@ do_install_append() { case ${MACHINE} in h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) install -d ${D}${datadir}/tslib - for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do + for f in ts-2.6.conf ts.conf-h3600-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ done rm -f ${D}${sysconfdir}/ts.conf ;; c7x0 | spitz | akita | tosa | borzoi ) install -d ${D}${datadir}/tslib - for f in ts.conf-corgi ts.conf-corgi-2.4; do + for f in ts-2.6.conf ts.conf-corgi-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ done rm -f ${D}${sysconfdir}/ts.conf ;; + collie | poodle ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-collie-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + 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 + for f in ts-2.6.conf ts.conf-simpad-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ done rm -f ${D}${sysconfdir}/ts.conf |