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