summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/sdk.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-22 13:06:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:34 +0000
commita1c35f302d0c5a708501dc56a5260741e118fb90 (patch)
tree983fa8f09476e87fcca6838f131d25913a6706af /meta/lib/oe/sdk.py
parent29c5edaf46e807d44aab32adc3c1cb1410c87993 (diff)
downloadpoky-a1c35f302d0c5a708501dc56a5260741e118fb90.tar.gz
lib/oe/sdk: Partially revert "sdk.py: fix conflicts of packages"
OE-Core rev: f2b64f725803ad8be7c2876c531e057a4fe5ca7c (poky 1362986886cc96c8cc11fb60795f729b41770414) unintentionally broke opkg/dpkg multilib support within the SDK by making things not honour self.install_order. This reinstates that code for opkg/dpkg but not rpm where the original problem was. (From OE-Core rev: 98b585120137a3db07ed742a8f18223883ad6dc5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/sdk.py')
-rw-r--r--meta/lib/oe/sdk.py30
1 files changed, 8 insertions, 22 deletions
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py
index b308aea252..f15fbdb368 100644
--- a/meta/lib/oe/sdk.py
+++ b/meta/lib/oe/sdk.py
@@ -219,17 +219,10 @@ class OpkgSdk(Sdk):
219 219
220 pm.update() 220 pm.update()
221 221
222 pkgs = [] 222 for pkg_type in self.install_order:
223 pkgs_attempt = [] 223 if pkg_type in pkgs_to_install:
224 for pkg_type in pkgs_to_install: 224 pm.install(pkgs_to_install[pkg_type],
225 if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY: 225 [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY])
226 pkgs_attempt += pkgs_to_install[pkg_type]
227 else:
228 pkgs += pkgs_to_install[pkg_type]
229
230 pm.install(pkgs)
231
232 pm.install(pkgs_attempt, True)
233 226
234 def _populate(self): 227 def _populate(self):
235 bb.note("Installing TARGET packages") 228 bb.note("Installing TARGET packages")
@@ -306,17 +299,10 @@ class DpkgSdk(Sdk):
306 pm.write_index() 299 pm.write_index()
307 pm.update() 300 pm.update()
308 301
309 pkgs = [] 302 for pkg_type in self.install_order:
310 pkgs_attempt = [] 303 if pkg_type in pkgs_to_install:
311 for pkg_type in pkgs_to_install: 304 pm.install(pkgs_to_install[pkg_type],
312 if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY: 305 [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY])
313 pkgs_attempt += pkgs_to_install[pkg_type]
314 else:
315 pkgs += pkgs_to_install[pkg_type]
316
317 pm.install(pkgs)
318
319 pm.install(pkgs_attempt, True)
320 306
321 def _populate(self): 307 def _populate(self):
322 bb.note("Installing TARGET packages") 308 bb.note("Installing TARGET packages")