diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb | 2 | ||||
| -rw-r--r-- | packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch | 40 | ||||
| -rw-r--r-- | packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb | 2 |
3 files changed, 24 insertions, 20 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 ff42ba532b..60361f5862 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 = "r17" +PR = "r18" inherit native diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch index 389a86018b..02f30c1504 100644 --- a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch +++ b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch @@ -1,6 +1,7 @@ -diff -r 720080c24d2f arfile.py ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/arfile.py Sun Jan 27 23:26:35 2008 +0200 +Index: ipkg-utils/arfile.py +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ipkg-utils/arfile.py 2008-05-30 15:33:49.000000000 +0100 @@ -0,0 +1,124 @@ +""" +arfile - A module to parse GNU ar archives. @@ -126,10 +127,11 @@ diff -r 720080c24d2f arfile.py + + f2 = tarf.extractfile("control") + print f2.read() -diff -r 720080c24d2f ipkg.py ---- a/ipkg.py Sun Jan 27 23:13:26 2008 +0200 -+++ b/ipkg.py Sun Jan 27 23:26:35 2008 +0200 -@@ -41,6 +41,8 @@ import string +Index: ipkg-utils/ipkg.py +=================================================================== +--- ipkg-utils.orig/ipkg.py 2008-05-30 15:33:49.000000000 +0100 ++++ ipkg-utils/ipkg.py 2008-05-30 15:35:58.000000000 +0100 +@@ -41,6 +41,8 @@ import string import commands from stat import ST_SIZE @@ -138,7 +140,7 @@ diff -r 720080c24d2f ipkg.py class Version: """A class for holding parsed package version information.""" -@@ -131,77 +133,61 @@ class Package: +@@ -131,78 +133,63 @@ self.section = None self.filename_header = None self.file_list = [] @@ -174,9 +176,9 @@ diff -r 720080c24d2f ipkg.py - self.md5 = sum.hexdigest() - else: - self.md5 = string.join(map((lambda x:"%02x" % ord(x)),sum.digest()),'') -- stat = os.stat(fn) + 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: @@ -232,7 +234,7 @@ diff -r 720080c24d2f ipkg.py self.scratch_dir = None self.file_dir = None self.meta_dir = None -+ + + def __getattr__(self, name): + if name == "md5": + self._computeFileMD5() @@ -250,10 +252,11 @@ diff -r 720080c24d2f ipkg.py + sum.update(data) + f.close() + self.md5 = sum.hexdigest() - ++ def read_control(self, control): import os -@@ -221,9 +207,15 @@ class Package: + +@@ -221,9 +208,15 @@ value = value + '\n' + line if name == 'size': self.size = int(value) @@ -270,7 +273,7 @@ diff -r 720080c24d2f ipkg.py return # consumes one blank line at end of package descriptoin else: line = control.readline() -@@ -314,7 +306,27 @@ class Package: +@@ -314,7 +307,27 @@ return self.section def get_file_list(self): @@ -299,10 +302,11 @@ diff -r 720080c24d2f ipkg.py def write_package(self, dirname): buf = self.render_control() -diff -r 720080c24d2f setup.py ---- a/setup.py Sun Jan 27 23:13:26 2008 +0200 -+++ b/setup.py Sun Jan 27 23:26:35 2008 +0200 -@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils +Index: ipkg-utils/setup.py +=================================================================== +--- ipkg-utils.orig/setup.py 2005-03-03 16:40:17.000000000 +0000 ++++ ipkg-utils/setup.py 2008-05-30 15:33:49.000000000 +0100 +@@ -16,6 +16,6 @@ platforms = 'POSIX', keywords = 'ipkg familiar', url = 'http://www.handhelds.org/sources.html/', diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index 4b7471a163..f64e644bd3 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r19" +PR = "r20" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch;patch=1 \ |