remove old ipkg support

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

15 files changed, 0 insertions, 943 deletions

diff --git a/patches/ipkg-0.99.163/0001-use-scripts-with-offlineroot.patch b/patches/ipkg-0.99.163/0001-use-scripts-with-offlineroot.patch
deleted file mode 100644
index f97c1c9e2..000000000
--- a/patches/ipkg-0.99.163/0001-use-scripts-with-offlineroot.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: unknown author <unknown.author@example.com>
-Date: Tue, 22 Feb 2011 17:48:08 +0100
-Subject: [PATCH] use scripts with offlineroot
-
-The ipkg offline root mechanism avoids that the pre/post scripts are
-being run. This patch re-enables the scripts; it makes it possible that
-scripts can decide themselfs if they want to do something if DESTDIR is
-set.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de
----
- pkg.c |    6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/pkg.c b/pkg.c
-index 64e7994..144e6e1 100644
---- a/pkg.c
-+++ b/pkg.c
-@@ -1443,12 +1443,6 @@ int pkg_run_script(ipkg_conf_t *conf, pkg_t *pkg,
- 	  return 0;
-      }
- 
--     if (conf->offline_root) {
--	  fprintf(stderr, "(offline root mode: not running %s.%s)\n", pkg->name, script);
--	  free(path);
--	  return 0;
--     }
--
-      sprintf_alloc(&cmd, "%s %s", path, args);
-      free(path);
- 
--- 
-1.7.2.3
-
diff --git a/patches/ipkg-0.99.163/0002-libbb-unarchive.c-fix-get_header_tar-long-filenames.patch b/patches/ipkg-0.99.163/0002-libbb-unarchive.c-fix-get_header_tar-long-filenames.patch
deleted file mode 100644
index 702ac6f19..000000000
--- a/patches/ipkg-0.99.163/0002-libbb-unarchive.c-fix-get_header_tar-long-filenames.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Michael Grzeschik <m.grzeschik@pengutronix.de>
-Date: Wed, 23 Feb 2011 12:10:19 +0100
-Subject: [PATCH] [libbb/unarchive.c] fix get_header_tar long filenames
-
-backported longlinksfix.patch from opkg svn-commit r594
----
- libbb/unarchive.c |   43 +++++++++++++++++++++++++++----------------
- 1 files changed, 27 insertions(+), 16 deletions(-)
-
-diff --git a/libbb/unarchive.c b/libbb/unarchive.c
-index 0946ded..ffc5b9d 100644
---- a/libbb/unarchive.c
-+++ b/libbb/unarchive.c
-@@ -591,22 +591,6 @@ file_header_t *get_header_tar(FILE *tar_stream)
- 	/* convert to type'ed variables */
- 	tar_entry = xcalloc(1, sizeof(file_header_t));
- 
--#ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
--        if (longname) {
--                tar_entry->name = longname;
--                longname = NULL;
--        }
--        else if (linkname) {
--                tar_entry->name = linkname;
--                linkname = NULL;
--        } else
--#endif
--        if (tar.formated.prefix[0] == 0) {
--                tar_entry->name = strdup(tar.formated.name);
--        } else {                                              
--                tar_entry->name = concat_path_file(tar.formated.prefix, tar.formated.name);
--        }
--
- 	// tar_entry->name = xstrdup(tar.formated.name);
- 
- /*
-@@ -687,6 +671,33 @@ file_header_t *get_header_tar(FILE *tar_stream)
- 
- 	}
- 
-+#ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
-+        if (longname) {
-+                tar_entry->name = longname;
-+                longname = NULL;
-+        } else
-+#endif
-+        {
-+                tar_entry->name = xstrndup(tar.formated.name, 100);
-+
-+                if (tar.formated.prefix[0]) {
-+                        char *temp = tar_entry->name;
-+                        char *prefixTemp = xstrndup(tar.formated.prefix, 155);
-+                        tar_entry->name = concat_path_file(prefixTemp, temp);
-+                        free(temp);
-+                        free(prefixTemp);
-+                }
-+        }
-+
-+	if (linkname) {
-+		tar_entry->link_name = linkname;
-+		linkname = NULL;
-+	} else
-+	{
-+		tar_entry->link_name = *tar.formated.linkname != '\0' ?
-+			xstrndup(tar.formated.linkname, 100) : NULL;
-+	}
-+
- 	return(tar_entry);
- }
- 
--- 
-1.7.2.3
-
diff --git a/patches/ipkg-0.99.163/series b/patches/ipkg-0.99.163/series
deleted file mode 100644
index 5946563a4..000000000
--- a/patches/ipkg-0.99.163/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-0001-use-scripts-with-offlineroot.patch
-0002-libbb-unarchive.c-fix-get_header_tar-long-filenames.patch
-# 463f302f7a5dd0e570e366a2df5fa8d4  - git-ptx-patches magic
diff --git a/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch b/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch
deleted file mode 100644
index 50eb2b6a6..000000000
--- a/patches/ipkg-utils-050831/0001-ipkg-utils-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: the openembedded project <http://openembedded.net/>
-Date: Fri, 22 Jan 2010 11:05:05 +0100
-Subject: [PATCH] ipkg-utils-fix
-
----
- ipkg.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ipkg.py b/ipkg.py
-index 02aab22..e175c8d 100644
---- a/ipkg.py
-+++ b/ipkg.py
-@@ -152,9 +152,9 @@ class Package:
-             self.filename = os.path.basename(fn)
- 	    ## sys.stderr.write("  extracting control.tar.gz from %s\n"% (fn,)) 
-             if self.isdeb:
--                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r")
-+                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r")
-             else:
--                control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r")
-+                control = os.popen("tar xfzO "+fn+" 'control.tar.gz' | tar xfzO - './control'","r")
-             line = control.readline()
-             while 1:
-                 if not line: break
diff --git a/patches/ipkg-utils-050831/0002-ipkg-py-sane-vercompare.patch b/patches/ipkg-utils-050831/0002-ipkg-py-sane-vercompare.patch
deleted file mode 100644
index e0ecb38f1..000000000
--- a/patches/ipkg-utils-050831/0002-ipkg-py-sane-vercompare.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: the openembedded project <http://openembedded.net/>
-Date: Fri, 22 Jan 2010 11:05:06 +0100
-Subject: [PATCH] ipkg-py-sane-vercompare
-
-Only in ipkg-utils: ipkg-py-sane-vercompare.patch
----
- ipkg.py | 26 ++++++++++++++++++++++----
- 1 file changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/ipkg.py b/ipkg.py
-index e175c8d..824ba4d 100644
---- a/ipkg.py
-+++ b/ipkg.py
-@@ -48,9 +48,9 @@ class Version:
-         self.epoch = epoch
-         self.version = version
- 
--    def _versioncompare(self, ref):
--        selfversion = self.version
--        refversion = ref.version
-+    def _versioncompare(self, selfversion, refversion):
-+        if not selfversion: selfversion = ""
-+        if not refversion: refversion = ""
-         while 1:
-             ## first look for non-numeric version component
-             selfm = re.match('([^0-9]*)(.*)', selfversion)
-@@ -89,7 +89,18 @@ class Version:
-         elif (self.epoch < ref.epoch):
-             return -1
-         else:
--            return self._versioncompare(ref)
-+	    self_ver_comps = re.match(r"(.+?)(-r.+)?$", self.version)
-+	    ref_ver_comps = re.match(r"(.+?)(-r.+)?$", ref.version)
-+	    #print (self_ver_comps.group(1), self_ver_comps.group(2))
-+	    #print (ref_ver_comps.group(1), ref_ver_comps.group(2))
-+	    r = self._versioncompare(self_ver_comps.group(1), ref_ver_comps.group(1))
-+	    if r == 0:
-+		r = self._versioncompare(self_ver_comps.group(2), ref_ver_comps.group(2))
-+	    #print "compare: %s vs %s = %d" % (self, ref, r)
-+	    return r
-+
-+    def __str__(self):
-+        return str(self.epoch) + ":" + self.version
- 
- def parse_version(versionstr):
-     epoch = 0
-@@ -445,6 +456,13 @@ class Packages:
-         return self.packages[key]
- 
- if __name__ == "__main__":
-+
-+    assert Version(0, "1.2.2-r1").compare(Version(0, "1.2.3-r0")) == -1
-+    assert Version(0, "1.2.2-r0").compare(Version(0, "1.2.2+cvs20070308-r0")) == -1
-+    assert Version(0, "1.2.2+cvs20070308").compare(Version(0, "1.2.2-r0")) == 1
-+    assert Version(0, "1.2.2-r0").compare(Version(0, "1.2.2-r0")) == 0
-+    assert Version(0, "1.2.2-r5").compare(Version(0, "1.2.2-r0")) == 1
-+
-     package = Package()
- 
-     package.set_package("FooBar")
diff --git a/patches/ipkg-utils-050831/0003-ipkg-py-tarfile.patch b/patches/ipkg-utils-050831/0003-ipkg-py-tarfile.patch
deleted file mode 100644
index 2df6f2ec8..000000000
--- a/patches/ipkg-utils-050831/0003-ipkg-py-tarfile.patch
+++ /dev/null
@@ -1,328 +0,0 @@
-From: the openembedded project <http://openembedded.net/>
-Date: Fri, 22 Jan 2010 11:05:07 +0100
-Subject: [PATCH] ipkg-py-tarfile
-
----
- arfile.py | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ipkg.py   | 121 +++++++++++++++++++++++++++++++++---------------------------
- setup.py  |   2 +-
- 3 files changed, 192 insertions(+), 55 deletions(-)
- create mode 100644 arfile.py
-
-diff --git a/arfile.py b/arfile.py
-new file mode 100644
-index 0000000..0bcd8d0
---- /dev/null
-+++ b/arfile.py
-@@ -0,0 +1,124 @@
-+"""
-+arfile - A module to parse GNU ar archives.
-+
-+Copyright (c) 2006-7 Paul Sokolovsky
-+This file is released under the terms 
-+of GNU General Public License v2 or later.
-+"""
-+import sys
-+import os
-+import tarfile 
-+
-+
-+class FileSection:
-+    "A class which allows to treat portion of file as separate file object."
-+
-+    def __init__(self, f, offset, size):
-+        self.f = f
-+        self.offset = offset
-+        self.size = size
-+        self.seek(0, 0)
-+
-+    def seek(self, offset, whence = 0):
-+#        print "seek(%x, %d)" % (offset, whence)
-+        if whence == 0:
-+            return self.f.seek(offset + self.offset, whence)
-+        elif whence == 1:
-+            return self.f.seek(offset, whence)
-+        elif whence == 2:
-+            return self.f.seek(self.offset + self.size + offset, 0)
-+        else:
-+            assert False
-+
-+    def tell(self):
-+#        print "tell()"
-+        return self.f.tell() - self.offset
-+
-+    def read(self, size = -1):
-+#        print "read(%d)" % size
-+        return self.f.read(size)
-+
-+class ArFile:
-+
-+    def __init__(self, f):
-+        self.f = f
-+        self.directory = {}
-+        self.directoryRead = False
-+
-+        signature = self.f.readline()
-+        assert signature == "!<arch>\n"
-+        self.directoryOffset = self.f.tell()
-+
-+    def open(self, fname):
-+        if self.directory.has_key(fname):
-+            return FileSection(self.f, self.directory[fname][-1], int(self.directory[fname][5]))
-+
-+        if self.directoryRead:
-+            raise IOError, (2, "AR member not found: " + fname)
-+
-+        f = self._scan(fname)
-+        if f == None:
-+            raise IOError, (2, "AR member not found: " + fname)
-+        return f
-+
-+
-+    def _scan(self, fname):
-+        self.f.seek(self.directoryOffset, 0)
-+
-+        while True:
-+            l = self.f.readline()
-+            if not l: 
-+                self.directoryRead = True
-+                return None
-+
-+            if l == "\n":
-+                l = self.f.readline()
-+                if not l: break
-+            descriptor = l.split()
-+#            print descriptor
-+            size = int(descriptor[5])
-+            memberName = descriptor[0][:-1]
-+            self.directory[memberName] = descriptor + [self.f.tell()]
-+#            print "read:", memberName
-+            if memberName == fname or (memberName.startswith("`") and memberName[1:] == fname):
-+                # Record directory offset to start from next time
-+                self.directoryOffset = self.f.tell() + size
-+                return FileSection(self.f, self.f.tell(), size)
-+
-+            # Skip data and loop
-+            data = self.f.seek(size, 1)
-+#            print hex(f.tell())
-+
-+
-+if __name__ == "__main__":
-+    if None:
-+        f = open(sys.argv[1], "rb")
-+
-+        ar = ArFile(f)
-+        tarStream = ar.open("data.tar.gz")
-+        print "--------"
-+        tarStream = ar.open("data.tar.gz")
-+        print "--------"
-+        tarStream = ar.open("control.tar.gz")
-+        print "--------"
-+        tarStream = ar.open("control.tar.gz2")
-+
-+        sys.exit(0)
-+
-+
-+    dir = "."
-+    if len(sys.argv) > 1:
-+        dir = sys.argv[1]
-+    for f in os.listdir(dir):
-+        if not f.endswith(".ipk"): continue
-+
-+        print "=== %s ===" % f
-+        f = open(dir + "/" + f, "rb")
-+
-+        ar = ArFile(f)
-+        tarStream = ar.open("control.tar.gz")
-+        tarf = tarfile.open("control.tar.gz", "r", tarStream)
-+        #tarf.list()
-+
-+        f2 = tarf.extractfile("control")
-+        print f2.read()
-diff --git a/ipkg.py b/ipkg.py
-index 824ba4d..67c2aa3 100644
---- a/ipkg.py
-+++ b/ipkg.py
-@@ -41,6 +41,8 @@ import re
- import string
- import commands
- from stat import ST_SIZE
-+import arfile
-+import tarfile
- 
- class Version:
-     """A class for holding parsed package version information."""
-@@ -131,78 +133,63 @@ class Package:
- 	self.section = None
-         self.filename_header = None
- 	self.file_list = []
--        self.md5 = None
-+        # md5 is lazy attribute, computed on demand
-+        #self.md5 = None
-         self.size = None
-         self.installed_size = None
-         self.filename = None
-         self.isdeb = 0
-+        self.fn = fn
- 
- 	if fn:
-             # see if it is deb format
--            f = open(fn, "r")
-+            f = open(fn, "rb")
-             magic = f.read(4)
--            f.close()
-+            f.seek(0, 0)
-             if (magic == "!<ar"):
-                 self.isdeb = 1
- 
--            # compute the MD5.
--            f = open(fn, "r")
--            sum = md5.new()
--            while 1:
--                data = f.read(1024)
--                if not data: break
--                sum.update(data)
--            f.close()
--            if sys.version[:1] > '2':
--                # when using Python 2.0 or newer
--                self.md5 = sum.hexdigest() 
--            else:
--                self.md5 = string.join(map((lambda x:"%02x" % ord(x)),sum.digest()),'')
-             stat = os.stat(fn)
--            self.size = stat[ST_SIZE]
-+            self.size = stat[ST_SIZE]    
-             self.filename = os.path.basename(fn)
- 	    ## sys.stderr.write("  extracting control.tar.gz from %s\n"% (fn,)) 
--            if self.isdeb:
--                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r")
--            else:
--                control = os.popen("tar xfzO "+fn+" 'control.tar.gz' | tar xfzO - './control'","r")
--            line = control.readline()
--            while 1:
--                if not line: break
--                line = string.rstrip(line)
--                lineparts = re.match(r'([\w-]*?):\s*(.*)', line)
--		if lineparts:
--                    name = string.lower(lineparts.group(1))
--		    value = lineparts.group(2)
--		    while 1:
--			line = control.readline()
--			if not line: break
--			if line[0] != ' ': break
--                        line = string.rstrip(line)
--			value = value + '\n' + line
--                    # don't allow package to override its own filename
--                    if name == "filename":
--                        self.filename_header = value
--                    else:
--                        if self.__dict__.has_key(name):
--                            self.__dict__[name] = value
--                else:
--                    line = control.readline()
-+	    if self.isdeb:
-+        	ar = arfile.ArFile(f)
-+        	tarStream = ar.open("control.tar.gz")
-+        	tarf = tarfile.open("control.tar.gz", "r", tarStream)
-+
-+        	try:
-+        	    control = tarf.extractfile("control")
-+        	except KeyError:
-+        	    control = tarf.extractfile("./control")
-+	    else:
-+		control = os.popen("tar --wildcards -xzO -f " + fn + " '*control.tar.gz' | tar xfzO - './control'", "r")
-+
-+            self.read_control(control)
-             control.close()
--            if self.isdeb:
--                data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r")
--            else:
--                data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r")
--            while 1:
--                line = data.readline()
--                if not line: break
--                self.file_list.append(string.rstrip(line))
--            data.close()
- 
- 	self.scratch_dir = None
- 	self.file_dir = None
- 	self.meta_dir = None
- 
-+    def __getattr__(self, name):
-+        if name == "md5":
-+            self._computeFileMD5()
-+            return self.md5
-+        else:
-+            raise AttributeError, name
-+
-+    def _computeFileMD5(self):
-+        # compute the MD5.
-+        f = open(self.fn, "rb")
-+        sum = md5.new()
-+        while 1:
-+            data = f.read(1024)
-+            if not data: break
-+            sum.update(data)
-+        f.close()
-+        self.md5 = sum.hexdigest()
-+
-     def read_control(self, control):
-         import os
- 
-@@ -221,9 +208,15 @@ class Package:
-                     value = value + '\n' + line
-                 if name == 'size':
-                     self.size = int(value)
-+	        elif name == 'md5sum':
-+                    self.md5 = value
-                 elif self.__dict__.has_key(name):
-                     self.__dict__[name] = value
--                if line[0] == '\n':
-+		else:
-+		    #print "Lost field %s, %s" % (name,value)
-+                    pass
-+
-+                if line and line[0] == '\n':
-                     return # consumes one blank line at end of package descriptoin
-             else:
-                 line = control.readline()
-@@ -314,7 +307,27 @@ class Package:
- 	return self.section
- 
-     def get_file_list(self):
--	return self.file_list
-+        if not self.fn:
-+            return []
-+	
-+	if self.isdeb:
-+    	    f = open(self.fn, "rb")
-+    	    ar = arfile.ArFile(f)
-+    	    tarStream = ar.open("data.tar.gz")
-+    	    tarf = tarfile.open("data.tar.gz", "r", tarStream)
-+    	    self.file_list = tarf.getnames()
-+    	    f.close()
-+	else:
-+            f = os.popen("tar xfzO " + self.fn + " '*data.tar.gz' | tar tfz -","r") 
-+            while 1: 
-+                line = f.readline() 
-+                if not line: break 
-+                self.file_list.append(string.rstrip(line)) 
-+            f.close() 
-+
-+        # Make sure that filelist has consistent format regardless of tar version
-+        self.file_list = map(lambda a: ["./", ""][a.startswith("./")] + a, self.file_list)
-+        return self.file_list
- 
-     def write_package(self, dirname):
-         buf = self.render_control()
-diff --git a/setup.py b/setup.py
-index 1c0c96c..8b28392 100644
---- a/setup.py
-+++ b/setup.py
-@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils',
- 		      platforms = 'POSIX',
- 		      keywords = 'ipkg familiar',
-                       url = 'http://www.handhelds.org/sources.html/',
--                      py_modules = [ 'ipkg' ],
-+                      py_modules = [ 'ipkg', 'arfile' ],
- 		      scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
-                       )
diff --git a/patches/ipkg-utils-050831/0004-arfile_even_alignment.patch b/patches/ipkg-utils-050831/0004-arfile_even_alignment.patch
deleted file mode 100644
index 1eda788ff..000000000
--- a/patches/ipkg-utils-050831/0004-arfile_even_alignment.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: the openembedded project <http://openembedded.net/>
-Date: Fri, 22 Jan 2010 11:05:12 +0100
-Subject: [PATCH] arfile_even_alignment
-
----
- arfile.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arfile.py b/arfile.py
-index 0bcd8d0..597cb3d 100644
---- a/arfile.py
-+++ b/arfile.py
-@@ -86,6 +86,8 @@ class ArFile:
-                 return FileSection(self.f, self.f.tell(), size)
- 
-             # Skip data and loop
-+            if size % 2:
-+                size = size + 1
-             data = self.f.seek(size, 1)
- #            print hex(f.tell())
- 
diff --git a/patches/ipkg-utils-050831/0005-ipkg-make-index-track-stamps.patch b/patches/ipkg-utils-050831/0005-ipkg-make-index-track-stamps.patch
deleted file mode 100644
index 4c2e14d78..000000000
--- a/patches/ipkg-utils-050831/0005-ipkg-make-index-track-stamps.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From: the openembedded project <http://openembedded.net/>
-Date: Fri, 22 Jan 2010 11:05:14 +0100
-Subject: [PATCH] ipkg-make-index-track-stamps
-
----
- ipkg-make-index | 29 ++++++++++++++++++++++++++---
- 1 file changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/ipkg-make-index b/ipkg-make-index
-index 8924dd0..6a49849 100755
---- a/ipkg-make-index
-+++ b/ipkg-make-index
-@@ -40,6 +40,7 @@ def to_locale(filename, locale):
- old_filename = None
- packages_filename = None
- filelist_filename = "Packages.filelist"
-+stamplist_filename = "Packages.stamps"
- opt_s = 0
- opt_m = 0
- (opts, remaining_args) = getopt.getopt(sys.argv[1:], "hl:p:vsmr:L:")
-@@ -50,6 +51,7 @@ for (optkey, optval) in opts:
-           opt_s = 1
-      if optkey == '-p': 
-           packages_filename = optval
-+          stamplist_filename = optval + ".stamps"
-      if optkey == '-l':
-           filelist_filename = optval
-      if optkey == '-v':
-@@ -72,6 +74,7 @@ old_pkg_hash = {}
- if packages_filename and not old_filename and os.path.exists(packages_filename):
-      old_filename = packages_filename
- 
-+pkgsStamps = {}
- if old_filename:
-      if (verbose):
-           sys.stderr.write("Reading package list from " + old_filename + "\n")
-@@ -80,6 +83,14 @@ if old_filename:
-      for k in old_packages.packages.keys():
-           p = old_packages.packages[k]
-           old_pkg_hash[p.filename] = p
-+     try:
-+        f = open(stamplist_filename, "r")
-+        for l in f:
-+            l = l.strip()
-+            s, f = l.split(" ", 1)
-+            pkgsStamps[f] = int(s)
-+     except IOError:
-+        pass
- 
- if (verbose):
-      sys.stderr.write("Reading in all the package info from %s\n" % (pkg_dir, ))
-@@ -87,11 +98,17 @@ files=glob(pkg_dir + '/*.ipk') + glob(pkg_dir + '/*.deb')
- files.sort()
- for filename in files:
-      basename = os.path.basename(filename)
-+     pkg = None
-+     fnameStat = os.stat(filename)
-      if old_pkg_hash.has_key(basename):
--          if (verbose):
-+          if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]:
-+            if (verbose):
-                sys.stderr.write("Found %s in Packages\n" % (filename,))
--          pkg = old_pkg_hash[basename]
--     else:
-+            pkg = old_pkg_hash[basename]
-+          else:
-+               sys.stderr.write("Found %s in Packages, but mtime differs - re-reading\n" % (filename,))
-+
-+     if not pkg:
-           if (verbose):
-                sys.stderr.write("Reading info for package %s\n" % (filename,))
-           pkg = ipkg.Package(filename)
-@@ -101,6 +118,7 @@ for filename in files:
-      else:
-           old_filename = ""
-      s = packages.add_package(pkg)
-+     pkgsStamps[basename] = fnameStat.st_mtime
-      if s == 0:
-           if old_filename:
-                # old package was displaced by newer
-@@ -114,6 +132,11 @@ for filename in files:
-           if opt_s:
-                print filename
- 
-+pkgsStampsFile = open(stamplist_filename, "w")
-+for f in pkgsStamps.keys():
-+    pkgsStampsFile.write("%d %s\n" % (pkgsStamps[f], f))
-+pkgsStampsFile.close()
-+
- if opt_s:
-      sys.exit(0)
- 
diff --git a/patches/ipkg-utils-050831/0006-fields_tweaks.patch b/patches/ipkg-utils-050831/0006-fields_tweaks.patch
deleted file mode 100644
index 4acb01879..000000000
--- a/patches/ipkg-utils-050831/0006-fields_tweaks.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: the openembedded project <http://openembedded.net/>
-Date: Fri, 22 Jan 2010 11:05:15 +0100
-Subject: [PATCH] fields_tweaks
-
----
- Makefile         |  2 ++
- ipkg-list-fields | 13 +++++++++++++
- ipkg.py          |  8 +++++++-
- 3 files changed, 22 insertions(+), 1 deletion(-)
- create mode 100644 ipkg-list-fields
-
-diff --git a/Makefile b/Makefile
-index cab10c1..7093a0d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -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
-diff --git a/ipkg-list-fields b/ipkg-list-fields
-new file mode 100644
-index 0000000..f726ef8
---- /dev/null
-+++ b/ipkg-list-fields
-@@ -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])
-+
-diff --git a/ipkg.py b/ipkg.py
-index 67c2aa3..d6f7e69 100644
---- a/ipkg.py
-+++ b/ipkg.py
-@@ -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:
-@@ -213,7 +216,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':
-@@ -414,6 +417,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/patches/ipkg-utils-050831/0007-ipkg-env.patch b/patches/ipkg-utils-050831/0007-ipkg-env.patch
deleted file mode 100644
index 1483163ab..000000000
--- a/patches/ipkg-utils-050831/0007-ipkg-env.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: the openembedded project <http://openembedded.net/>
-Date: Fri, 22 Jan 2010 11:05:16 +0100
-Subject: [PATCH] ipkg-env
-
----
- ipkg-list-fields  | 2 +-
- ipkg-make-index   | 2 +-
- ipkg-show-deps    | 2 +-
- ipkg-unbuild      | 2 +-
- ipkg-update-index | 2 +-
- ipkg-upload       | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/ipkg-list-fields b/ipkg-list-fields
-index f726ef8..437fcdb 100644
---- a/ipkg-list-fields
-+++ b/ipkg-list-fields
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- 
- import sys, ipkg
- 
-diff --git a/ipkg-make-index b/ipkg-make-index
-index 6a49849..a0f6001 100755
---- a/ipkg-make-index
-+++ b/ipkg-make-index
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- # $Id: ipkg-make-index,v 1.22 2005/03/03 16:39:04 jamey Exp $
- 
- import sys, os, posixpath
-diff --git a/ipkg-show-deps b/ipkg-show-deps
-index 2e983ac..aa7705d 100755
---- a/ipkg-show-deps
-+++ b/ipkg-show-deps
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- # $Id: ipkg-show-deps,v 1.2 2004/03/06 13:08:33 pb Exp $
- 
- import sys, os, posixpath
-diff --git a/ipkg-unbuild b/ipkg-unbuild
-index 661d4f1..7c06300 100755
---- a/ipkg-unbuild
-+++ b/ipkg-unbuild
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- 
- import sys, os, re
- 
-diff --git a/ipkg-update-index b/ipkg-update-index
-index f34324a..cc2541c 100755
---- a/ipkg-update-index
-+++ b/ipkg-update-index
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.1
-+#!/usr/bin/env python
- 
- import sys, os
- from glob import glob
-diff --git a/ipkg-upload b/ipkg-upload
-index 2fe5186..01e5815 100755
---- a/ipkg-upload
-+++ b/ipkg-upload
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/env python
- 
- import sys, os, os.path, re
- 
diff --git a/patches/ipkg-utils-050831/0008-ipkg.py-don-t-use-wildcards.patch b/patches/ipkg-utils-050831/0008-ipkg.py-don-t-use-wildcards.patch
deleted file mode 100644
index 452038a05..000000000
--- a/patches/ipkg-utils-050831/0008-ipkg.py-don-t-use-wildcards.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Fri, 22 Jan 2010 11:22:41 +0100
-Subject: [PATCH] ipkg.py: don't use wildcards
-
-it's not portable
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- ipkg.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ipkg.py b/ipkg.py
-index d6f7e69..02ca3e9 100644
---- a/ipkg.py
-+++ b/ipkg.py
-@@ -166,7 +166,7 @@ class Package:
-         	except KeyError:
-         	    control = tarf.extractfile("./control")
- 	    else:
--		control = os.popen("tar --wildcards -xzO -f " + fn + " '*control.tar.gz' | tar xfzO - './control'", "r")
-+		control = os.popen("tar -xzO -f " + fn + " './control.tar.gz' | tar xfzO - './control'", "r")
- 
-             self.read_control(control)
-             control.close()
-@@ -321,7 +321,7 @@ class Package:
-     	    self.file_list = tarf.getnames()
-     	    f.close()
- 	else:
--            f = os.popen("tar xfzO " + self.fn + " '*data.tar.gz' | tar tfz -","r") 
-+            f = os.popen("tar xfzO " + self.fn + " './data.tar.gz' | tar tfz -","r")
-             while 1: 
-                 line = f.readline() 
-                 if not line: break 
diff --git a/patches/ipkg-utils-050831/0009-Makefile-add-prefix-to-python-install.patch b/patches/ipkg-utils-050831/0009-Makefile-add-prefix-to-python-install.patch
deleted file mode 100644
index f0db44bb9..000000000
--- a/patches/ipkg-utils-050831/0009-Makefile-add-prefix-to-python-install.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Fri, 22 Jan 2010 11:27:37 +0100
-Subject: [PATCH] Makefile: add prefix to python install
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 7093a0d..249c687 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@ ipkg-compare-versions: ipkg-compare-versions.c
- 
- install: ${UTILS}
- 	cp ${UTILS} $(PREFIX)/bin
--	python setup.py install
-+	python setup.py install --prefix=$(PREFIX)
- 	chmod agu+rx ipkg-make-index
- 	cp -f ipkg-make-index $(PREFIX)/bin
- 	chmod agu+rx ipkg-list-fields
diff --git a/patches/ipkg-utils-050831/0010-ipkg-make-ar-deterministic.patch b/patches/ipkg-utils-050831/0010-ipkg-make-ar-deterministic.patch
deleted file mode 100644
index b985ba473..000000000
--- a/patches/ipkg-utils-050831/0010-ipkg-make-ar-deterministic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 24 May 2011 07:56:53 +0200
-Subject: [PATCH] ipkg: make ar deterministic
-
-Based on a patch from Darren Hutchinson <dhutchinson@google.com>
-
-From the original description:
-
-I had a strange problem when I tried to create an image.
-The last part of the error message was:
-
-File
-"<path to ptxdist>/projects/<project name>/ \
-platform-<project name>/sysroot-host/lib/python2.6/site-packages/arfile.py",
-line 79, in _scan
-    size = int(descriptor[5])
-ValueError: invalid literal for int() with base 10: '`'
-
-The problem eventually turned out to be that arfile.py has trouble parsing AR
-files created with a UID >99999 - it relies on the (ascii) AR header fields
-using one digit less than their allocated sizes so it can the padding
-space to split() them.
-
-The original patch added the option 'D' to ar to set the UID and GID to
-zero. This option is not available in older versions of ar. chown to 0:0
-instead. This is possible because the everything is run in fakeroot.
-
-Not for upstream!
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- ipkg-build | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/ipkg-build b/ipkg-build
-index 77367ac..7234e64 100755
---- a/ipkg-build
-+++ b/ipkg-build
-@@ -235,7 +235,10 @@ echo "2.0" > $tmp_dir/debian-binary
- pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
- rm -f $pkg_file
- if [ "$outer" = "ar" ] ; then
--  ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
-+  # chown the content to "0:0".  files. This is needed as high UID values (>
-+  # 99999) cause problems when parsing ar file headers
-+  ( cd $tmp_dir && chown 0:0 ./debian-binary ./data.tar.gz ./control.tar.gz &&
-+	ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
- else
-   ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
- fi
diff --git a/patches/ipkg-utils-050831/0011-ipkg-build-force-tar-gnu-format.patch b/patches/ipkg-utils-050831/0011-ipkg-build-force-tar-gnu-format.patch
deleted file mode 100644
index d312f365c..000000000
--- a/patches/ipkg-utils-050831/0011-ipkg-build-force-tar-gnu-format.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 11 Dec 2012 11:29:25 +0100
-Subject: [PATCH] ipkg-build: force tar gnu format
-
-Since openSUSE 12.2 the installed tar uses posix instead of gnu encoding by
-default. This format is not fully supported by ipkg and results in ipk
-packages not installable at the target.
-
-Based on a patch from OpenWrt.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- ipkg-build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/ipkg-build b/ipkg-build
-index 7234e64..528c1ef 100755
---- a/ipkg-build
-+++ b/ipkg-build
-@@ -226,8 +226,8 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$
- mkdir $tmp_dir
- 
- echo $CONTROL > $tmp_dir/tarX
--( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -czf $tmp_dir/data.tar.gz . )
--( cd $pkg_dir/$CONTROL && tar $ogargs -czf $tmp_dir/control.tar.gz . )
-+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX --format=gnu -czf $tmp_dir/data.tar.gz . )
-+( cd $pkg_dir/$CONTROL && tar $ogargs --format=gnu -czf $tmp_dir/control.tar.gz . )
- rm $tmp_dir/tarX
- 
- echo "2.0" > $tmp_dir/debian-binary
-@@ -240,7 +240,7 @@ if [ "$outer" = "ar" ] ; then
-   ( cd $tmp_dir && chown 0:0 ./debian-binary ./data.tar.gz ./control.tar.gz &&
- 	ar -crf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
- else
--  ( cd $tmp_dir && tar -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
-+  ( cd $tmp_dir && tar --format=gnu -zcf $pkg_file ./debian-binary ./data.tar.gz ./control.tar.gz )
- fi
- 
- rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz
diff --git a/patches/ipkg-utils-050831/series b/patches/ipkg-utils-050831/series
deleted file mode 100644
index dca7fd8df..000000000
--- a/patches/ipkg-utils-050831/series
+++ /dev/null
@@ -1,14 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-ipkg-utils-fix.patch
-0002-ipkg-py-sane-vercompare.patch
-0003-ipkg-py-tarfile.patch
-0004-arfile_even_alignment.patch
-0005-ipkg-make-index-track-stamps.patch
-0006-fields_tweaks.patch
-0007-ipkg-env.patch
-0008-ipkg.py-don-t-use-wildcards.patch
-0009-Makefile-add-prefix-to-python-install.patch
-0010-ipkg-make-ar-deterministic.patch
-0011-ipkg-build-force-tar-gnu-format.patch
-# 0d3699dca0b0443b020659319eb092d9  - git-ptx-patches magic