diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-06-11 16:38:22 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-18 11:07:58 +0100 |
commit | 4699d29ac2a1a8607970638df9cf6478b1c02331 (patch) | |
tree | b580b6c62475011d6e1710e65d935235cbd679e9 /meta/lib/oe/sdk.py | |
parent | bdfca89b8025dd1fe7c09445c178993dfa9cdab9 (diff) | |
download | poky-4699d29ac2a1a8607970638df9cf6478b1c02331.tar.gz |
package_manager.py: rework postinst_intercept failures
Previously a warning was printed regardless of context and nature
of the failure, and because it was only a warning, it was mostly ignored.
Now, the following is considered when a failure happens:
1) whether we are installing packages into a target image, or populating
a SDK with host or target packages.
2) whether the failure was due to qemu not supporting the target machine.
Accordingly, warnings, notes, and failures are printed, and postponing
to first boot happens if possible.
(From OE-Core rev: a335e78672b1e1ae3ea6427f6a805218e513bb52)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/sdk.py')
-rw-r--r-- | meta/lib/oe/sdk.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index d6a503372a..0d39ea8a91 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py | |||
@@ -209,7 +209,7 @@ class RpmSdk(Sdk): | |||
209 | 209 | ||
210 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) | 210 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) |
211 | 211 | ||
212 | self.target_pm.run_intercepts() | 212 | self.target_pm.run_intercepts(populate_sdk='target') |
213 | 213 | ||
214 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND")) | 214 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND")) |
215 | 215 | ||
@@ -220,7 +220,7 @@ class RpmSdk(Sdk): | |||
220 | self._populate_sysroot(self.host_pm, self.host_manifest) | 220 | self._populate_sysroot(self.host_pm, self.host_manifest) |
221 | self.install_locales(self.host_pm) | 221 | self.install_locales(self.host_pm) |
222 | 222 | ||
223 | self.host_pm.run_intercepts() | 223 | self.host_pm.run_intercepts(populate_sdk='host') |
224 | 224 | ||
225 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) | 225 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) |
226 | 226 | ||
@@ -297,7 +297,7 @@ class OpkgSdk(Sdk): | |||
297 | 297 | ||
298 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) | 298 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) |
299 | 299 | ||
300 | self.target_pm.run_intercepts() | 300 | self.target_pm.run_intercepts(populate_sdk='target') |
301 | 301 | ||
302 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND")) | 302 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND")) |
303 | 303 | ||
@@ -308,7 +308,7 @@ class OpkgSdk(Sdk): | |||
308 | self._populate_sysroot(self.host_pm, self.host_manifest) | 308 | self._populate_sysroot(self.host_pm, self.host_manifest) |
309 | self.install_locales(self.host_pm) | 309 | self.install_locales(self.host_pm) |
310 | 310 | ||
311 | self.host_pm.run_intercepts() | 311 | self.host_pm.run_intercepts(populate_sdk='host') |
312 | 312 | ||
313 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) | 313 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) |
314 | 314 | ||
@@ -386,7 +386,7 @@ class DpkgSdk(Sdk): | |||
386 | 386 | ||
387 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) | 387 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) |
388 | 388 | ||
389 | self.target_pm.run_intercepts() | 389 | self.target_pm.run_intercepts(populate_sdk='target') |
390 | 390 | ||
391 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND")) | 391 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND")) |
392 | 392 | ||
@@ -399,7 +399,7 @@ class DpkgSdk(Sdk): | |||
399 | self._populate_sysroot(self.host_pm, self.host_manifest) | 399 | self._populate_sysroot(self.host_pm, self.host_manifest) |
400 | self.install_locales(self.host_pm) | 400 | self.install_locales(self.host_pm) |
401 | 401 | ||
402 | self.host_pm.run_intercepts() | 402 | self.host_pm.run_intercepts(populate_sdk='host') |
403 | 403 | ||
404 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) | 404 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) |
405 | 405 | ||