diff options
author | Michael Lauer <mickey@vanille-media.de> | 2006-07-03 12:29:20 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-03 12:29:20 +0000 |
commit | 5cb867704ca627b7511cea9f77f17af7803ba956 (patch) | |
tree | bb8fd19d82a9889e77a66c18ae05b34bc3f8d2d9 | |
parent | def4ba6a3759bb55bd5b888cde21379b5202dede (diff) |
tslib: fix cvs build, reorder metadata for -maemo variant
-rw-r--r-- | packages/tslib/tslib-maemo_0.0.1-15.bb | 18 | ||||
-rw-r--r-- | packages/tslib/tslib_20060703.bb | 5 |
2 files changed, 11 insertions, 12 deletions
diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb index f744833d57..e303b40841 100644 --- a/packages/tslib/tslib-maemo_0.0.1-15.bb +++ b/packages/tslib/tslib-maemo_0.0.1-15.bb @@ -1,25 +1,18 @@ -DEFAULT_PREFERENCE = "-1" -SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)." -PR = "r2" +SECTION = "GPL" +LICENSE = "LGPL" PROVIDES = "tslib" +PR = "r3" DEFAULT_PREFERENCE = "-1" -SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" -PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" - SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/t/tslib/tslib_${PV}.tar.gz \ file://ts.conf \ file://tslib.sh" - S = "${WORKDIR}/tslib" -LICENSE = "LGPL" -CONFFILES_${PN} = "${sysconfdir}/ts.conf" inherit autotools -PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate" EXTRA_OECONF = "--enable-shared" do_stage () { @@ -36,6 +29,11 @@ do_install_append() { install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ } +SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" +PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" +CONFFILES_${PN} = "${sysconfdir}/ts.conf" +PACKAGES = "tslib-maemo-conf libts-maemo libts-maemo-dev tslib-maemo-tests tslib-maemo-calibrate" + RDEPENDS_libts-maemo = "tslib-maemo-conf" RPROVIDES_tslib-maemo-conf = "tslib-conf" diff --git a/packages/tslib/tslib_20060703.bb b/packages/tslib/tslib_20060703.bb index 89296c4796..f4ff493b57 100644 --- a/packages/tslib/tslib_20060703.bb +++ b/packages/tslib/tslib_20060703.bb @@ -4,10 +4,11 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" -PV = "0.1+cvs+${PV}" +RV := "${PV}" +PV = "0.1+cvs-${RV}" PR = "r0" -SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${PV} \ +SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${RV} \ file://usec_fix.patch;patch=1 \ file://ts.conf \ file://ts-2.6.conf \ |