diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-07-01 00:44:57 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-07-01 00:44:57 +0000 |
| commit | 3abb2b2ab999f428c9e8f1215cf393eea8589e9f (patch) | |
| tree | 9497333c4ee67255d53f715aedef7b0098574e41 /tslib | |
| parent | b86cd133209a4c9cbcba168444258f76b9dee966 (diff) | |
Merges.
2004/06/30 19:43:22-05:00 (none)!kergoth
Clean up SRC_URI and remove oe_machinstall usage per the recent FILESPATH change.
BKrev: 40e35e89nLvooGCio5W-357_SZU3iA
Diffstat (limited to 'tslib')
| -rw-r--r-- | tslib/tslib.oe | 9 | ||||
| -rw-r--r-- | tslib/tslib_cvs.oe | 22 |
2 files changed, 6 insertions, 25 deletions
diff --git a/tslib/tslib.oe b/tslib/tslib.oe index dfae3293a4..58d3978075 100644 --- a/tslib/tslib.oe +++ b/tslib/tslib.oe @@ -11,12 +11,7 @@ SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ 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://ts.conf" # file://collie-module.patch;patch=1 # file://devfs.patch;patch=1 # file://event1.patch;patch=1 @@ -37,7 +32,7 @@ do_stage () { } do_install_prepend () { - oe_machinstall -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf } FILES_tslib_append = " ${datadir}/ts/plugins/*.so" diff --git a/tslib/tslib_cvs.oe b/tslib/tslib_cvs.oe index b9c0a5d4b9..e09a4ca595 100644 --- a/tslib/tslib_cvs.oe +++ b/tslib/tslib_cvs.oe @@ -6,22 +6,8 @@ DESCRIPTION = "tslib is a touchscreen access library." CONFFILES_${PN} = "${sysconfdir}/ts.conf" SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/tslib \ - file://collie/ts.conf \ - file://collie/tslib.sh \ - file://corgi/ts.conf \ - file://corgi/tslib.sh \ - file://h3600/ts.conf \ - file://h3600/tslib.sh \ - file://husky/ts.conf \ - file://husky/tslib.sh \ - file://boxer/ts.conf \ - file://boxer/tslib.sh \ - file://poodle/ts.conf \ - file://poodle/tslib.sh \ - file://simpad/ts.conf \ - file://simpad/tslib.sh \ - file://shepherd/ts.conf \ - file://shepherd/tslib.sh" + file://ts.conf \ + file://tslib.sh" S = "${WORKDIR}/tslib" inherit autotools @@ -36,12 +22,12 @@ do_stage () { } do_install_prepend () { - oe_machinstall -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf + install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf } do_install_append() { install -d ${D}/${sysconfdir}/profile.d/ - oe_machinstall -m 0755 ${WORKDIR}/tslib.sh ${D}/${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/tslib.sh ${D}/${sysconfdir}/profile.d/ } FILES_${PN} += " ${libdir}/ts/*.so ${datadir}/ts/plugins/*.so" |