diff options
author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2016-01-18 14:33:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:07:15 +0000 |
commit | 6ebda8e659f678a0f4fe1e970d6f38e5e273f5f7 (patch) | |
tree | 3f3a48a5798b58defdfc9c812705da0bf7fd40fb /meta/lib/oe/sdk.py | |
parent | 03075f671c5425f08669f10f30330c4880c0d60a (diff) | |
download | poky-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/sdk.py')
-rw-r--r-- | meta/lib/oe/sdk.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 6affa4079b..b308aea252 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py | |||
@@ -345,7 +345,7 @@ class DpkgSdk(Sdk): | |||
345 | 345 | ||
346 | 346 | ||
347 | 347 | ||
348 | def sdk_list_installed_packages(d, target, format=None, rootfs_dir=None): | 348 | def sdk_list_installed_packages(d, target, rootfs_dir=None): |
349 | if rootfs_dir is None: | 349 | if rootfs_dir is None: |
350 | sdk_output = d.getVar('SDK_OUTPUT', True) | 350 | sdk_output = d.getVar('SDK_OUTPUT', True) |
351 | target_path = d.getVar('SDKTARGETSYSROOT', True).strip('/') | 351 | target_path = d.getVar('SDKTARGETSYSROOT', True).strip('/') |
@@ -356,12 +356,12 @@ def sdk_list_installed_packages(d, target, format=None, rootfs_dir=None): | |||
356 | if img_type == "rpm": | 356 | if img_type == "rpm": |
357 | arch_var = ["SDK_PACKAGE_ARCHS", None][target is True] | 357 | arch_var = ["SDK_PACKAGE_ARCHS", None][target is True] |
358 | os_var = ["SDK_OS", None][target is True] | 358 | os_var = ["SDK_OS", None][target is True] |
359 | return RpmPkgsList(d, rootfs_dir, arch_var, os_var).list(format) | 359 | return RpmPkgsList(d, rootfs_dir, arch_var, os_var).list_pkgs() |
360 | elif img_type == "ipk": | 360 | elif img_type == "ipk": |
361 | conf_file_var = ["IPKGCONF_SDK", "IPKGCONF_TARGET"][target is True] | 361 | conf_file_var = ["IPKGCONF_SDK", "IPKGCONF_TARGET"][target is True] |
362 | return OpkgPkgsList(d, rootfs_dir, d.getVar(conf_file_var, True)).list(format) | 362 | return OpkgPkgsList(d, rootfs_dir, d.getVar(conf_file_var, True)).list_pkgs() |
363 | elif img_type == "deb": | 363 | elif img_type == "deb": |
364 | return DpkgPkgsList(d, rootfs_dir).list(format) | 364 | return DpkgPkgsList(d, rootfs_dir).list_pkgs() |
365 | 365 | ||
366 | def populate_sdk(d, manifest_dir=None): | 366 | def populate_sdk(d, manifest_dir=None): |
367 | env_bkp = os.environ.copy() | 367 | env_bkp = os.environ.copy() |