mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 13:49:49 +00:00
Code Issues Projects Releases Wiki Activity

lib/oe/rootfs: Use list_pkgs() instead of list()

Browse Source 
This patch changes the use list_pkgs() instead of list()
from class RpmPkgsList. The change is in two functions,
image_list_installed_packages from rootfs.py and
sdk_list_installed_packages from sdk.py.

With this change the functions calling the functions
listed above, must format the output as they required.
The formatting can be done using format_pkg_list() from
oe.utils.

The classes calling the afected functions are changed too
with this patch, to keep the same functionality using the
new data structure.

[YOCTO #7427]

(From OE-Core rev: 983ea373362514e5888bd1d7d9c4f136c94b00f2)

Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mariano Lopez
2016-01-18 14:33:06 +00:00
committed by Richard Purdie
parent 03075f671c
commit 6ebda8e659
7 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/rootfs.py
+5 -5
View File
@@ -252,7 +252,7 @@ class Rootfs(object):
# Remove components that we don't need if it's a read-only rootfs
pkgs_installed = image_list_installed_packages(self.d)
pkgs_to_remove = list()
for pkg in pkgs_installed.split():
for pkg in pkgs_installed:
if pkg in ["update-rc.d",
"base-passwd",
"shadow",
@@ -976,17 +976,17 @@ def create_rootfs(d, manifest_dir=None):
os.environ.update(env_bkp)
def image_list_installed_packages(d, format=None, rootfs_dir=None):
def image_list_installed_packages(d, 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 RpmPkgsList(d, rootfs_dir).list(format)
return RpmPkgsList(d, rootfs_dir).list_pkgs()
elif img_type == "ipk":
return OpkgPkgsList(d, rootfs_dir, d.getVar("IPKGCONF_TARGET", True)).list(format)
return OpkgPkgsList(d, rootfs_dir, d.getVar("IPKGCONF_TARGET", True)).list_pkgs()
elif img_type == "deb":
return DpkgPkgsList(d, rootfs_dir).list(format)
return DpkgPkgsList(d, rootfs_dir).list_pkgs()
if __name__ == "__main__":
"""