sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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

Converting a list to a set does not keep the order of the items, as they
were added, which might result in the wrong packages being installed in
the final image...

This reverts commit 12f47c23df.

[YOCTO #5890]

(From OE-Core rev: 495cce9c9e63484c740aa669facb995b0ef74f85)

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-03-03 11:43:30 +02:00 committed by Richard Purdie
parent 1d2a6da852
commit 61b8503f25
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,18 +368,19 @@ class RpmPM(PackageManager):
self.ml_os_list['default'])
# List must be prefered to least preferred order
default_platform_extra = set()
platform_extra = set()
default_platform_extra = list()
platform_extra = list()
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:
default_platform_extra.add(plt)
if plt not in default_platform_extra:
default_platform_extra.append(plt)
else:
platform_extra.add(plt)
platform_extra = platform_extra.union(default_platform_extra)
if plt not in platform_extra:
platform_extra.append(plt)
platform_extra = default_platform_extra + platform_extra
self._create_configs(platform, platform_extra)