summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib')
-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 a1ac6eb5fd..b3b3b2de80 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -819,17 +819,17 @@ class RpmPM(PackageManager):
819 self.d.getVar('localstatedir', True)) 819 self.d.getVar('localstatedir', True))
820 cmd = 'config --set rpm-extra-macros._tmppath=/install/tmp' 820 cmd = 'config --set rpm-extra-macros._tmppath=/install/tmp'
821 821
822 prefer_color = self.d.getVar('RPM_PREFER_COLOR', True) 822 prefer_color = self.d.getVar('RPM_PREFER_ELF_ARCH', True)
823 if prefer_color: 823 if prefer_color:
824 if prefer_color not in ['0', '1', '2', '3']: 824 if prefer_color not in ['0', '1', '2', '4']:
825 bb.fatal("Invalid RPM_PREFER_COLOR: %s, it should be one of:\n" 825 bb.fatal("Invalid RPM_PREFER_ELF_ARCH: %s, it should be one of:\n"
826 "\t1: ELF32 wins\n" 826 "\t1: ELF32 wins\n"
827 "\t2: ELF64 wins\n" 827 "\t2: ELF64 wins\n"
828 "\t3: ELF64 N32 wins (mips64 or mips64el only)" % 828 "\t4: ELF64 N32 wins (mips64 or mips64el only)" %
829 prefer_color) 829 prefer_color)
830 if prefer_color == "3" and self.d.getVar("TUNE_ARCH", True) not in \ 830 if prefer_color == "4" and self.d.getVar("TUNE_ARCH", True) not in \
831 ['mips64', 'mips64el']: 831 ['mips64', 'mips64el']:
832 bb.fatal("RPM_PREFER_COLOR = \"3\" is for mips64 or mips64el " 832 bb.fatal("RPM_PREFER_ELF_ARCH = \"4\" is for mips64 or mips64el "
833 "only.") 833 "only.")
834 self._invoke_smart('config --set rpm-extra-macros._prefer_color=%s' 834 self._invoke_smart('config --set rpm-extra-macros._prefer_color=%s'
835 % prefer_color) 835 % prefer_color)
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 0424a01aa5..3d8ae81e6f 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -330,7 +330,7 @@ class RpmRootfs(Rootfs):
330 @staticmethod 330 @staticmethod
331 def _depends_list(): 331 def _depends_list():
332 return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS', 332 return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS',
333 'RPM_POSTPROCESS_COMMANDS', 'RPM_PREFER_COLOR'] 333 'RPM_POSTPROCESS_COMMANDS', 'RPM_PREFER_ELF_ARCH']
334 334
335 def _get_delayed_postinsts(self): 335 def _get_delayed_postinsts(self):
336 postinst_dir = self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts") 336 postinst_dir = self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts")