From f491b9ee21eaf671927fc31581720bcd91ad9bab Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sun, 20 Jun 2004 19:51:36 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 stealth.(none):/home/pb/oe/oe-packages

2004/06/20 20:22:55+01:00 (none)!pb
add forgotten simpad bits to SRC_URI

2004/06/20 20:20:50+01:00 (none)!pb
need to compile ipkg-compare-versions before installing it

BKrev: 40d5eac80O9EsFyPel2nCHMw0LkRZw
---
 ipkg-utils/ipkg-utils-native_1.6cvs.oe |  4 ----
 ipkg-utils/ipkg-utils_1.6cvs.oe        | 15 ++++++++++++---
 tslib/tslib_cvs.oe                     |  4 +++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ipkg-utils/ipkg-utils-native_1.6cvs.oe b/ipkg-utils/ipkg-utils-native_1.6cvs.oe
index 39a6343308..223bba56fe 100644
--- a/ipkg-utils/ipkg-utils-native_1.6cvs.oe
+++ b/ipkg-utils/ipkg-utils-native_1.6cvs.oe
@@ -1,8 +1,4 @@
 include ipkg-utils_${PV}.oe
 inherit native
 DEPENDS = "python-native"
-PACKAGES = ""
 
-do_stage() {
-	cp ipkg* ${STAGING_BINDIR}/
-}
diff --git a/ipkg-utils/ipkg-utils_1.6cvs.oe b/ipkg-utils/ipkg-utils_1.6cvs.oe
index faef8947c3..d14130def5 100644
--- a/ipkg-utils/ipkg-utils_1.6cvs.oe
+++ b/ipkg-utils/ipkg-utils_1.6cvs.oe
@@ -1,4 +1,5 @@
 PV_append = "${CVSDATE}"
+PR = "r1"
 DESCRIPTION = "Itsy Package Manager utilities"
 DEPENDS = ""
 SECTION = "base"
@@ -11,13 +12,21 @@ RDEPENDS = "python"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=ipkg-utils"
 S = "${WORKDIR}/ipkg-utils"
 
-inherit distutils
+INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg.py"
+
+do_compile() {
+	oe_runmake ipkg-compare-versions
+}
 
 do_stage() {
-	cp ipkg* ${STAGING_BINDIR}/
+	for i in $INSTALL; do
+		install $i ${STAGING_BINDIR}
+	done
 }
 
 do_install() {
 	install -d ${D}${bindir}
-	cp ipkg* ${D}${bindir}/
+	for i in $INSTALL; do
+		install $i ${D}${bindir}
+	done
 }
diff --git a/tslib/tslib_cvs.oe b/tslib/tslib_cvs.oe
index e70b081718..2cc5759ad9 100644
--- a/tslib/tslib_cvs.oe
+++ b/tslib/tslib_cvs.oe
@@ -1,5 +1,5 @@
 PV = "0.1cvs${CVSDATE}"
-PR = "r1"
+PR = "r2"
 
 DESCRIPTION = "tslib is a touchscreen access library."
 
@@ -16,6 +16,8 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=apps/tslib \
            file://husky/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"
 S = "${WORKDIR}/tslib"
-- 
cgit v1.2.3