diff options
7 files changed, 0 insertions, 597 deletions
diff --git a/meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb deleted file mode 100644 index 3101ecb3be..0000000000 --- a/meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | require ipkg-utils_${PV}.bb | ||
| 2 | |||
| 3 | RDEPENDS = "" | ||
| 4 | PR = "r15" | ||
| 5 | |||
| 6 | inherit native | ||
| 7 | |||
| 8 | # Avoid circular dependencies from package_ipk.bbclass | ||
| 9 | PACKAGES = "" | ||
| 10 | FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils" | ||
| 11 | INSTALL += "arfile.py" | ||
| 12 | |||
| 13 | do_stage() { | ||
| 14 | for i in ${INSTALL}; do | ||
| 15 | install -m 0755 $i ${STAGING_BINDIR} | ||
| 16 | done | ||
| 17 | } | ||
diff --git a/meta/packages/ipkg-utils/ipkg-utils/fields_tweaks.patch b/meta/packages/ipkg-utils/ipkg-utils/fields_tweaks.patch deleted file mode 100644 index 2b08e47ad0..0000000000 --- a/meta/packages/ipkg-utils/ipkg-utils/fields_tweaks.patch +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | --- | ||
| 2 | Makefile | 2 ++ | ||
| 3 | ipkg-list-fields | 13 +++++++++++++ | ||
| 4 | ipkg.py | 8 +++++++- | ||
| 5 | 3 files changed, 22 insertions(+), 1 deletion(-) | ||
| 6 | |||
| 7 | Index: ipkg-utils/Makefile | ||
| 8 | =================================================================== | ||
| 9 | --- ipkg-utils.orig/Makefile 2007-06-13 22:45:47.000000000 +0100 | ||
| 10 | +++ ipkg-utils/Makefile 2007-06-13 22:46:50.000000000 +0100 | ||
| 11 | @@ -15,6 +15,8 @@ install: ${UTILS} | ||
| 12 | python setup.py install | ||
| 13 | chmod agu+rx ipkg-make-index | ||
| 14 | cp -f ipkg-make-index $(PREFIX)/bin | ||
| 15 | + chmod agu+rx ipkg-list-fields | ||
| 16 | + cp -f ipkg-list-fields $(PREFIX)/bin | ||
| 17 | |||
| 18 | binary: build | ||
| 19 | mkdir -p ipkg-build-binary/usr/bin | ||
| 20 | Index: ipkg-utils/ipkg-list-fields | ||
| 21 | =================================================================== | ||
| 22 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
| 23 | +++ ipkg-utils/ipkg-list-fields 2007-06-13 22:43:32.000000000 +0100 | ||
| 24 | @@ -0,0 +1,13 @@ | ||
| 25 | +#!/usr/bin/python | ||
| 26 | + | ||
| 27 | +import sys, ipkg | ||
| 28 | + | ||
| 29 | +def usage(): | ||
| 30 | + sys.stderr.write("%s ipk\n" % (sys.argv[0],)) | ||
| 31 | + sys.exit(-1) | ||
| 32 | + | ||
| 33 | +if (len(sys.argv) < 2): | ||
| 34 | + usage() | ||
| 35 | + | ||
| 36 | +print ipkg.Package(sys.argv[1]) | ||
| 37 | + | ||
| 38 | Index: ipkg-utils/ipkg.py | ||
| 39 | =================================================================== | ||
| 40 | --- ipkg-utils.orig/ipkg.py 2007-06-13 22:44:50.000000000 +0100 | ||
| 41 | +++ ipkg-utils/ipkg.py 2007-06-13 22:39:44.000000000 +0100 | ||
| 42 | @@ -139,6 +139,9 @@ class Package: | ||
| 43 | self.installed_size = None | ||
| 44 | self.filename = None | ||
| 45 | self.isdeb = 0 | ||
| 46 | + self.homepage = None | ||
| 47 | + self.oe = None | ||
| 48 | + self.priority = None | ||
| 49 | self.fn = fn | ||
| 50 | |||
| 51 | if fn: | ||
| 52 | @@ -211,7 +214,7 @@ class Package: | ||
| 53 | elif self.__dict__.has_key(name): | ||
| 54 | self.__dict__[name] = value | ||
| 55 | else: | ||
| 56 | - #print "Lost field %s, %s" % (name,value) | ||
| 57 | + print "Lost field %s, %s" % (name,value) | ||
| 58 | pass | ||
| 59 | |||
| 60 | if line and line[0] == '\n': | ||
| 61 | @@ -402,6 +405,9 @@ class Package: | ||
| 62 | if self.filename: out = out + "Filename: %s\n" % (self.filename) | ||
| 63 | if self.source: out = out + "Source: %s\n" % (self.source) | ||
| 64 | if self.description: out = out + "Description: %s\n" % (self.description) | ||
| 65 | + if self.oe: out = out + "OE: %s\n" % (self.oe) | ||
| 66 | + if self.homepage: out = out + "HomePage: %s\n" % (self.homepage) | ||
| 67 | + if self.priority: out = out + "Priority: %s\n" % (self.priority) | ||
| 68 | out = out + "\n" | ||
| 69 | |||
| 70 | return out | ||
diff --git a/meta/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch b/meta/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch deleted file mode 100644 index 9f9b9359ce..0000000000 --- a/meta/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch +++ /dev/null | |||
| @@ -1,97 +0,0 @@ | |||
| 1 | --- | ||
| 2 | ipkg-make-index | 31 +++++++++++++++++++++++++++---- | ||
| 3 | 1 file changed, 27 insertions(+), 4 deletions(-) | ||
| 4 | |||
| 5 | Index: ipkg-utils/ipkg-make-index | ||
| 6 | =================================================================== | ||
| 7 | --- ipkg-utils.orig/ipkg-make-index 2007-05-26 23:45:56.000000000 +0100 | ||
| 8 | +++ ipkg-utils/ipkg-make-index 2007-05-26 23:47:25.000000000 +0100 | ||
| 9 | @@ -40,6 +40,7 @@ def to_locale(filename, locale): | ||
| 10 | old_filename = None | ||
| 11 | packages_filename = None | ||
| 12 | filelist_filename = "Packages.filelist" | ||
| 13 | +stamplist_filename = "Packages.stamps" | ||
| 14 | opt_s = 0 | ||
| 15 | opt_m = 0 | ||
| 16 | (opts, remaining_args) = getopt.getopt(sys.argv[1:], "hl:p:vsmr:L:") | ||
| 17 | @@ -50,6 +51,7 @@ for (optkey, optval) in opts: | ||
| 18 | opt_s = 1 | ||
| 19 | if optkey == '-p': | ||
| 20 | packages_filename = optval | ||
| 21 | + stamplist_filename = optval + ".stamps" | ||
| 22 | if optkey == '-l': | ||
| 23 | filelist_filename = optval | ||
| 24 | if optkey == '-v': | ||
| 25 | @@ -72,6 +74,7 @@ old_pkg_hash = {} | ||
| 26 | if packages_filename and not old_filename and os.path.exists(packages_filename): | ||
| 27 | old_filename = packages_filename | ||
| 28 | |||
| 29 | +pkgsStamps = {} | ||
| 30 | if old_filename: | ||
| 31 | if (verbose): | ||
| 32 | sys.stderr.write("Reading package list from " + old_filename + "\n") | ||
| 33 | @@ -80,6 +83,14 @@ if old_filename: | ||
| 34 | for k in old_packages.packages.keys(): | ||
| 35 | p = old_packages.packages[k] | ||
| 36 | old_pkg_hash[p.filename] = p | ||
| 37 | + try: | ||
| 38 | + f = open(stamplist_filename, "r") | ||
| 39 | + for l in f: | ||
| 40 | + l = l.strip() | ||
| 41 | + s, f = l.split(" ", 1) | ||
| 42 | + pkgsStamps[f] = int(s) | ||
| 43 | + except IOError: | ||
| 44 | + pass | ||
| 45 | |||
| 46 | if (verbose): | ||
| 47 | sys.stderr.write("Reading in all the package info from %s\n" % (pkg_dir, )) | ||
| 48 | @@ -87,11 +98,17 @@ files=glob(pkg_dir + '/*.ipk') + glob(pk | ||
| 49 | files.sort() | ||
| 50 | for filename in files: | ||
| 51 | basename = os.path.basename(filename) | ||
| 52 | + pkg = None | ||
| 53 | + fnameStat = os.stat(filename) | ||
| 54 | if old_pkg_hash.has_key(basename): | ||
| 55 | - if (verbose): | ||
| 56 | + if pkgsStamps.has_key(basename) and fnameStat.st_mtime == pkgsStamps[basename]: | ||
| 57 | + if (verbose): | ||
| 58 | sys.stderr.write("Found %s in Packages\n" % (filename,)) | ||
| 59 | - pkg = old_pkg_hash[basename] | ||
| 60 | - else: | ||
| 61 | + pkg = old_pkg_hash[basename] | ||
| 62 | + else: | ||
| 63 | + sys.stderr.write("Found %s in Packages, but mtime differs - re-reading\n" % (filename,)) | ||
| 64 | + | ||
| 65 | + if not pkg: | ||
| 66 | if (verbose): | ||
| 67 | sys.stderr.write("Reading info for package %s\n" % (filename,)) | ||
| 68 | pkg = ipkg.Package(filename) | ||
| 69 | @@ -101,6 +118,7 @@ for filename in files: | ||
| 70 | else: | ||
| 71 | old_filename = "" | ||
| 72 | s = packages.add_package(pkg) | ||
| 73 | + pkgsStamps[basename] = fnameStat.st_mtime | ||
| 74 | if s == 0: | ||
| 75 | if old_filename: | ||
| 76 | # old package was displaced by newer | ||
| 77 | @@ -114,6 +132,11 @@ for filename in files: | ||
| 78 | if opt_s: | ||
| 79 | print filename | ||
| 80 | |||
| 81 | +pkgsStampsFile = open(stamplist_filename, "w") | ||
| 82 | +for f in pkgsStamps.keys(): | ||
| 83 | + pkgsStampsFile.write("%d %s\n" % (pkgsStamps[f], f)) | ||
| 84 | +pkgsStampsFile.close() | ||
| 85 | + | ||
| 86 | if opt_s: | ||
| 87 | sys.exit(0) | ||
| 88 | |||
| 89 | @@ -154,7 +177,7 @@ if packages_filename: | ||
| 90 | os.rename(tmp_packages_filename, packages_filename) | ||
| 91 | os.rename(tmp_gzip_filename, gzip_filename) | ||
| 92 | |||
| 93 | -if verbose: | ||
| 94 | +if verbose: | ||
| 95 | sys.stderr.write("Generate Packages.filelist file\n") | ||
| 96 | files = {} | ||
| 97 | names = packages.packages.keys() | ||
diff --git a/meta/packages/ipkg-utils/ipkg-utils/ipkg-py-sane-vercompare.patch b/meta/packages/ipkg-utils/ipkg-utils/ipkg-py-sane-vercompare.patch deleted file mode 100644 index 00ee391405..0000000000 --- a/meta/packages/ipkg-utils/ipkg-utils/ipkg-py-sane-vercompare.patch +++ /dev/null | |||
| @@ -1,51 +0,0 @@ | |||
| 1 | Only in ipkg-utils: ipkg-py-sane-vercompare.patch | ||
| 2 | diff -ur ipkg-utils.org/ipkg.py ipkg-utils/ipkg.py | ||
| 3 | --- ipkg-utils.org/ipkg.py 2005-01-08 18:08:52.000000000 +0000 | ||
| 4 | +++ ipkg-utils/ipkg.py 2007-04-04 11:52:46.000000000 +0000 | ||
| 5 | @@ -48,9 +48,9 @@ | ||
| 6 | self.epoch = epoch | ||
| 7 | self.version = version | ||
| 8 | |||
| 9 | - def _versioncompare(self, ref): | ||
| 10 | - selfversion = self.version | ||
| 11 | - refversion = ref.version | ||
| 12 | + def _versioncompare(self, selfversion, refversion): | ||
| 13 | + if not selfversion: selfversion = "" | ||
| 14 | + if not refversion: refversion = "" | ||
| 15 | while 1: | ||
| 16 | ## first look for non-numeric version component | ||
| 17 | selfm = re.match('([^0-9]*)(.*)', selfversion) | ||
| 18 | @@ -89,7 +89,18 @@ | ||
| 19 | elif (self.epoch < ref.epoch): | ||
| 20 | return -1 | ||
| 21 | else: | ||
| 22 | - return self._versioncompare(ref) | ||
| 23 | + self_ver_comps = re.match(r"(.+?)(-r.+)?$", self.version) | ||
| 24 | + ref_ver_comps = re.match(r"(.+?)(-r.+)?$", ref.version) | ||
| 25 | + #print (self_ver_comps.group(1), self_ver_comps.group(2)) | ||
| 26 | + #print (ref_ver_comps.group(1), ref_ver_comps.group(2)) | ||
| 27 | + r = self._versioncompare(self_ver_comps.group(1), ref_ver_comps.group(1)) | ||
| 28 | + if r == 0: | ||
| 29 | + r = self._versioncompare(self_ver_comps.group(2), ref_ver_comps.group(2)) | ||
| 30 | + #print "compare: %s vs %s = %d" % (self, ref, r) | ||
| 31 | + return r | ||
| 32 | + | ||
| 33 | + def __str__(self): | ||
| 34 | + return str(self.epoch) + ":" + self.version | ||
| 35 | |||
| 36 | def parse_version(versionstr): | ||
| 37 | epoch = 0 | ||
| 38 | @@ -445,6 +456,13 @@ | ||
| 39 | return self.packages[key] | ||
| 40 | |||
| 41 | if __name__ == "__main__": | ||
| 42 | + | ||
| 43 | + assert Version(0, "1.2.2-r1").compare(Version(0, "1.2.3-r0")) == -1 | ||
| 44 | + assert Version(0, "1.2.2-r0").compare(Version(0, "1.2.2+cvs20070308-r0")) == -1 | ||
| 45 | + assert Version(0, "1.2.2+cvs20070308").compare(Version(0, "1.2.2-r0")) == 1 | ||
| 46 | + assert Version(0, "1.2.2-r0").compare(Version(0, "1.2.2-r0")) == 0 | ||
| 47 | + assert Version(0, "1.2.2-r5").compare(Version(0, "1.2.2-r0")) == 1 | ||
| 48 | + | ||
| 49 | package = Package() | ||
| 50 | |||
| 51 | package.set_package("FooBar") | ||
diff --git a/meta/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch b/meta/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch deleted file mode 100644 index 189cf04158..0000000000 --- a/meta/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch +++ /dev/null | |||
| @@ -1,310 +0,0 @@ | |||
| 1 | --- | ||
| 2 | arfile.py | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
| 3 | ipkg.py | 106 ++++++++++++++++++++++++++--------------------------- | ||
| 4 | setup.py | 2 - | ||
| 5 | 3 files changed, 177 insertions(+), 55 deletions(-) | ||
| 6 | |||
| 7 | Index: ipkg-utils/arfile.py | ||
| 8 | =================================================================== | ||
| 9 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
| 10 | +++ ipkg-utils/arfile.py 2007-05-26 23:46:59.000000000 +0100 | ||
| 11 | @@ -0,0 +1,125 @@ | ||
| 12 | +""" | ||
| 13 | +arfile - A module to parse GNU ar archives. | ||
| 14 | + | ||
| 15 | +Copyright (c) 2006-7 Paul Sokolovsky | ||
| 16 | +This file is released under the terms | ||
| 17 | +of GNU General Public License v2 or later. | ||
| 18 | +""" | ||
| 19 | +import sys | ||
| 20 | +import os | ||
| 21 | +import tarfile | ||
| 22 | + | ||
| 23 | + | ||
| 24 | +class FileSection: | ||
| 25 | + "A class which allows to treat portion of file as separate file object." | ||
| 26 | + | ||
| 27 | + def __init__(self, f, offset, size): | ||
| 28 | + self.f = f | ||
| 29 | + self.offset = offset | ||
| 30 | + self.size = size | ||
| 31 | + self.seek(0, 0) | ||
| 32 | + | ||
| 33 | + def seek(self, offset, whence = 0): | ||
| 34 | +# print "seek(%x, %d)" % (offset, whence) | ||
| 35 | + if whence == 0: | ||
| 36 | + return self.f.seek(offset + self.offset, whence) | ||
| 37 | + elif whence == 1: | ||
| 38 | + return self.f.seek(offset, whence) | ||
| 39 | + elif whence == 2: | ||
| 40 | + return self.f.seek(self.offset + self.size + offset, 0) | ||
| 41 | + else: | ||
| 42 | + assert False | ||
| 43 | + | ||
| 44 | + def tell(self): | ||
| 45 | +# print "tell()" | ||
| 46 | + return self.f.tell() - self.offset | ||
| 47 | + | ||
| 48 | + def read(self, size = -1): | ||
| 49 | +# print "read(%d)" % size | ||
| 50 | + return self.f.read(size) | ||
| 51 | + | ||
| 52 | +class ArFile: | ||
| 53 | + | ||
| 54 | + def __init__(self, f): | ||
| 55 | + self.f = f | ||
| 56 | + self.directory = {} | ||
| 57 | + self.directoryRead = False | ||
| 58 | + | ||
| 59 | + signature = self.f.readline() | ||
| 60 | + assert signature == "!<arch>\n" | ||
| 61 | + self.directoryOffset = self.f.tell() | ||
| 62 | + | ||
| 63 | + def open(self, fname): | ||
| 64 | + if self.directory.has_key(fname): | ||
| 65 | + return FileSection(self.f, self.directory[fname][-1], int(self.directory[fname][5])) | ||
| 66 | + | ||
| 67 | + if self.directoryRead: | ||
| 68 | + raise IOError, (2, "AR member not found: " + fname) | ||
| 69 | + | ||
| 70 | + f = self._scan(fname) | ||
| 71 | + if f == None: | ||
| 72 | + raise IOError, (2, "AR member not found: " + fname) | ||
| 73 | + return f | ||
| 74 | + | ||
| 75 | + | ||
| 76 | + def _scan(self, fname): | ||
| 77 | + self.f.seek(self.directoryOffset, 0) | ||
| 78 | + | ||
| 79 | + while True: | ||
| 80 | + l = self.f.readline() | ||
| 81 | + if not l: | ||
| 82 | + self.directoryRead = True | ||
| 83 | + return None | ||
| 84 | + | ||
| 85 | + if l == "\n": | ||
| 86 | + l = self.f.readline() | ||
| 87 | + if not l: break | ||
| 88 | + l = l.replace('`', '') | ||
| 89 | + descriptor = l.split() | ||
| 90 | +# print descriptor | ||
| 91 | + size = int(descriptor[5]) | ||
| 92 | + memberName = descriptor[0][:-1] | ||
| 93 | + self.directory[memberName] = descriptor + [self.f.tell()] | ||
| 94 | +# print "read:", memberName | ||
| 95 | + if memberName == fname: | ||
| 96 | + # Record directory offset to start from next time | ||
| 97 | + self.directoryOffset = self.f.tell() + size | ||
| 98 | + return FileSection(self.f, self.f.tell(), size) | ||
| 99 | + | ||
| 100 | + # Skip data and loop | ||
| 101 | + data = self.f.seek(size, 1) | ||
| 102 | +# print hex(f.tell()) | ||
| 103 | + | ||
| 104 | + | ||
| 105 | +if __name__ == "__main__": | ||
| 106 | + if None: | ||
| 107 | + f = open(sys.argv[1], "rb") | ||
| 108 | + | ||
| 109 | + ar = ArFile(f) | ||
| 110 | + tarStream = ar.open("data.tar.gz") | ||
| 111 | + print "--------" | ||
| 112 | + tarStream = ar.open("data.tar.gz") | ||
| 113 | + print "--------" | ||
| 114 | + tarStream = ar.open("control.tar.gz") | ||
| 115 | + print "--------" | ||
| 116 | + tarStream = ar.open("control.tar.gz2") | ||
| 117 | + | ||
| 118 | + sys.exit(0) | ||
| 119 | + | ||
| 120 | + | ||
| 121 | + dir = "." | ||
| 122 | + if len(sys.argv) > 1: | ||
| 123 | + dir = sys.argv[1] | ||
| 124 | + for f in os.listdir(dir): | ||
| 125 | + if not f.endswith(".ipk"): continue | ||
| 126 | + | ||
| 127 | + print "=== %s ===" % f | ||
| 128 | + f = open(dir + "/" + f, "rb") | ||
| 129 | + | ||
| 130 | + ar = ArFile(f) | ||
| 131 | + tarStream = ar.open("control.tar.gz") | ||
| 132 | + tarf = tarfile.open("control.tar.gz", "r", tarStream) | ||
| 133 | + #tarf.list() | ||
| 134 | + | ||
| 135 | + f2 = tarf.extractfile("control") | ||
| 136 | + print f2.read() | ||
| 137 | Index: ipkg-utils/setup.py | ||
| 138 | =================================================================== | ||
| 139 | --- ipkg-utils.orig/setup.py 2007-05-26 23:45:55.000000000 +0100 | ||
| 140 | +++ ipkg-utils/setup.py 2007-05-26 23:46:59.000000000 +0100 | ||
| 141 | @@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils | ||
| 142 | platforms = 'POSIX', | ||
| 143 | keywords = 'ipkg familiar', | ||
| 144 | url = 'http://www.handhelds.org/sources.html/', | ||
| 145 | - py_modules = [ 'ipkg' ], | ||
| 146 | + py_modules = [ 'ipkg', 'arfile' ], | ||
| 147 | scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload'] | ||
| 148 | ) | ||
| 149 | Index: ipkg-utils/ipkg.py | ||
| 150 | =================================================================== | ||
| 151 | --- ipkg-utils.orig/ipkg.py 2007-05-26 23:46:55.000000000 +0100 | ||
| 152 | +++ ipkg-utils/ipkg.py 2007-05-26 23:45:20.000000000 +0100 | ||
| 153 | @@ -41,6 +41,8 @@ import re | ||
| 154 | import string | ||
| 155 | import commands | ||
| 156 | from stat import ST_SIZE | ||
| 157 | +import arfile | ||
| 158 | +import tarfile | ||
| 159 | |||
| 160 | class Version: | ||
| 161 | """A class for holding parsed package version information.""" | ||
| 162 | @@ -131,78 +133,61 @@ class Package: | ||
| 163 | self.section = None | ||
| 164 | self.filename_header = None | ||
| 165 | self.file_list = [] | ||
| 166 | - self.md5 = None | ||
| 167 | + # md5 is lazy attribute, computed on demand | ||
| 168 | + #self.md5 = None | ||
| 169 | self.size = None | ||
| 170 | self.installed_size = None | ||
| 171 | self.filename = None | ||
| 172 | self.isdeb = 0 | ||
| 173 | + self.fn = fn | ||
| 174 | |||
| 175 | if fn: | ||
| 176 | # see if it is deb format | ||
| 177 | - f = open(fn, "r") | ||
| 178 | + f = open(fn, "rb") | ||
| 179 | magic = f.read(4) | ||
| 180 | - f.close() | ||
| 181 | + f.seek(0, 0) | ||
| 182 | if (magic == "!<ar"): | ||
| 183 | self.isdeb = 1 | ||
| 184 | |||
| 185 | - # compute the MD5. | ||
| 186 | - f = open(fn, "r") | ||
| 187 | - sum = md5.new() | ||
| 188 | - while 1: | ||
| 189 | - data = f.read(1024) | ||
| 190 | - if not data: break | ||
| 191 | - sum.update(data) | ||
| 192 | - f.close() | ||
| 193 | - if sys.version[:1] > '2': | ||
| 194 | - # when using Python 2.0 or newer | ||
| 195 | - self.md5 = sum.hexdigest() | ||
| 196 | - else: | ||
| 197 | - self.md5 = string.join(map((lambda x:"%02x" % ord(x)),sum.digest()),'') | ||
| 198 | - stat = os.stat(fn) | ||
| 199 | - self.size = stat[ST_SIZE] | ||
| 200 | + | ||
| 201 | self.filename = os.path.basename(fn) | ||
| 202 | + assert self.isdeb == 1, "Old ipk format (non-deb) is unsupported" | ||
| 203 | + | ||
| 204 | ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) | ||
| 205 | - if self.isdeb: | ||
| 206 | - control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r") | ||
| 207 | - else: | ||
| 208 | - control = os.popen("tar xfzO "+fn+" 'control.tar.gz' | tar xfzO - './control'","r") | ||
| 209 | - line = control.readline() | ||
| 210 | - while 1: | ||
| 211 | - if not line: break | ||
| 212 | - line = string.rstrip(line) | ||
| 213 | - lineparts = re.match(r'([\w-]*?):\s*(.*)', line) | ||
| 214 | - if lineparts: | ||
| 215 | - name = string.lower(lineparts.group(1)) | ||
| 216 | - value = lineparts.group(2) | ||
| 217 | - while 1: | ||
| 218 | - line = control.readline() | ||
| 219 | - if not line: break | ||
| 220 | - if line[0] != ' ': break | ||
| 221 | - line = string.rstrip(line) | ||
| 222 | - value = value + '\n' + line | ||
| 223 | - # don't allow package to override its own filename | ||
| 224 | - if name == "filename": | ||
| 225 | - self.filename_header = value | ||
| 226 | - else: | ||
| 227 | - if self.__dict__.has_key(name): | ||
| 228 | - self.__dict__[name] = value | ||
| 229 | - else: | ||
| 230 | - line = control.readline() | ||
| 231 | + | ||
| 232 | + ar = arfile.ArFile(f) | ||
| 233 | + tarStream = ar.open("control.tar.gz") | ||
| 234 | + tarf = tarfile.open("control.tar.gz", "r", tarStream) | ||
| 235 | + | ||
| 236 | + try: | ||
| 237 | + control = tarf.extractfile("control") | ||
| 238 | + except KeyError: | ||
| 239 | + control = tarf.extractfile("./control") | ||
| 240 | + self.read_control(control) | ||
| 241 | control.close() | ||
| 242 | - if self.isdeb: | ||
| 243 | - data = os.popen("ar p "+fn+" data.tar.gz | tar tfz -","r") | ||
| 244 | - else: | ||
| 245 | - data = os.popen("tar xfzO "+fn+" '*data.tar.gz' | tar tfz -","r") | ||
| 246 | - while 1: | ||
| 247 | - line = data.readline() | ||
| 248 | - if not line: break | ||
| 249 | - self.file_list.append(string.rstrip(line)) | ||
| 250 | - data.close() | ||
| 251 | |||
| 252 | self.scratch_dir = None | ||
| 253 | self.file_dir = None | ||
| 254 | self.meta_dir = None | ||
| 255 | |||
| 256 | + def __getattr__(self, name): | ||
| 257 | + if name == "md5": | ||
| 258 | + self._computeFileMD5() | ||
| 259 | + return self.md5 | ||
| 260 | + else: | ||
| 261 | + raise AttributeError, name | ||
| 262 | + | ||
| 263 | + def _computeFileMD5(self): | ||
| 264 | + # compute the MD5. | ||
| 265 | + f = open(self.fn, "rb") | ||
| 266 | + sum = md5.new() | ||
| 267 | + while 1: | ||
| 268 | + data = f.read(1024) | ||
| 269 | + if not data: break | ||
| 270 | + sum.update(data) | ||
| 271 | + f.close() | ||
| 272 | + self.md5 = sum.hexdigest() | ||
| 273 | + | ||
| 274 | def read_control(self, control): | ||
| 275 | import os | ||
| 276 | |||
| 277 | @@ -221,9 +203,15 @@ class Package: | ||
| 278 | value = value + '\n' + line | ||
| 279 | if name == 'size': | ||
| 280 | self.size = int(value) | ||
| 281 | + elif name == 'md5sum': | ||
| 282 | + self.md5 = value | ||
| 283 | elif self.__dict__.has_key(name): | ||
| 284 | self.__dict__[name] = value | ||
| 285 | - if line[0] == '\n': | ||
| 286 | + else: | ||
| 287 | + #print "Lost field %s, %s" % (name,value) | ||
| 288 | + pass | ||
| 289 | + | ||
| 290 | + if line and line[0] == '\n': | ||
| 291 | return # consumes one blank line at end of package descriptoin | ||
| 292 | else: | ||
| 293 | line = control.readline() | ||
| 294 | @@ -314,6 +302,16 @@ class Package: | ||
| 295 | return self.section | ||
| 296 | |||
| 297 | def get_file_list(self): | ||
| 298 | + if not self.fn: | ||
| 299 | + return [] | ||
| 300 | + f = open(self.fn, "rb") | ||
| 301 | + ar = arfile.ArFile(f) | ||
| 302 | + tarStream = ar.open("data.tar.gz") | ||
| 303 | + tarf = tarfile.open("data.tar.gz", "r", tarStream) | ||
| 304 | + self.file_list = tarf.getnames() | ||
| 305 | + self.file_list = map(lambda a: ["./", ""][a.startswith("./")] + a, self.file_list) | ||
| 306 | + | ||
| 307 | + f.close() | ||
| 308 | return self.file_list | ||
| 309 | |||
| 310 | def write_package(self, dirname): | ||
diff --git a/meta/packages/ipkg-utils/ipkg-utils/ipkg-utils-fix.patch b/meta/packages/ipkg-utils/ipkg-utils/ipkg-utils-fix.patch deleted file mode 100644 index b3e0d62cd9..0000000000 --- a/meta/packages/ipkg-utils/ipkg-utils/ipkg-utils-fix.patch +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | --- | ||
| 2 | ipkg.py | 4 ++-- | ||
| 3 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 4 | |||
| 5 | Index: ipkg-utils/ipkg.py | ||
| 6 | =================================================================== | ||
| 7 | --- ipkg-utils.orig/ipkg.py 2007-05-26 23:49:05.000000000 +0100 | ||
| 8 | +++ ipkg-utils/ipkg.py 2007-05-26 23:49:23.000000000 +0100 | ||
| 9 | @@ -152,9 +152,9 @@ class Package: | ||
| 10 | self.filename = os.path.basename(fn) | ||
| 11 | ## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,)) | ||
| 12 | if self.isdeb: | ||
| 13 | - control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - '*control'","r") | ||
| 14 | + control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r") | ||
| 15 | else: | ||
| 16 | - control = os.popen("tar xfzO "+fn+" '*control.tar.gz' | tar xfzO - '*control'","r") | ||
| 17 | + control = os.popen("tar xfzO "+fn+" 'control.tar.gz' | tar xfzO - './control'","r") | ||
| 18 | line = control.readline() | ||
| 19 | while 1: | ||
| 20 | if not line: break | ||
diff --git a/meta/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/meta/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb deleted file mode 100644 index c089796ccb..0000000000 --- a/meta/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | DESCRIPTION = "Itsy Package Manager utilities" | ||
| 2 | SECTION = "base" | ||
| 3 | PRIORITY = "optional" | ||
| 4 | LICENSE = "GPL" | ||
| 5 | CONFLICTS = "ipkg-link" | ||
| 6 | RDEPENDS = "python" | ||
| 7 | SRCDATE = "20050404" | ||
| 8 | PR = "r17" | ||
| 9 | |||
| 10 | SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ | ||
| 11 | file://ipkg-utils-fix.patch;patch=1 \ | ||
| 12 | file://ipkg-py-sane-vercompare.patch;patch=1 \ | ||
| 13 | file://ipkg-py-tarfile.patch;patch=1 \ | ||
| 14 | file://ipkg-make-index-track-stamps.patch;patch=1 \ | ||
| 15 | file://fields_tweaks.patch;patch=1 " | ||
| 16 | |||
| 17 | S = "${WORKDIR}/ipkg-utils" | ||
| 18 | |||
| 19 | INSTALL = "ipkg-build ipkg-deb-unbuild ipkg-unbuild ipkg-compare-versions ipkg-upload ipkg-make-index ipkg-link ipkg.py ipkg-list-fields" | ||
| 20 | |||
| 21 | do_compile() { | ||
| 22 | oe_runmake ipkg-compare-versions | ||
| 23 | } | ||
| 24 | |||
| 25 | do_install() { | ||
| 26 | install -d ${D}${bindir} | ||
| 27 | for i in ${INSTALL} | ||
| 28 | do | ||
| 29 | install -m 0755 $i ${D}${bindir} | ||
| 30 | done | ||
| 31 | } | ||
| 32 | |||
