diff options
Diffstat (limited to 'meta/lib/oe/sdk.py')
| -rw-r--r-- | meta/lib/oe/sdk.py | 30 |
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): pm.update() - pkgs = [] - pkgs_attempt = [] - for pkg_type in pkgs_to_install: - if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY: - pkgs_attempt += pkgs_to_install[pkg_type] - else: - pkgs += pkgs_to_install[pkg_type] - - pm.install(pkgs) - - pm.install(pkgs_attempt, True) + for pkg_type in self.install_order: + if pkg_type in pkgs_to_install: + pm.install(pkgs_to_install[pkg_type], + [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY]) def _populate(self): bb.note("Installing TARGET packages") @@ -306,17 +299,10 @@ class DpkgSdk(Sdk): pm.write_index() pm.update() - pkgs = [] - pkgs_attempt = [] - for pkg_type in pkgs_to_install: - if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY: - pkgs_attempt += pkgs_to_install[pkg_type] - else: - pkgs += pkgs_to_install[pkg_type] - - pm.install(pkgs) - - pm.install(pkgs_attempt, True) + for pkg_type in self.install_order: + if pkg_type in pkgs_to_install: + pm.install(pkgs_to_install[pkg_type], + [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY]) def _populate(self): bb.note("Installing TARGET packages") |