diff options
author | Changqing Li <changqing.li@windriver.com> | 2020-05-08 10:30:31 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-09 18:57:21 +0100 |
commit | e9dd7659b4185587994ff9751890d556098fddb1 (patch) | |
tree | d4641b95b8f9eb2e006d560ec2e1726dfb6257c3 | |
parent | 07083caab6f6456114341671744a11e5c0a3267a (diff) | |
download | poky-e9dd7659b4185587994ff9751890d556098fddb1.tar.gz |
lib/oe/package_manager: update default rpm config %_prefer_color
* %_prefer_color is used by rpm to determine which color's ELF file
is preferred to be installed.
Here are file colors:
0 is unknown or other
1 is Elf32
2 is Elf64
4 is MIPS64 n32 (this color is added by oe-core's patch)
if default value set to 7, all colors are preferred color, always
be last-in-wins.
For this scenario, when we have 64bits python3 installed first,
then install 32bits python3 later, 64bits python3 will be overwrited,
and sys.path will point to /usr/lib, not /usr/lib64, this may cause
some python3 modules not work. so fixed by remove setting of default
value 7, and use default value 2 of rpm
* other distro like fedora also use the default %_prefer_color 2
(From OE-Core rev: 56fa74497393a10f751d01c600c1936761e00294)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/package_manager.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index b0660411ea..c055d2b0f7 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -805,8 +805,6 @@ class RpmPM(PackageManager): | |||
805 | open(platformconfdir + "macros", 'w').write("%_transaction_color 7\n") | 805 | open(platformconfdir + "macros", 'w').write("%_transaction_color 7\n") |
806 | if self.d.getVar('RPM_PREFER_ELF_ARCH'): | 806 | if self.d.getVar('RPM_PREFER_ELF_ARCH'): |
807 | open(platformconfdir + "macros", 'a').write("%%_prefer_color %s" % (self.d.getVar('RPM_PREFER_ELF_ARCH'))) | 807 | open(platformconfdir + "macros", 'a').write("%%_prefer_color %s" % (self.d.getVar('RPM_PREFER_ELF_ARCH'))) |
808 | else: | ||
809 | open(platformconfdir + "macros", 'a').write("%_prefer_color 7") | ||
810 | 808 | ||
811 | if self.d.getVar('RPM_SIGN_PACKAGES') == '1': | 809 | if self.d.getVar('RPM_SIGN_PACKAGES') == '1': |
812 | signer = get_signer(self.d, self.d.getVar('RPM_GPG_BACKEND')) | 810 | signer = get_signer(self.d, self.d.getVar('RPM_GPG_BACKEND')) |