diff options
Diffstat (limited to 'meta/classes/buildhistory.bbclass')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 2c144abb97..9f1744293a 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -337,18 +337,21 @@ def write_pkghistory(pkginfo, d): | |||
337 | def buildhistory_list_installed(d, rootfs_type="image"): | 337 | def buildhistory_list_installed(d, rootfs_type="image"): |
338 | from oe.rootfs import image_list_installed_packages | 338 | from oe.rootfs import image_list_installed_packages |
339 | from oe.sdk import sdk_list_installed_packages | 339 | from oe.sdk import sdk_list_installed_packages |
340 | from oe.utils import format_pkg_list | ||
340 | 341 | ||
341 | process_list = [('file', 'bh_installed_pkgs.txt'),\ | 342 | process_list = [('file', 'bh_installed_pkgs.txt'),\ |
342 | ('deps', 'bh_installed_pkgs_deps.txt')] | 343 | ('deps', 'bh_installed_pkgs_deps.txt')] |
343 | 344 | ||
345 | if rootfs_type == "image": | ||
346 | pkgs = image_list_installed_packages(d) | ||
347 | else: | ||
348 | pkgs = sdk_list_installed_packages(d, rootfs_type == "sdk_target") | ||
349 | |||
344 | for output_type, output_file in process_list: | 350 | for output_type, output_file in process_list: |
345 | output_file_full = os.path.join(d.getVar('WORKDIR', True), output_file) | 351 | output_file_full = os.path.join(d.getVar('WORKDIR', True), output_file) |
346 | 352 | ||
347 | with open(output_file_full, 'w') as output: | 353 | with open(output_file_full, 'w') as output: |
348 | if rootfs_type == "image": | 354 | output.write(format_pkg_list(pkgs, output_type)) |
349 | output.write(image_list_installed_packages(d, output_type)) | ||
350 | else: | ||
351 | output.write(sdk_list_installed_packages(d, rootfs_type == "sdk_target", output_type)) | ||
352 | 355 | ||
353 | python buildhistory_list_installed_image() { | 356 | python buildhistory_list_installed_image() { |
354 | buildhistory_list_installed(d) | 357 | buildhistory_list_installed(d) |