[OE-core] [PATCH 1/1] package_manager.py: fix RPM_PREFER_ELF_ARCH for mips

Robert Yang liezhi.yang at windriver.com
Mon Nov 23 13:41:31 UTC 2015


We can install 64 bit pkg to 32 bit pkg, so the previous checking is
incorrect, it should not only check mips64 or mips64el, the "mips"
should work, and 64bit ELF can also use mips as TUNE_ARCH, and there
are other mips varieties, so only check whether TUNE_ARCH starts with
mips or not.

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
 meta/lib/oe/package_manager.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 964fddc..5e7bb66 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -954,12 +954,11 @@ class RpmPM(PackageManager):
                 bb.fatal("Invalid RPM_PREFER_ELF_ARCH: %s, it should be one of:\n"
                         "\t1: ELF32 wins\n"
                         "\t2: ELF64 wins\n"
-                        "\t4: ELF64 N32 wins (mips64 or mips64el only)" %
+                        "\t4: ELF64 N32 wins (mips only)" %
                         prefer_color)
-            if prefer_color == "4" and self.d.getVar("TUNE_ARCH", True) not in \
-                                    ['mips64', 'mips64el']:
-                bb.fatal("RPM_PREFER_ELF_ARCH = \"4\" is for mips64 or mips64el "
-                         "only.")
+            if prefer_color == "4" and not \
+                    self.d.getVar("TUNE_ARCH", True).startswith('mips'):
+                bb.fatal("RPM_PREFER_ELF_ARCH = \"4\" is for mips only.")
             self._invoke_smart('config --set rpm-extra-macros._prefer_color=%s'
                         % prefer_color)
 
-- 
1.7.9.5




More information about the Openembedded-core mailing list