]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
populate_sdk_ext: Fix second bb_unihashes reference
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 5 Jun 2022 12:23:30 +0000 (13:23 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 6 Jun 2022 11:04:36 +0000 (12:04 +0100)
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>
meta/classes/populate_sdk_ext.bbclass

index 3ddbb46eda44ae49702dc34af403f7e920da02db..d58b2ba5d0d32a6804b7ce0a468c9826af89f677 100644 (file)
@@ -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':