mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-08 15:29:50 +00:00
Code Issues Projects Releases Wiki Activity

lib/oe/package_manager.py: RpmPM: fix issue with multilib builds

Browse Source 
Use python sets instead of lists, to avoid duplicates. When doing a
multilib build, "smart channel --add" fails because it tries to add
'all' channel twice.

(From OE-Core rev: 730d675090eec5c03e444f0448d96a52035d0bef)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Laurentiu Palcu
2014-02-10 09:32:04 +02:00
committed by Richard Purdie
parent 847591e41a
commit 12f47c23df
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/package_manager.py
+6 -7
View File
@@ -187,19 +187,18 @@ class RpmPM(PackageManager):
self.ml_os_list['default'])
# List must be prefered to least preferred order
default_platform_extra = list()
platform_extra = list()
default_platform_extra = set()
platform_extra = set()
bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or ""
for mlib in self.ml_os_list:
for arch in self.ml_prefix_list[mlib]:
plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib]
if mlib == bbextendvariant:
if plt not in default_platform_extra:
default_platform_extra.append(plt)
default_platform_extra.add(plt)
else:
if plt not in platform_extra:
platform_extra.append(plt)
platform_extra = default_platform_extra + platform_extra
platform_extra.add(plt)
platform_extra = platform_extra.union(default_platform_extra)
self._create_configs(platform, platform_extra)