diff options
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 3 | ||||
| -rw-r--r-- | meta/lib/oe/sdk.py | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 01960ee4cb..20ba219deb 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
| @@ -262,8 +262,7 @@ populate_sdk_log_check() { | |||
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | def sdk_command_variables(d): | 264 | def sdk_command_variables(d): |
| 265 | return ['OPKG_PREPROCESS_COMMANDS','OPKG_POSTPROCESS_COMMANDS','POPULATE_SDK_POST_HOST_COMMAND','POPULATE_SDK_POST_TARGET_COMMAND','SDK_POSTPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS', | 265 | return ['OPKG_PREPROCESS_COMMANDS','OPKG_POSTPROCESS_COMMANDS','POPULATE_SDK_POST_HOST_COMMAND','POPULATE_SDK_PRE_TARGET_COMMAND','POPULATE_SDK_POST_TARGET_COMMAND','SDK_POSTPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS','RPM_POSTPROCESS_COMMANDS'] |
| 266 | 'RPM_POSTPROCESS_COMMANDS'] | ||
| 267 | 266 | ||
| 268 | def sdk_variables(d): | 267 | def sdk_variables(d): |
| 269 | variables = ['BUILD_IMAGES_FROM_FEEDS','SDK_OS','SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY','SDK_PACKAGE_ARCHS','SDK_OUTPUT', | 268 | variables = ['BUILD_IMAGES_FROM_FEEDS','SDK_OS','SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY','SDK_PACKAGE_ARCHS','SDK_OUTPUT', |
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 1c5409e7e1..30e1fb5316 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py | |||
| @@ -145,6 +145,8 @@ class RpmSdk(Sdk): | |||
| 145 | pm.install(pkgs_attempt, True) | 145 | pm.install(pkgs_attempt, True) |
| 146 | 146 | ||
| 147 | def _populate(self): | 147 | def _populate(self): |
| 148 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_PRE_TARGET_COMMAND")) | ||
| 149 | |||
| 148 | bb.note("Installing TARGET packages") | 150 | bb.note("Installing TARGET packages") |
| 149 | self._populate_sysroot(self.target_pm, self.target_manifest) | 151 | self._populate_sysroot(self.target_pm, self.target_manifest) |
| 150 | 152 | ||
| @@ -226,6 +228,8 @@ class OpkgSdk(Sdk): | |||
| 226 | [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY]) | 228 | [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY]) |
| 227 | 229 | ||
| 228 | def _populate(self): | 230 | def _populate(self): |
| 231 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_PRE_TARGET_COMMAND")) | ||
| 232 | |||
| 229 | bb.note("Installing TARGET packages") | 233 | bb.note("Installing TARGET packages") |
| 230 | self._populate_sysroot(self.target_pm, self.target_manifest) | 234 | self._populate_sysroot(self.target_pm, self.target_manifest) |
| 231 | 235 | ||
| @@ -308,6 +312,8 @@ class DpkgSdk(Sdk): | |||
| 308 | [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY]) | 312 | [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY]) |
| 309 | 313 | ||
| 310 | def _populate(self): | 314 | def _populate(self): |
| 315 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_PRE_TARGET_COMMAND")) | ||
| 316 | |||
| 311 | bb.note("Installing TARGET packages") | 317 | bb.note("Installing TARGET packages") |
| 312 | self._populate_sysroot(self.target_pm, self.target_manifest) | 318 | self._populate_sysroot(self.target_pm, self.target_manifest) |
| 313 | 319 | ||
