summaryrefslogtreecommitdiffstats
path: root/meta/classes/buildhistory.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/buildhistory.bbclass')
-rw-r--r--meta/classes/buildhistory.bbclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index eb72955..156324d 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -426,8 +426,8 @@ def buildhistory_list_installed(d, rootfs_type="image"):
426 from oe.sdk import sdk_list_installed_packages 426 from oe.sdk import sdk_list_installed_packages
427 from oe.utils import format_pkg_list 427 from oe.utils import format_pkg_list
428 428
429 process_list = [('file', 'bh_installed_pkgs.txt'),\ 429 process_list = [('file', 'bh_installed_pkgs_%s.txt' % os.getpid()),\
430 ('deps', 'bh_installed_pkgs_deps.txt')] 430 ('deps', 'bh_installed_pkgs_deps_%s.txt' % os.getpid())]
431 431
432 if rootfs_type == "image": 432 if rootfs_type == "image":
433 pkgs = image_list_installed_packages(d) 433 pkgs = image_list_installed_packages(d)
@@ -457,9 +457,10 @@ buildhistory_get_installed() {
457 457
458 # Get list of installed packages 458 # Get list of installed packages
459 pkgcache="$1/installed-packages.tmp" 459 pkgcache="$1/installed-packages.tmp"
460 cat ${WORKDIR}/bh_installed_pkgs.txt | sort > $pkgcache && rm ${WORKDIR}/bh_installed_pkgs.txt 460 cat ${WORKDIR}/bh_installed_pkgs_${PID}.txt | sort > $pkgcache && rm ${WORKDIR}/bh_installed_pkgs_${PID}.txt
461 461
462 cat $pkgcache | awk '{ print $1 }' > $1/installed-package-names.txt 462 cat $pkgcache | awk '{ print $1 }' > $1/installed-package-names.txt
463
463 if [ -s $pkgcache ] ; then 464 if [ -s $pkgcache ] ; then
464 cat $pkgcache | awk '{ print $2 }' | xargs -n1 basename > $1/installed-packages.txt 465 cat $pkgcache | awk '{ print $2 }' | xargs -n1 basename > $1/installed-packages.txt
465 else 466 else
@@ -468,8 +469,8 @@ buildhistory_get_installed() {
468 469
469 # Produce dependency graph 470 # Produce dependency graph
470 # First, quote each name to handle characters that cause issues for dot 471 # First, quote each name to handle characters that cause issues for dot
471 sed 's:\([^| ]*\):"\1":g' ${WORKDIR}/bh_installed_pkgs_deps.txt > $1/depends.tmp && 472 sed 's:\([^| ]*\):"\1":g' ${WORKDIR}/bh_installed_pkgs_deps_${PID}.txt > $1/depends.tmp &&
472 rm ${WORKDIR}/bh_installed_pkgs_deps.txt 473 rm ${WORKDIR}/bh_installed_pkgs_deps_${PID}.txt
473 # Remove lines with rpmlib(...) and config(...) dependencies, change the 474 # Remove lines with rpmlib(...) and config(...) dependencies, change the
474 # delimiter from pipe to "->", set the style for recommend lines and 475 # delimiter from pipe to "->", set the style for recommend lines and
475 # turn versioned dependencies into edge labels. 476 # turn versioned dependencies into edge labels.