diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-11-26 02:05:17 -0800 |
---|---|---|
committer | Robert Yang <liezhi.yang@windriver.com> | 2015-11-26 17:28:13 -0800 |
commit | b817f6b15376e9fc95c6ab50c6dae825a6c81ce6 (patch) | |
tree | c335d989d0b0bbf8f4f4b8e87275fe70c44a21b3 /meta/recipes-devtools/rpm/rpm | |
parent | 80b3974081c4a8c604e23982a6db8fb32c616058 (diff) | |
download | openembedded-core-contrib-rbt/n32.tar.gz |
rpm: fix for N32 MIPS64rbt/n32
Issue: LIN8-1726
Older versions of 'file' reported it as N32 MIPS32, newer versions are
reporting it as N32 MIPS64. So we should check for both.
$ file image/usr/bin/getent
getent: ELF 32-bit MSB executable, MIPS, N32 MIPS64 [snip]
(LOCAL REV: NOT UPSTREAM) -- Sent to oe-core on 20151126
Signed-off-by: Robert Yang <liezhi.yang@windriver.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 | 33 |
1 files changed, 33 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..99cdf85f54 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch @@ -0,0 +1,33 @@ +From e864ec768ad0736bddcd951b2db8fe12c7b30e4e 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 + +Older versions of 'file' reported it as N32 MIPS32, newer versions are +reporting it as N32 MIPS64. So we should check for both. + +$ file image/usr/bin/getent +getent: ELF 32-bit MSB executable, MIPS, N32 MIPS64 [snip] + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + lib/rpmfc.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/rpmfc.c b/lib/rpmfc.c +index fde00c7..c9c82bf 100644 +--- a/lib/rpmfc.c ++++ b/lib/rpmfc.c +@@ -575,6 +575,7 @@ static struct rpmfcTokens_s rpmfcTokens[] = { + { " not stripped", RPMFC_NOTSTRIPPED }, + { " archive", RPMFC_ARCHIVE }, + ++ { "MIPS, N32 MIPS64", RPMFC_ELFMIPSN32|RPMFC_INCLUDE }, + { "MIPS, N32 MIPS32", RPMFC_ELFMIPSN32|RPMFC_INCLUDE }, + { "ELF 32-bit", RPMFC_ELF32|RPMFC_INCLUDE }, + { "ELF 64-bit", RPMFC_ELF64|RPMFC_INCLUDE }, +-- +1.7.9.5 + |