buildhistory: use pid for temporary txt file name

buildhistory create .txt file bh_installed_pkgs.txt and
bh_installed_pkgs_deps.txt while listing down installed package.
These file is later removed in buildhistory_get_installed().

when multiple process runs in parellal there are chances to race for
the file where one process created the file while another task remove
the file right after it.

using different file name for each process should avoid the race. So
add PID to the file name to make it unique.

[yocto #13709]

(From OE-Core rev: 214d236d93700abffa2d586cc744a00455818fa4)

Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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"):
     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')]
+    process_list = [('file', 'bh_installed_pkgs_%s.txt' % os.getpid()),\
+                    ('deps', 'bh_installed_pkgs_deps_%s.txt' % os.getpid())]
 
     if rootfs_type == "image":
         pkgs = image_list_installed_packages(d)
@@ -460,9 +460,10 @@ buildhistory_get_installed() {
 
         # Get list of installed packages
         pkgcache="$1/installed-packages.tmp"
-        cat ${WORKDIR}/bh_installed_pkgs.txt | sort > $pkgcache && rm ${WORKDIR}/bh_installed_pkgs.txt
+        cat ${WORKDIR}/bh_installed_pkgs_${PID}.txt | sort > $pkgcache && rm ${WORKDIR}/bh_installed_pkgs_${PID}.txt
 
         cat $pkgcache | awk '{ print $1 }' > $1/installed-package-names.txt
+
         if [ -s $pkgcache ] ; then
                 cat $pkgcache | awk '{ print $2 }' | xargs -n1 basename > $1/installed-packages.txt
         else
@@ -471,8 +472,8 @@ buildhistory_get_installed() {
 
         # Produce dependency graph
         # First, quote each name to handle characters that cause issues for dot
-        sed 's:\([^| ]*\):"\1":g' ${WORKDIR}/bh_installed_pkgs_deps.txt > $1/depends.tmp &&
-                rm ${WORKDIR}/bh_installed_pkgs_deps.txt
+        sed 's:\([^| ]*\):"\1":g' ${WORKDIR}/bh_installed_pkgs_deps_${PID}.txt > $1/depends.tmp &&
+                rm ${WORKDIR}/bh_installed_pkgs_deps_${PID}.txt
         # Remove lines with rpmlib(...) and config(...) dependencies, change the
         # delimiter from pipe to "->", set the style for recommend lines and
         # turn versioned dependencies into edge labels.