diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-05-29 14:03:18 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-05-29 14:03:18 +0000 |
| commit | 6c11258fb540b1e3f3dba8c9bb0ba18d85d23fe9 (patch) | |
| tree | 767c0f54b43ae0f628982d048745ece2b51a3bc8 /meta/packages/ipkg-utils | |
| parent | d2f5510b56e7f94be951a0f46e81b372e3214ed7 (diff) | |
| download | openembedded-core-6c11258fb540b1e3f3dba8c9bb0ba18d85d23fe9.tar.gz openembedded-core-6c11258fb540b1e3f3dba8c9bb0ba18d85d23fe9.tar.bz2 openembedded-core-6c11258fb540b1e3f3dba8c9bb0ba18d85d23fe9.tar.xz openembedded-core-6c11258fb540b1e3f3dba8c9bb0ba18d85d23fe9.zip | |
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
Diffstat (limited to 'meta/packages/ipkg-utils')
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 a0964d65b..c57c14333 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 @@ require ipkg-utils_${PV}.bb RDEPENDS = "" -PR = "r11" +PR = "r13" inherit native 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 94c57f63f..25eb2cce6 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 class Version: """A class for holding parsed package version information.""" -@@ -131,78 +133,58 @@ class Package: +@@ -131,78 +133,61 @@ class Package: self.section = None self.filename_header = None self.file_list = [] @@ -232,7 +232,10 @@ Index: ipkg-utils/ipkg.py + tarStream = ar.open("control.tar.gz") + tarf = tarfile.open("control.tar.gz", "r", tarStream) + -+ control = tarf.extractfile("control") ++ try: ++ control = tarf.extractfile("control") ++ except KeyError: ++ control = tarf.extractfile("./control") + self.read_control(control) control.close() - 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 6ffe6fe67..e8f52b65a 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" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r14" +PR = "r15" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch;patch=1 \ |