diff options
Diffstat (limited to 'meta/lib/oe/rootfs.py')
| -rw-r--r-- | meta/lib/oe/rootfs.py | 10 |
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 | ||
| 979 | def image_list_installed_packages(d, format=None, rootfs_dir=None): | 979 | def 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 | ||
| 991 | if __name__ == "__main__": | 991 | if __name__ == "__main__": |
| 992 | """ | 992 | """ |
