merge of 'aaf6c550254109a87b66440444b7d453231240a5'

     and 'b24e3d33fdc14fb2a96ead3a6312444644f1246d'

4 files changed, 97 insertions, 3 deletions

diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index c57c14333a..b63bc67af7 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,7 +1,7 @@
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-PR = "r13"
+PR = "r14"
 
 inherit native
 
diff --git a/packages/ipkg-utils/ipkg-utils/fields_tweaks.patch b/packages/ipkg-utils/ipkg-utils/fields_tweaks.patch
new file mode 100644
index 0000000000..2b08e47ad0
--- /dev/null
+++ b/packages/ipkg-utils/ipkg-utils/fields_tweaks.patch
@@ -0,0 +1,70 @@
+---
+ Makefile         |    2 ++
+ ipkg-list-fields |   13 +++++++++++++
+ ipkg.py          |    8 +++++++-
+ 3 files changed, 22 insertions(+), 1 deletion(-)
+
+Index: ipkg-utils/Makefile
+===================================================================
+--- ipkg-utils.orig/Makefile	2007-06-13 22:45:47.000000000 +0100
++++ ipkg-utils/Makefile	2007-06-13 22:46:50.000000000 +0100
+@@ -15,6 +15,8 @@ install: ${UTILS}
+ 	python setup.py install
+ 	chmod agu+rx ipkg-make-index
+ 	cp -f ipkg-make-index $(PREFIX)/bin
++	chmod agu+rx ipkg-list-fields
++	cp -f ipkg-list-fields $(PREFIX)/bin
+ 
+ binary: build
+ 	mkdir -p ipkg-build-binary/usr/bin
+Index: ipkg-utils/ipkg-list-fields
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ ipkg-utils/ipkg-list-fields	2007-06-13 22:43:32.000000000 +0100
+@@ -0,0 +1,13 @@
++#!/usr/bin/python
++
++import sys, ipkg
++
++def usage():
++     sys.stderr.write("%s ipk\n" % (sys.argv[0],))
++     sys.exit(-1)
++
++if (len(sys.argv) < 2):
++     usage()
++
++print ipkg.Package(sys.argv[1])
++
+Index: ipkg-utils/ipkg.py
+===================================================================
+--- ipkg-utils.orig/ipkg.py	2007-06-13 22:44:50.000000000 +0100
++++ ipkg-utils/ipkg.py	2007-06-13 22:39:44.000000000 +0100
+@@ -139,6 +139,9 @@ class Package:
+         self.installed_size = None
+         self.filename = None
+         self.isdeb = 0
++        self.homepage = None
++        self.oe = None
++        self.priority = None
+         self.fn = fn
+ 
+ 	if fn:
+@@ -211,7 +214,7 @@ class Package:
+                 elif self.__dict__.has_key(name):
+                     self.__dict__[name] = value
+ 		else:
+-		    #print "Lost field %s, %s" % (name,value)
++		    print "Lost field %s, %s" % (name,value)
+                     pass
+ 
+                 if line and line[0] == '\n':
+@@ -402,6 +405,9 @@ class Package:
+         if self.filename: out = out + "Filename: %s\n" % (self.filename)
+         if self.source: out = out + "Source: %s\n" % (self.source)
+         if self.description: out = out + "Description: %s\n" % (self.description)
++        if self.oe: out = out + "OE: %s\n" % (self.oe)
++        if self.homepage: out = out + "HomePage: %s\n" % (self.homepage)
++        if self.priority: out = out + "Priority: %s\n" % (self.priority)
+ 	out = out + "\n"
+ 
+ 	return out
diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index e8f52b65a4..51f5d7f835 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,13 +5,15 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \
            file://ipkg-py-sane-vercompare.patch;patch=1 \
            file://ipkg-py-tarfile.patch;patch=1 \
-           file://ipkg-make-index-track-stamps.patch;patch=1"
+           file://ipkg-make-index-track-stamps.patch;patch=1 \
+	   file://fields_tweaks.patch;patch=1 \
+	   "
 
 S = "${WORKDIR}/ipkg-utils"
 
diff --git a/packages/parted/parted_1.8.7.bb b/packages/parted/parted_1.8.7.bb
new file mode 100644
index 0000000000..f29771d5a4
--- /dev/null
+++ b/packages/parted/parted_1.8.7.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "parted, the GNU partition resizing program"
+HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
+LICENSE = "GPLv2"
+SECTION = "console/tools"
+DEPENDS = "readline e2fsprogs-libs"
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
+           
+EXTRA_OECONF = "--disable-Werror"
+
+inherit autotools pkgconfig
+
+do_configure() {
+        libtoolize --force
+        gnu-configize
+        oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
+}