From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 5 Jun 2022 12:23:30 +0000 (+0100)
Subject: populate_sdk_ext: Fix second bb_unihashes reference
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3949
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=962bd78af1acc86b3d900dce9081ed310616e0fa;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

populate_sdk_ext: Fix second bb_unihashes reference

A previous fix for zero length bb_unihashes.dat files wasn't complete
as there is a second copy of the unihashes file made. Change this second
call site to match the first to fully fix the zero length file issue.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 3ddbb46eda4..d58b2ba5d0d 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -491,10 +491,10 @@ python copy_buildsystem () {
     else:
         tasklistfn = None
 
-    if os.path.exists(builddir + '/cache/bb_unihashes.dat'):
-        bb.parse.siggen.save_unitaskhashes()
-        bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache'))
-        shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat')
+
+    cachedir = os.path.join(baseoutpath, 'cache')
+    bb.utils.mkdirhier(cachedir)
+    bb.parse.siggen.copy_unitaskhashes(cachedir)
 
     # Add packagedata if enabled
     if d.getVar('SDK_INCLUDE_PKGDATA') == '1':