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.

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 0adb5da..53a5c22 100644 (file)
--- 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 02f30c1..10fdbe3 100644 (file)
--- 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 40bef90..7ffecb5 100644 (file)
--- 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 \