diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-03-03 11:43:30 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-05 15:24:05 +0000 |
| commit | 495cce9c9e63484c740aa669facb995b0ef74f85 (patch) | |
| tree | 26eba72ee19182ef4b602087d4d4f768969b92d8 /meta/lib/oe | |
| parent | 4f42aefed6f6edb8d057b204b82e4a05fff2dff0 (diff) | |
| download | openembedded-core-495cce9c9e63484c740aa669facb995b0ef74f85.tar.gz openembedded-core-495cce9c9e63484c740aa669facb995b0ef74f85.tar.bz2 openembedded-core-495cce9c9e63484c740aa669facb995b0ef74f85.zip | |
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]
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.py | 13 |
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): 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) |