diff options
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/rootfs.py | 19 | ||||
| -rw-r--r-- | meta/lib/oe/sdk.py | 18 |
2 files changed, 22 insertions, 15 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 30a1321db1..0e6c8bc2f0 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -709,28 +709,17 @@ def create_rootfs(d, manifest_dir=None): os.environ.update(env_bkp) -def list_installed_packages(d, format=None, rootfs_dir=None): +def image_list_installed_packages(d, format=None, rootfs_dir=None): if not rootfs_dir: rootfs_dir = d.getVar('IMAGE_ROOTFS', True) img_type = d.getVar('IMAGE_PKGTYPE', True) if img_type == "rpm": - return RpmPM(d, - rootfs_dir, - d.getVar('TARGET_VENDOR', True) - ).list_installed(format) + return RpmPkgsList(d, rootfs_dir).list(format) elif img_type == "ipk": - return OpkgPM(d, - rootfs_dir, - d.getVar("IPKGCONF_TARGET", True), - d.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True) - ).list_installed(format) + return OpkgPkgsList(d, rootfs_dir, d.getVar("IPKGCONF_TARGET", True)).list(format) elif img_type == "deb": - return DpkgPM(d, - rootfs_dir, - d.getVar('PACKAGE_ARCHS', True), - d.getVar('DPKG_ARCH', True) - ).list_installed(format) + return DpkgPkgsList(d, rootfs_dir).list(format) if __name__ == "__main__": """ diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 01a1807160..564319965d 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py @@ -289,6 +289,24 @@ class DpkgSdk(Sdk): bb.utils.remove(os.path.join(self.sdk_output, "var"), True) +def sdk_list_installed_packages(d, target, format=None, rootfs_dir=None): + if rootfs_dir is None: + sdk_output = d.getVar('SDK_OUTPUT', True) + target_path = d.getVar('SDKTARGETSYSROOT', True).strip('/') + + rootfs_dir = [sdk_output, os.path.join(sdk_output, target_path)][target is True] + + img_type = d.getVar('IMAGE_PKGTYPE', True) + if img_type == "rpm": + arch_var = ["SDK_PACKAGE_ARCHS", None][target is True] + os_var = ["SDK_OS", None][target is True] + return RpmPkgsList(d, rootfs_dir, arch_var, os_var).list(format) + elif img_type == "ipk": + conf_file_var = ["IPKGCONF_SDK", "IPKGCONF_Target"][target is True] + return OpkgPkgsList(d, rootfs_dir, d.getVar(conf_file_var, True)).list(format) + elif img_type == "deb": + return DpkgPkgsList(d, rootfs_dir).list(format) + def populate_sdk(d, manifest_dir=None): env_bkp = os.environ.copy() |