diff options
| -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): | |||
| 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") |