Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/06 12:55:40+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/05 23:53:47+01:00 uni-frankfurt.de!mickeyl
undo bogus

2005/01/05 20:14:50+01:00 uni-frankfurt.de!mickeyl
fix ipkg-utils date to last known working version

BKrev: 41dd31a7VyUlzoHTnBfPAD4f3wdf_Q

diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone
index 792d254..c466f5c 100644 (file)
--- a/BitKeeper/etc/gone
+++ b/BitKeeper/etc/gone
@@ -1,5 +1,6 @@
 collie/sharp_mmcsd_m.o
 corgi/sharp_mmcsd_m.o
+defconfig-shepherd
 enlightenment-sa_2.4.19-rmk6-pxa1-hh37.1.bb
 enlightenment.conf
 h3600-mine.conf

diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
index e69de29..a04e0d6 100644 (file)
--- a/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6cvs.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "Itsy Package Manager utilities"
+DEPENDS = ""
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE = "GPL"
+CONFLICTS = "ipkg-link"
+RDEPENDS = "python"
+CVSDATE = "20041220"
+PV_append = "${CVSDATE}"
+PR = "r6"
+
+SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
+          file://fix-ipkg-link.patch;patch=1 \
+          file://fix-ipkg-tar.patch;patch=1 "
+SRC_URI_append_beagle = " file://fix-ipkg-link-beagle.patch;patch=1 "     
+S = "${WORKDIR}/ipkg-utils"
+
+INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py"
+
+do_compile() {
+       oe_runmake ipkg-compare-versions
+}
+
+do_install() {
+       install -d ${D}${bindir}
+       for i in ${INSTALL}
+       do
+               install -m 0755 $i ${D}${bindir}
+       done
+}
+
+#FIXME: ipkg-utils is not allowed to have packages or else a ipkg-native -> ipkg-utils -> ipkg-utils
+#       recursive dependency is triggered. This has been fixed by installing the ipkg-link script in
+#       a dedicated package.
+#PACKAGES_prepend = "ipkg-link "
+#FILES_ipkg-link = "${bindir}/ipkg-link"
+