summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 717246d383..2004a42a01 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -700,18 +700,19 @@ class RpmPM(PackageManager):
700 arch_list = self.feed_archs.split() 700 arch_list = self.feed_archs.split()
701 else: 701 else:
702 # List must be prefered to least preferred order 702 # List must be prefered to least preferred order
703 default_platform_extra = set() 703 default_platform_extra = list()
704 platform_extra = set() 704 platform_extra = list()
705 bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or "" 705 bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or ""
706 for mlib in self.ml_os_list: 706 for mlib in self.ml_os_list:
707 for arch in self.ml_prefix_list[mlib]: 707 for arch in self.ml_prefix_list[mlib]:
708 plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib] 708 plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib]
709 if mlib == bbextendvariant: 709 if mlib == bbextendvariant:
710 default_platform_extra.add(plt) 710 if plt not in default_platform_extra:
711 default_platform_extra.append(plt)
711 else: 712 else:
712 platform_extra.add(plt) 713 if plt not in platform_extra:
713 714 platform_extra.append(plt)
714 platform_extra = platform_extra.union(default_platform_extra) 715 platform_extra = default_platform_extra + platform_extra
715 716
716 for canonical_arch in platform_extra: 717 for canonical_arch in platform_extra:
717 arch = canonical_arch.split('-')[0] 718 arch = canonical_arch.split('-')[0]