summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-03-03 11:43:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-05 15:50:20 +0000
commit61b8503f25ede654f33b44ff08591e3bd4b1c092 (patch)
tree13caa7ac88e274373aa34ae8a8b197dc40cd68d6 /meta/lib/oe
parent1d2a6da852b42a84f73e8e68a21a77dea5baee3e (diff)
downloadpoky-61b8503f25ede654f33b44ff08591e3bd4b1c092.tar.gz
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 12f47c23df8c109676f66d580d666a3147f3b046. [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>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package_manager.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index ff4f1dee03..6c133c37c9 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -368,18 +368,19 @@ class RpmPM(PackageManager):
368 self.ml_os_list['default']) 368 self.ml_os_list['default'])
369 369
370 # List must be prefered to least preferred order 370 # List must be prefered to least preferred order
371 default_platform_extra = set() 371 default_platform_extra = list()
372 platform_extra = set() 372 platform_extra = list()
373 bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or "" 373 bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or ""
374 for mlib in self.ml_os_list: 374 for mlib in self.ml_os_list:
375 for arch in self.ml_prefix_list[mlib]: 375 for arch in self.ml_prefix_list[mlib]:
376 plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib] 376 plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib]
377 if mlib == bbextendvariant: 377 if mlib == bbextendvariant:
378 default_platform_extra.add(plt) 378 if plt not in default_platform_extra:
379 default_platform_extra.append(plt)
379 else: 380 else:
380 platform_extra.add(plt) 381 if plt not in platform_extra:
381 382 platform_extra.append(plt)
382 platform_extra = platform_extra.union(default_platform_extra) 383 platform_extra = default_platform_extra + platform_extra
383 384
384 self._create_configs(platform, platform_extra) 385 self._create_configs(platform, platform_extra)
385 386