rootfs.py, sdk.py: adjust/create the wrappers for creating installed packages list
Since we created a new PkgsList object that will deal with listing the installed packages in a rootfs, use the new class both for images and SDKs in the wrapper functions. The old list_installed_packages() wrapper listed only the packages inside an image rootfs. It didn't deal with target/host SDK rootfs's. (From OE-Core rev: 8fc18e67504db5b6df3fdd239c6187a71af52656) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
d91e35640d
commit
483d5a4f31
|
@ -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__":
|
||||
"""
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
Loading…
Reference in New Issue