From fa4f0bb849682240ad44cfe2e825aa8d4ba96adb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 22 Jun 2008 16:12:04 +0800 Subject: ipkg-utils: Make it work on fedora 9. "control.tar.gz" got listed as "`control.tar.gz" The root cause is somewhere else in the parser. So this is a workaround that will help to find the right file. opkg on the device should use the proper ar executable and that should be able to extract the right files. --- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb | 2 +- packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch | 2 +- packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') 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 0adb5da265..53a5c225d5 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 = "r19" +PR = "r20" 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 02f30c1504..10fdbe3901 100644 --- a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch +++ b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch @@ -85,7 +85,7 @@ Index: ipkg-utils/arfile.py + memberName = descriptor[0][:-1] + self.directory[memberName] = descriptor + [self.f.tell()] +# print "read:", memberName -+ if memberName == fname: ++ 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) diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index 40bef907c8..7ffecb50ae 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 = "r21" +PR = "r22" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch;patch=1 \ -- cgit v1.2.3