mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-05 08:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

rpm: fix for N32 MIPS64

Browse Source 
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>
This commit is contained in:
Robert Yang
2015-11-26 02:35:30 -08:00
committed by Richard Purdie
parent 09b4da6763
commit 39ecdcefbd
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
meta/recipes-devtools/rpm/rpm/rpm-rpmfc.c-fix-for-N32-MIPS64.patch Normal file
View File

@@ -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

1
meta/recipes-devtools/rpm/rpm_5.4+cvs.bb
View File

@@ -111,6 +111,7 @@ SRC_URI = "cvs://anonymous@rpm5.org/cvs;tag=rpm-5_4;module=rpm \
file://rpm-rpmpgp-fix.patch \
file://rpm-disable-Wno-override-init.patch \
file://rpm-realpath.patch \
file://rpm-rpmfc.c-fix-for-N32-MIPS64.patch \
"
# Uncomment the following line to enable platform score debugging

1
meta/recipes-devtools/rpm/rpm_5.4.14.bb
View File

@@ -101,6 +101,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e
file://rpm-opendb-before-verifyscript-to-avoid-null-point.patch \
file://configure.ac-check-for-both-gpg2-and-gpg.patch \
file://0001-define-EM_AARCH64.patch \
file://rpm-rpmfc.c-fix-for-N32-MIPS64.patch \
"
# Uncomment the following line to enable platform score debugging