diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-26 10:47:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-29 11:22:05 +0000 |
commit | f4791847cd22fbb874d471be4abfe5ef5711bd42 (patch) | |
tree | ed4e5a84eefb73a437a19e2acfb66ee5eeffeea3 /meta/recipes-devtools/opkg-utils/opkg-utils | |
parent | 31e998266f8671b330745f29cf1be9931685abb0 (diff) | |
download | poky-f4791847cd22fbb874d471be4abfe5ef5711bd42.tar.gz |
opkg-utils: handle 6 digit UID fields properly
(From OE-Core rev: 529d45a3daaeb60ecee8b15778c3b70d7992cd1f)
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')
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch | 27 |
1 files changed, 27 insertions, 0 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 new file mode 100644 index 0000000000..435e74e863 --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/arfile_header_split.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From: Scott Anderson <o2e@saaworld.com> | ||
2 | Subject: 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 | |||
9 | Upsteam-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] | ||