summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-02-10 09:32:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-11 11:53:44 +0000
commit12f47c23df8c109676f66d580d666a3147f3b046 (patch)
tree0905b6aa296d49177e687e977b2ce8952be5a895 /meta/lib/oe
parent847591e41a5906eb416ad6376b8d833c90fedf23 (diff)
downloadpoky-12f47c23df8c109676f66d580d666a3147f3b046.tar.gz
lib/oe/package_manager.py: RpmPM: fix issue with multilib builds
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>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package_manager.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index dfcb0ef783..49b5ac8e75 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -187,19 +187,18 @@ class RpmPM(PackageManager):
187 self.ml_os_list['default']) 187 self.ml_os_list['default'])
188 188
189 # List must be prefered to least preferred order 189 # List must be prefered to least preferred order
190 default_platform_extra = list() 190 default_platform_extra = set()
191 platform_extra = list() 191 platform_extra = set()
192 bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or "" 192 bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or ""
193 for mlib in self.ml_os_list: 193 for mlib in self.ml_os_list:
194 for arch in self.ml_prefix_list[mlib]: 194 for arch in self.ml_prefix_list[mlib]:
195 plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib] 195 plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib]
196 if mlib == bbextendvariant: 196 if mlib == bbextendvariant:
197 if plt not in default_platform_extra: 197 default_platform_extra.add(plt)
198 default_platform_extra.append(plt)
199 else: 198 else:
200 if plt not in platform_extra: 199 platform_extra.add(plt)
201 platform_extra.append(plt) 200
202 platform_extra = default_platform_extra + platform_extra 201 platform_extra = platform_extra.union(default_platform_extra)
203 202
204 self._create_configs(platform, platform_extra) 203 self._create_configs(platform, platform_extra)
205 204