diff options
Diffstat (limited to 'meta/lib/oe/sdk.py')
-rw-r--r-- | meta/lib/oe/sdk.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index fef02d0777..deb823b6ec 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py | |||
@@ -130,7 +130,6 @@ class RpmSdk(Sdk): | |||
130 | 130 | ||
131 | pm.create_configs() | 131 | pm.create_configs() |
132 | pm.write_index() | 132 | pm.write_index() |
133 | pm.dump_all_available_pkgs() | ||
134 | pm.update() | 133 | pm.update() |
135 | 134 | ||
136 | pkgs = [] | 135 | pkgs = [] |
@@ -188,7 +187,9 @@ class RpmSdk(Sdk): | |||
188 | True).strip('/'), | 187 | True).strip('/'), |
189 | ) | 188 | ) |
190 | self.mkdirhier(native_sysconf_dir) | 189 | self.mkdirhier(native_sysconf_dir) |
191 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "*")): | 190 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "rpm*")): |
191 | self.movefile(f, native_sysconf_dir) | ||
192 | for f in glob.glob(os.path.join(self.sdk_output, "etc", "dnf", "*")): | ||
192 | self.movefile(f, native_sysconf_dir) | 193 | self.movefile(f, native_sysconf_dir) |
193 | self.remove(os.path.join(self.sdk_output, "etc"), True) | 194 | self.remove(os.path.join(self.sdk_output, "etc"), True) |
194 | 195 | ||
@@ -350,7 +351,7 @@ def sdk_list_installed_packages(d, target, rootfs_dir=None): | |||
350 | if img_type == "rpm": | 351 | if img_type == "rpm": |
351 | arch_var = ["SDK_PACKAGE_ARCHS", None][target is True] | 352 | arch_var = ["SDK_PACKAGE_ARCHS", None][target is True] |
352 | os_var = ["SDK_OS", None][target is True] | 353 | os_var = ["SDK_OS", None][target is True] |
353 | return RpmPkgsList(d, rootfs_dir, arch_var, os_var).list_pkgs() | 354 | return RpmPkgsList(d, rootfs_dir).list_pkgs() |
354 | elif img_type == "ipk": | 355 | elif img_type == "ipk": |
355 | conf_file_var = ["IPKGCONF_SDK", "IPKGCONF_TARGET"][target is True] | 356 | conf_file_var = ["IPKGCONF_SDK", "IPKGCONF_TARGET"][target is True] |
356 | return OpkgPkgsList(d, rootfs_dir, d.getVar(conf_file_var)).list_pkgs() | 357 | return OpkgPkgsList(d, rootfs_dir, d.getVar(conf_file_var)).list_pkgs() |