summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/package_manager.py16
-rw-r--r--meta/lib/oe/rootfs.py3
2 files changed, 18 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 5444422305..a0984c404b 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -821,6 +821,22 @@ class RpmPM(PackageManager):
821 self._invoke_smart('config --set rpm-extra-macros._var=%s' % 821 self._invoke_smart('config --set rpm-extra-macros._var=%s' %
822 self.d.getVar('localstatedir', True)) 822 self.d.getVar('localstatedir', True))
823 cmd = 'config --set rpm-extra-macros._tmppath=/install/tmp' 823 cmd = 'config --set rpm-extra-macros._tmppath=/install/tmp'
824
825 prefer_color = self.d.getVar('RPM_PREFER_COLOR', True)
826 if prefer_color:
827 if prefer_color not in ['0', '1', '2', '3']:
828 bb.fatal("Invalid RPM_PREFER_COLOR: %s, it should be one of:\n"
829 "\t1: ELF32 wins\n"
830 "\t2: ELF64 wins\n"
831 "\t3: ELF64 N32 wins (mips64 or mips64el only)" %
832 prefer_color)
833 if prefer_color == "3" and self.d.getVar("TUNE_ARCH", True) not in \
834 ['mips64', 'mips64el']:
835 bb.fatal("RPM_PREFER_COLOR = \"3\" is for mips64 or mips64el "
836 "only.")
837 self._invoke_smart('config --set rpm-extra-macros._prefer_color=%s'
838 % prefer_color)
839
824 self._invoke_smart(cmd) 840 self._invoke_smart(cmd)
825 841
826 # Write common configuration for host and target usage 842 # Write common configuration for host and target usage
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 90a98b456c..0424a01aa5 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -329,7 +329,8 @@ class RpmRootfs(Rootfs):
329 329
330 @staticmethod 330 @staticmethod
331 def _depends_list(): 331 def _depends_list():
332 return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS', 'RPM_POSTPROCESS_COMMANDS'] 332 return ['DEPLOY_DIR_RPM', 'INC_RPM_IMAGE_GEN', 'RPM_PREPROCESS_COMMANDS',
333 'RPM_POSTPROCESS_COMMANDS', 'RPM_PREFER_COLOR']
333 334
334 def _get_delayed_postinsts(self): 335 def _get_delayed_postinsts(self):
335 postinst_dir = self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts") 336 postinst_dir = self.d.expand("${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts")