diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-11-26 02:35:30 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:14 +0000 |
commit | 39ecdcefbd2e4e5a97b50656d490cfc7fb73cb41 (patch) | |
tree | 7adc5e8f9c2169aacb5d28ee5030ca337b55a72b /meta/recipes-devtools/rpm/rpm | |
parent | 09b4da6763652b003ae052fbb15c97115cc096f1 (diff) | |
download | poky-39ecdcefbd2e4e5a97b50656d490cfc7fb73cb41.tar.gz |
rpm: fix for N32 MIPS64
It is 'N32 MIPS64', not 'N32 MIPS32' as command file shows:
$ file image/usr/bin/getent
getent: ELF 32-bit MSB executable, MIPS, N32 MIPS64 [snip]
And "rpm -qp --filecolor" was wrong (it was 1, but should be 4), which
caused multilib installation error.
(From OE-Core rev: a598f6ee369c2a55b080ac7cfc058c1d30c7be2e)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch b/meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch new file mode 100644 index 0000000000..a5165742ff --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 16dc683aa50be9789d1674734b06a8a955ff22ad Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 26 Nov 2015 01:36:40 -0800 | ||
4 | Subject: [PATCH] lib/rpmfc.c: fix for N32 MIPS64 | ||
5 | |||
6 | It is 'N32 MIPS64', not 'N32 MIPS32' as command file shows: | ||
7 | $ file image/usr/bin/getent | ||
8 | getent: ELF 32-bit MSB executable, MIPS, N32 MIPS64 [snip] | ||
9 | |||
10 | And "rpm -qp --filecolor" was wrong (it was 1, but should be 4). | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | lib/rpmfc.c | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/lib/rpmfc.c b/lib/rpmfc.c | ||
20 | index fde00c7..49779f8 100644 | ||
21 | --- a/lib/rpmfc.c | ||
22 | +++ b/lib/rpmfc.c | ||
23 | @@ -575,7 +575,7 @@ static struct rpmfcTokens_s rpmfcTokens[] = { | ||
24 | { " not stripped", RPMFC_NOTSTRIPPED }, | ||
25 | { " archive", RPMFC_ARCHIVE }, | ||
26 | |||
27 | - { "MIPS, N32 MIPS32", RPMFC_ELFMIPSN32|RPMFC_INCLUDE }, | ||
28 | + { "MIPS, N32 MIPS64", RPMFC_ELFMIPSN32|RPMFC_INCLUDE }, | ||
29 | { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, | ||
30 | { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, | ||
31 | |||
32 | -- | ||
33 | 1.7.9.5 | ||
34 | |||