diff options
-rw-r--r-- | meta/classes/buildhistory.bbclass | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 0033b5af83..ef4135b1fd 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -311,13 +311,23 @@ def write_pkghistory(pkginfo, d): | |||
311 | if os.path.exists(filevarpath): | 311 | if os.path.exists(filevarpath): |
312 | os.unlink(filevarpath) | 312 | os.unlink(filevarpath) |
313 | 313 | ||
314 | python buildhistory_list_installed() { | ||
315 | from oe.rootfs import list_installed_packages | ||
316 | |||
317 | pkgs_list_file = os.path.join(d.getVar('WORKDIR', True), | ||
318 | "bh_installed_pkgs.txt") | ||
319 | |||
320 | with open(pkgs_list_file, 'w') as pkgs_list: | ||
321 | pkgs_list.write(list_installed_packages(d, 'file')) | ||
322 | } | ||
323 | |||
314 | 324 | ||
315 | buildhistory_get_installed() { | 325 | buildhistory_get_installed() { |
316 | mkdir -p $1 | 326 | mkdir -p $1 |
317 | 327 | ||
318 | # Get list of installed packages | 328 | # Get list of installed packages |
319 | pkgcache="$1/installed-packages.tmp" | 329 | pkgcache="$1/installed-packages.tmp" |
320 | list_installed_packages file | sort > $pkgcache | 330 | cat ${WORKDIR}/bh_installed_pkgs.txt | sort > $pkgcache && rm ${WORKDIR}/bh_installed_pkgs.txt |
321 | 331 | ||
322 | cat $pkgcache | awk '{ print $1 }' > $1/installed-package-names.txt | 332 | cat $pkgcache | awk '{ print $1 }' > $1/installed-package-names.txt |
323 | if [ -s $pkgcache ] ; then | 333 | if [ -s $pkgcache ] ; then |
@@ -452,13 +462,16 @@ END | |||
452 | } | 462 | } |
453 | 463 | ||
454 | # By prepending we get in before the removal of packaging files | 464 | # By prepending we get in before the removal of packaging files |
455 | ROOTFS_POSTPROCESS_COMMAND =+ "buildhistory_get_image_installed ; " | 465 | ROOTFS_POSTPROCESS_COMMAND =+ " buildhistory_list_installed ;\ |
466 | buildhistory_get_image_installed ; " | ||
456 | 467 | ||
457 | IMAGE_POSTPROCESS_COMMAND += " buildhistory_get_imageinfo ; " | 468 | IMAGE_POSTPROCESS_COMMAND += " buildhistory_get_imageinfo ; " |
458 | 469 | ||
459 | # We want these to be the last run so that we get called after complementary package installation | 470 | # We want these to be the last run so that we get called after complementary package installation |
460 | POPULATE_SDK_POST_TARGET_COMMAND_append = "buildhistory_get_sdk_installed_target ; " | 471 | POPULATE_SDK_POST_TARGET_COMMAND_append = " buildhistory_list_installed ;\ |
461 | POPULATE_SDK_POST_HOST_COMMAND_append = "buildhistory_get_sdk_installed_host ; " | 472 | buildhistory_get_sdk_installed_target ; " |
473 | POPULATE_SDK_POST_HOST_COMMAND_append = " buildhistory_list_installed ;\ | ||
474 | buildhistory_get_sdk_installed_host ; " | ||
462 | 475 | ||
463 | SDK_POSTPROCESS_COMMAND += "buildhistory_get_sdkinfo ; " | 476 | SDK_POSTPROCESS_COMMAND += "buildhistory_get_sdkinfo ; " |
464 | 477 | ||