summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-08-28 08:41:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 16:53:07 +0100
commita259fdb296a43b89028edb342ca9967a1b50ab5d (patch)
tree7c18709e9952ae2561f0efb3fbbd86483d09363a /meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
parent55997cbf3d4778083dd1073f415fc4396d86f0a0 (diff)
downloadpoky-a259fdb296a43b89028edb342ca9967a1b50ab5d.tar.gz
opkg-utils: bump SRCREV for Packages cache fix and other fixes
(From OE-Core rev: ce5b46980f35097bd5fcc8195c5d5be1b980c870) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch')
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
deleted file mode 100644
index b679f8b970..0000000000
--- a/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From: Scott Anderson <o2e@saaworld.com>
2Subject: ipkg-utils: Make arfile.py handle six digit UIDs
3
4 Essentially, the problem is that arfile.py is splitting the ar header with
5 white-space instead of fixed-width fields, so two fields would get treated
6 as a single field. This makes things better than before as it now honors
7 the fixed field widths.
8
9Upstream-Status: Pending (there is no upstream after openmoko imploded)
10
11--- ipkg-utils/arfile.py.orig 2010-09-29 13:38:15.000000000 -0700
12+++ ipkg-utils/arfile.py 2010-10-01 16:06:00.000000000 -0700
13@@ -74,7 +74,12 @@
14 if l == "\n":
15 l = self.f.readline()
16 if not l: break
17 l = l.replace('`', '')
18- descriptor = l.split()
19+ # Field lengths from /usr/include/ar.h:
20+ ar_field_lens = [ 16, 12, 6, 6, 8, 10, 2 ]
21+ descriptor = []
22+ for field_len in ar_field_lens:
23+ descriptor.append(l[:field_len].strip())
24+ l = l[field_len:]
25 # print descriptor
26 size = int(descriptor[5])
27 memberName = descriptor[0][:-1]