mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
03075f671c
commit
6ebda8e659
@@ -337,18 +337,21 @@ def write_pkghistory(pkginfo, d):
|
||||
def buildhistory_list_installed(d, rootfs_type="image"):
|
||||
from oe.rootfs import image_list_installed_packages
|
||||
from oe.sdk import sdk_list_installed_packages
|
||||
from oe.utils import format_pkg_list
|
||||
|
||||
process_list = [('file', 'bh_installed_pkgs.txt'),\
|
||||
('deps', 'bh_installed_pkgs_deps.txt')]
|
||||
|
||||
if rootfs_type == "image":
|
||||
pkgs = image_list_installed_packages(d)
|
||||
else:
|
||||
pkgs = sdk_list_installed_packages(d, rootfs_type == "sdk_target")
|
||||
|
||||
for output_type, output_file in process_list:
|
||||
output_file_full = os.path.join(d.getVar('WORKDIR', True), output_file)
|
||||
|
||||
with open(output_file_full, 'w') as output:
|
||||
if rootfs_type == "image":
|
||||
output.write(image_list_installed_packages(d, output_type))
|
||||
else:
|
||||
output.write(sdk_list_installed_packages(d, rootfs_type == "sdk_target", output_type))
|
||||
output.write(format_pkg_list(pkgs, output_type))
|
||||
|
||||
python buildhistory_list_installed_image() {
|
||||
buildhistory_list_installed(d)
|
||||
|
||||
Reference in New Issue
Block a user