diff options
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/sdk.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index f15fbdb368..f1bbef6f58 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py | |||
| @@ -155,14 +155,16 @@ class RpmSdk(Sdk): | |||
| 155 | 155 | ||
| 156 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND", True)) | 156 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND", True)) |
| 157 | 157 | ||
| 158 | self.target_pm.remove_packaging_data() | 158 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): |
| 159 | self.target_pm.remove_packaging_data() | ||
| 159 | 160 | ||
| 160 | bb.note("Installing NATIVESDK packages") | 161 | bb.note("Installing NATIVESDK packages") |
| 161 | self._populate_sysroot(self.host_pm, self.host_manifest) | 162 | self._populate_sysroot(self.host_pm, self.host_manifest) |
| 162 | 163 | ||
| 163 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) | 164 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) |
| 164 | 165 | ||
| 165 | self.host_pm.remove_packaging_data() | 166 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): |
| 167 | self.host_pm.remove_packaging_data() | ||
| 166 | 168 | ||
| 167 | # Move host RPM library data | 169 | # Move host RPM library data |
| 168 | native_rpm_state_dir = os.path.join(self.sdk_output, | 170 | native_rpm_state_dir = os.path.join(self.sdk_output, |
| @@ -232,14 +234,16 @@ class OpkgSdk(Sdk): | |||
| 232 | 234 | ||
| 233 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND", True)) | 235 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND", True)) |
| 234 | 236 | ||
| 235 | self.target_pm.remove_packaging_data() | 237 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): |
| 238 | self.target_pm.remove_packaging_data() | ||
| 236 | 239 | ||
| 237 | bb.note("Installing NATIVESDK packages") | 240 | bb.note("Installing NATIVESDK packages") |
| 238 | self._populate_sysroot(self.host_pm, self.host_manifest) | 241 | self._populate_sysroot(self.host_pm, self.host_manifest) |
| 239 | 242 | ||
| 240 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) | 243 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) |
| 241 | 244 | ||
| 242 | self.host_pm.remove_packaging_data() | 245 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): |
| 246 | self.host_pm.remove_packaging_data() | ||
| 243 | 247 | ||
| 244 | target_sysconfdir = os.path.join(self.sdk_target_sysroot, self.sysconfdir) | 248 | target_sysconfdir = os.path.join(self.sdk_target_sysroot, self.sysconfdir) |
| 245 | host_sysconfdir = os.path.join(self.sdk_host_sysroot, self.sysconfdir) | 249 | host_sysconfdir = os.path.join(self.sdk_host_sysroot, self.sysconfdir) |
| @@ -314,6 +318,9 @@ class DpkgSdk(Sdk): | |||
| 314 | 318 | ||
| 315 | self._copy_apt_dir_to(os.path.join(self.sdk_target_sysroot, "etc", "apt")) | 319 | self._copy_apt_dir_to(os.path.join(self.sdk_target_sysroot, "etc", "apt")) |
| 316 | 320 | ||
| 321 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): | ||
| 322 | self.target_pm.remove_packaging_data() | ||
| 323 | |||
| 317 | bb.note("Installing NATIVESDK packages") | 324 | bb.note("Installing NATIVESDK packages") |
| 318 | self._populate_sysroot(self.host_pm, self.host_manifest) | 325 | self._populate_sysroot(self.host_pm, self.host_manifest) |
| 319 | 326 | ||
| @@ -322,6 +329,9 @@ class DpkgSdk(Sdk): | |||
| 322 | self._copy_apt_dir_to(os.path.join(self.sdk_output, self.sdk_native_path, | 329 | self._copy_apt_dir_to(os.path.join(self.sdk_output, self.sdk_native_path, |
| 323 | "etc", "apt")) | 330 | "etc", "apt")) |
| 324 | 331 | ||
| 332 | if not bb.utils.contains("SDKIMAGE_FEATURES", "package-management", True, False, self.d): | ||
| 333 | self.host_pm.remove_packaging_data() | ||
| 334 | |||
| 325 | native_dpkg_state_dir = os.path.join(self.sdk_output, self.sdk_native_path, | 335 | native_dpkg_state_dir = os.path.join(self.sdk_output, self.sdk_native_path, |
| 326 | "var", "lib", "dpkg") | 336 | "var", "lib", "dpkg") |
| 327 | self.mkdirhier(native_dpkg_state_dir) | 337 | self.mkdirhier(native_dpkg_state_dir) |