diff options
Diffstat (limited to 'meta/lib/oe/package_manager/rpm/sdk.py')
-rw-r--r-- | meta/lib/oe/package_manager/rpm/sdk.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager/rpm/sdk.py b/meta/lib/oe/package_manager/rpm/sdk.py index c5f232431f..ea79fe050b 100644 --- a/meta/lib/oe/package_manager/rpm/sdk.py +++ b/meta/lib/oe/package_manager/rpm/sdk.py | |||
@@ -1,4 +1,6 @@ | |||
1 | # | 1 | # |
2 | # Copyright OpenEmbedded Contributors | ||
3 | # | ||
2 | # SPDX-License-Identifier: GPL-2.0-only | 4 | # SPDX-License-Identifier: GPL-2.0-only |
3 | # | 5 | # |
4 | 6 | ||
@@ -65,7 +67,12 @@ class PkgSdk(Sdk): | |||
65 | 67 | ||
66 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) | 68 | self.target_pm.install_complementary(self.d.getVar('SDKIMAGE_INSTALL_COMPLEMENTARY')) |
67 | 69 | ||
70 | env_bkp = os.environ.copy() | ||
71 | os.environ['PATH'] = self.d.expand("${COREBASE}/scripts/nativesdk-intercept") + \ | ||
72 | os.pathsep + os.environ["PATH"] | ||
73 | |||
68 | self.target_pm.run_intercepts(populate_sdk='target') | 74 | self.target_pm.run_intercepts(populate_sdk='target') |
75 | os.environ.update(env_bkp) | ||
69 | 76 | ||
70 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND")) | 77 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_TARGET_COMMAND")) |
71 | 78 | ||
@@ -110,5 +117,6 @@ class PkgSdk(Sdk): | |||
110 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "rpm*")): | 117 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "rpm*")): |
111 | self.movefile(f, native_sysconf_dir) | 118 | self.movefile(f, native_sysconf_dir) |
112 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "dnf", "*")): | 119 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "dnf", "*")): |
113 | self.movefile(f, native_sysconf_dir) | 120 | self.mkdirhier(native_sysconf_dir + "/dnf") |
121 | self.movefile(f, native_sysconf_dir + "/dnf") | ||
114 | self.remove(os.path.join(self.sdk_output, "etc"), True) | 122 | self.remove(os.path.join(self.sdk_output, "etc"), True) |