MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

package_manager.py: use RPM_PREFER_ELF_ARCH

Browse Source 
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.

(From OE-Core rev: 8dcfa7143a6690455c3bd5772621f142f2d9e559)

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>
This commit is contained in:
Robert Yang 2014-09-08 12:58:26 +01:00 committed by Richard Purdie
parent 124ad80870
commit d06839e7dd
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta/lib/oe/package_manager.py
View File

@ -819,17 +819,17 @@ class RpmPM(PackageManager):
self.d.getVar('localstatedir', True)) self.d.getVar('localstatedir', True))
cmd = 'config --set rpm-extra-macros._tmppath=/install/tmp' 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:
if prefer_color not in ['0', '1', '2', '3']: if prefer_color not in ['0', '1', '2', '4']:
bb.fatal("Invalid RPM_PREFER_COLOR: %s, it should be one of:\n" bb.fatal("Invalid RPM_PREFER_ELF_ARCH: %s, it should be one of:\n"
"\t1: ELF32 wins\n" "\t1: ELF32 wins\n"
"\t2: ELF64 wins\n" "\t2: ELF64 wins\n"
"\t3: ELF64 N32 wins (mips64 or mips64el only)" % "\t4: ELF64 N32 wins (mips64 or mips64el only)" %
prefer_color) 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']: ['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.") "only.")
self._invoke_smart('config --set rpm-extra-macros._prefer_color=%s' self._invoke_smart('config --set rpm-extra-macros._prefer_color=%s'
% prefer_color) % prefer_color)

2
meta/lib/oe/rootfs.py
View File

@ -330,7 +330,7 @@ class RpmRootfs(Rootfs):
@staticmethod @staticmethod
def _depends_list(): def _depends_list():
return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS', 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): def _get_delayed_postinsts(self):
postinst_dir = self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts") postinst_dir = self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts")