summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/rootfs.py
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2016-01-18 14:33:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-20 17:07:15 +0000
commit6ebda8e659f678a0f4fe1e970d6f38e5e273f5f7 (patch)
tree3f3a48a5798b58defdfc9c812705da0bf7fd40fb /meta/lib/oe/rootfs.py
parent03075f671c5425f08669f10f30330c4880c0d60a (diff)
downloadpoky-6ebda8e659f678a0f4fe1e970d6f38e5e273f5f7.tar.gz
lib/oe/rootfs: Use list_pkgs() instead of list()
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>
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-rw-r--r--meta/lib/oe/rootfs.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index f677d03a12..0e901c2405 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -252,7 +252,7 @@ class Rootfs(object):
252 # Remove components that we don't need if it's a read-only rootfs 252 # Remove components that we don't need if it's a read-only rootfs
253 pkgs_installed = image_list_installed_packages(self.d) 253 pkgs_installed = image_list_installed_packages(self.d)
254 pkgs_to_remove = list() 254 pkgs_to_remove = list()
255 for pkg in pkgs_installed.split(): 255 for pkg in pkgs_installed:
256 if pkg in ["update-rc.d", 256 if pkg in ["update-rc.d",
257 "base-passwd", 257 "base-passwd",
258 "shadow", 258 "shadow",
@@ -976,17 +976,17 @@ def create_rootfs(d, manifest_dir=None):
976 os.environ.update(env_bkp) 976 os.environ.update(env_bkp)
977 977
978 978
979def image_list_installed_packages(d, format=None, rootfs_dir=None): 979def image_list_installed_packages(d, rootfs_dir=None):
980 if not rootfs_dir: 980 if not rootfs_dir:
981 rootfs_dir = d.getVar('IMAGE_ROOTFS', True) 981 rootfs_dir = d.getVar('IMAGE_ROOTFS', True)
982 982
983 img_type = d.getVar('IMAGE_PKGTYPE', True) 983 img_type = d.getVar('IMAGE_PKGTYPE', True)
984 if img_type == "rpm": 984 if img_type == "rpm":
985 return RpmPkgsList(d, rootfs_dir).list(format) 985 return RpmPkgsList(d, rootfs_dir).list_pkgs()
986 elif img_type == "ipk": 986 elif img_type == "ipk":
987 return OpkgPkgsList(d, rootfs_dir, d.getVar("IPKGCONF_TARGET", True)).list(format) 987 return OpkgPkgsList(d, rootfs_dir, d.getVar("IPKGCONF_TARGET", True)).list_pkgs()
988 elif img_type == "deb": 988 elif img_type == "deb":
989 return DpkgPkgsList(d, rootfs_dir).list(format) 989 return DpkgPkgsList(d, rootfs_dir).list_pkgs()
990 990
991if __name__ == "__main__": 991if __name__ == "__main__":
992 """ 992 """