diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-04-03 18:45:22 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-05 14:49:07 +0100 |
commit | e4b8c2bd20d1472f93c42dff564b5eeb478b1f8f (patch) | |
tree | f0dae15feee574ab1e251f9cd79a6a5b62cf2f01 /meta/lib | |
parent | b897982679b4554b20ce2112d65ed6ee366eaf0f (diff) | |
download | poky-e4b8c2bd20d1472f93c42dff564b5eeb478b1f8f.tar.gz |
sdk.py: run postinst intercepts
Previously this wasn't done, and so any packages installed from
populate_sdk would not have the postinsts fully executed
(particularly generation of various caches via running nativesdk or target
binaries with qemu wasn't working).
[YOCTO #12630]
(From OE-Core rev: a484ff072eea3f47de2c3348048201249cefa46b)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/sdk.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 6cd4115202..d6a503372a 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py | |||
@@ -209,6 +209,8 @@ 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() | ||
213 | |||
212 | 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")) |
213 | 215 | ||
214 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): | 216 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): |
@@ -218,6 +220,8 @@ class RpmSdk(Sdk): | |||
218 | self._populate_sysroot(self.host_pm, self.host_manifest) | 220 | self._populate_sysroot(self.host_pm, self.host_manifest) |
219 | self.install_locales(self.host_pm) | 221 | self.install_locales(self.host_pm) |
220 | 222 | ||
223 | self.host_pm.run_intercepts() | ||
224 | |||
221 | 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")) |
222 | 226 | ||
223 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): | 227 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): |
@@ -293,6 +297,8 @@ class OpkgSdk(Sdk): | |||
293 | 297 | ||
294 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) | 298 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) |
295 | 299 | ||
300 | self.target_pm.run_intercepts() | ||
301 | |||
296 | 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")) |
297 | 303 | ||
298 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): | 304 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): |
@@ -302,6 +308,8 @@ class OpkgSdk(Sdk): | |||
302 | self._populate_sysroot(self.host_pm, self.host_manifest) | 308 | self._populate_sysroot(self.host_pm, self.host_manifest) |
303 | self.install_locales(self.host_pm) | 309 | self.install_locales(self.host_pm) |
304 | 310 | ||
311 | self.host_pm.run_intercepts() | ||
312 | |||
305 | 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")) |
306 | 314 | ||
307 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): | 315 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): |
@@ -378,6 +386,8 @@ class DpkgSdk(Sdk): | |||
378 | 386 | ||
379 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) | 387 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) |
380 | 388 | ||
389 | self.target_pm.run_intercepts() | ||
390 | |||
381 | 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")) |
382 | 392 | ||
383 | self._copy_apt_dir_to(os.path.join(self.sdk_target_sysroot, "etc", "apt")) | 393 | self._copy_apt_dir_to(os.path.join(self.sdk_target_sysroot, "etc", "apt")) |
@@ -389,6 +399,8 @@ class DpkgSdk(Sdk): | |||
389 | self._populate_sysroot(self.host_pm, self.host_manifest) | 399 | self._populate_sysroot(self.host_pm, self.host_manifest) |
390 | self.install_locales(self.host_pm) | 400 | self.install_locales(self.host_pm) |
391 | 401 | ||
402 | self.host_pm.run_intercepts() | ||
403 | |||
392 | 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")) |
393 | 405 | ||
394 | self._copy_apt_dir_to(os.path.join(self.sdk_output, self.sdk_native_path, | 406 | self._copy_apt_dir_to(os.path.join(self.sdk_output, self.sdk_native_path, |