summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-29 14:03:18 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-29 14:03:18 +0000
commit6c11258fb540b1e3f3dba8c9bb0ba18d85d23fe9 (patch)
tree767c0f54b43ae0f628982d048745ece2b51a3bc8
parentd2f5510b56e7f94be951a0f46e81b372e3214ed7 (diff)
downloadpoky-6c11258fb540b1e3f3dba8c9bb0ba18d85d23fe9.tar.gz
ipkg-utils: Fix problems with some versions of tar (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1806 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb2
-rw-r--r--meta/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch7
-rw-r--r--meta/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb2
3 files changed, 7 insertions, 4 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
index a0964d65b3..c57c14333a 100644
--- a/meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/meta/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,7 +1,7 @@
1require ipkg-utils_${PV}.bb 1require ipkg-utils_${PV}.bb
2 2
3RDEPENDS = "" 3RDEPENDS = ""
4PR = "r11" 4PR = "r13"
5 5
6inherit native 6inherit native
7 7
diff --git a/meta/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch b/meta/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
index 94c57f63f2..25eb2cce6f 100644
--- a/meta/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
+++ b/meta/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
@@ -158,7 +158,7 @@ Index: ipkg-utils/ipkg.py
158 158
159 class Version: 159 class Version:
160 """A class for holding parsed package version information.""" 160 """A class for holding parsed package version information."""
161@@ -131,78 +133,58 @@ class Package: 161@@ -131,78 +133,61 @@ class Package:
162 self.section = None 162 self.section = None
163 self.filename_header = None 163 self.filename_header = None
164 self.file_list = [] 164 self.file_list = []
@@ -232,7 +232,10 @@ Index: ipkg-utils/ipkg.py
232+ tarStream = ar.open("control.tar.gz") 232+ tarStream = ar.open("control.tar.gz")
233+ tarf = tarfile.open("control.tar.gz", "r", tarStream) 233+ tarf = tarfile.open("control.tar.gz", "r", tarStream)
234+ 234+
235+ control = tarf.extractfile("control") 235+ try:
236+ control = tarf.extractfile("control")
237+ except KeyError:
238+ control = tarf.extractfile("./control")
236+ self.read_control(control) 239+ self.read_control(control)
237 control.close() 240 control.close()
238- if self.isdeb: 241- if self.isdeb:
diff --git a/meta/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/meta/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index 6ffe6fe679..e8f52b65a4 100644
--- a/meta/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/meta/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
5CONFLICTS = "ipkg-link" 5CONFLICTS = "ipkg-link"
6RDEPENDS = "python" 6RDEPENDS = "python"
7SRCDATE = "20050404" 7SRCDATE = "20050404"
8PR = "r14" 8PR = "r15"
9 9
10SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ 10SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
11 file://ipkg-utils-fix.patch;patch=1 \ 11 file://ipkg-utils-fix.patch;patch=1 \