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:31:03 +0000 |
| commit | a598f6ee369c2a55b080ac7cfc058c1d30c7be2e (patch) | |
| tree | 0da0a7ebaeec57b39f43ae38bb6cfc98a3393344 /meta/recipes-devtools/rpm/rpm | |
| parent | 983a19a65a31b54a6f505181012bd311c28a0ae1 (diff) | |
| download | openembedded-core-contrib-a598f6ee369c2a55b080ac7cfc058c1d30c7be2e.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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 @@ +From 16dc683aa50be9789d1674734b06a8a955ff22ad Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 26 Nov 2015 01:36:40 -0800 +Subject: [PATCH] lib/rpmfc.c: 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). + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + lib/rpmfc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/rpmfc.c b/lib/rpmfc.c +index fde00c7..49779f8 100644 +--- a/lib/rpmfc.c ++++ b/lib/rpmfc.c +@@ -575,7 +575,7 @@ static struct rpmfcTokens_s rpmfcTokens[] = { + { " not stripped", RPMFC_NOTSTRIPPED }, + { " archive", RPMFC_ARCHIVE }, + +- { "MIPS, N32 MIPS32", RPMFC_ELFMIPSN32|RPMFC_INCLUDE }, ++ { "MIPS, N32 MIPS64", RPMFC_ELFMIPSN32|RPMFC_INCLUDE }, + { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, + { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, + +-- +1.7.9.5 + |