summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@openmoko.org>2008-06-22 16:12:04 +0800
committerJohn Lee <john_lee@openmoko.org>2009-01-05 17:07:03 +0800
commitfa4f0bb849682240ad44cfe2e825aa8d4ba96adb (patch)
treedfba947aef9481f78ddc268f8907d19b787e36cd
parent6a221898b043c0bad8d914fdf1ba9c60a181e184 (diff)
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.
-rw-r--r--packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb2
-rw-r--r--packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch2
-rw-r--r--packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb2
3 files changed, 3 insertions, 3 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 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 \