aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-09-08 12:58:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-10 11:28:13 +0100
commit8dcfa7143a6690455c3bd5772621f142f2d9e559 (patch)
treebad64fdd2eea8664e10f27f7bc6ca7cd333cbc8c /meta
parent10dfa4ee4e05841be3d3caaa28778aa40b782f97 (diff)
downloadopenembedded-core-contrib-8dcfa7143a6690455c3bd5772621f142f2d9e559.tar.gz
openembedded-core-contrib-8dcfa7143a6690455c3bd5772621f142f2d9e559.tar.bz2
openembedded-core-contrib-8dcfa7143a6690455c3bd5772621f142f2d9e559.zip
package_manager.py: use RPM_PREFER_ELF_ARCH
Use RPM_PREFER_ELF_ARCH to instead of RPM_PREFER_COLOR as rpm upstream suggested, and use "4" to instead of "3" since it is a bit mask (not enumeration), so we need "4" here. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/package_manager.py12
-rw-r--r--meta/lib/oe/rootfs.py2
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index a1ac6eb5fd6..b3b3b2de80a 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -819,17 +819,17 @@ class RpmPM(PackageManager):
self.d.getVar('localstatedir', True))
cmd = 'config --set rpm-extra-macros._tmppath=/install/tmp'
- prefer_color = self.d.getVar('RPM_PREFER_COLOR', True)
+ prefer_color = self.d.getVar('RPM_PREFER_ELF_ARCH', True)
if prefer_color:
- if prefer_color not in ['0', '1', '2', '3']:
- bb.fatal("Invalid RPM_PREFER_COLOR: %s, it should be one of:\n"
+ if prefer_color not in ['0', '1', '2', '4']:
+ bb.fatal("Invalid RPM_PREFER_ELF_ARCH: %s, it should be one of:\n"
"\t1: ELF32 wins\n"
"\t2: ELF64 wins\n"
- "\t3: ELF64 N32 wins (mips64 or mips64el only)" %
+ "\t4: ELF64 N32 wins (mips64 or mips64el only)" %
prefer_color)
- if prefer_color == "3" and self.d.getVar("TUNE_ARCH", True) not in \
+ if prefer_color == "4" and self.d.getVar("TUNE_ARCH", True) not in \
['mips64', 'mips64el']:
- bb.fatal("RPM_PREFER_COLOR = \"3\" is for mips64 or mips64el "
+ bb.fatal("RPM_PREFER_ELF_ARCH = \"4\" is for mips64 or mips64el "
"only.")
self._invoke_smart('config --set rpm-extra-macros._prefer_color=%s'
% prefer_color)
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 0424a01aa5a..3d8ae81e6f8 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -330,7 +330,7 @@ class RpmRootfs(Rootfs):
@staticmethod
def _depends_list():
return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS',
- 'RPM_POSTPROCESS_COMMANDS', 'RPM_PREFER_COLOR']
+ 'RPM_POSTPROCESS_COMMANDS', 'RPM_PREFER_ELF_ARCH']
def _get_delayed_postinsts(self):
postinst_dir = self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts")