summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-27 13:12:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-30 16:55:21 +0100
commite25ee9fe28353b9c53d445a2ff63fc896f2c74f5 (patch)
tree2d20f68a198017157f4539558e4902ef37758680 /meta
parentd80dd1c3f913259a58008a2ed2822b70e6297335 (diff)
downloadpoky-e25ee9fe28353b9c53d445a2ff63fc896f2c74f5.tar.gz
populate_sdk_ext: Fix for hash equiv
Write out the hash equiv cache file into any eSDK so that it doesn't rely on having to call the hash server for the basic data requests. (From OE-Core rev: 05c6842e747261b3350d6325e238429cf8728ca0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass10
1 files changed, 10 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 086f55df0c..9fda1c9e78 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -379,6 +379,11 @@ python copy_buildsystem () {
379 f.write('require conf/locked-sigs.inc\n') 379 f.write('require conf/locked-sigs.inc\n')
380 f.write('require conf/unlocked-sigs.inc\n') 380 f.write('require conf/unlocked-sigs.inc\n')
381 381
382 if os.path.exists(builddir + '/cache/bb_unihashes.dat'):
383 bb.parse.siggen.save_unitaskhashes()
384 bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache'))
385 shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat')
386
382 # Write a templateconf.cfg 387 # Write a templateconf.cfg
383 with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f: 388 with open(baseoutpath + '/conf/templateconf.cfg', 'w') as f:
384 f.write('meta/conf\n') 389 f.write('meta/conf\n')
@@ -440,6 +445,11 @@ python copy_buildsystem () {
440 else: 445 else:
441 tasklistfn = None 446 tasklistfn = None
442 447
448 if os.path.exists(builddir + '/cache/bb_unihashes.dat'):
449 bb.parse.siggen.save_unitaskhashes()
450 bb.utils.mkdirhier(os.path.join(baseoutpath, 'cache'))
451 shutil.copyfile(builddir + '/cache/bb_unihashes.dat', baseoutpath + '/cache/bb_unihashes.dat')
452
443 # Add packagedata if enabled 453 # Add packagedata if enabled
444 if d.getVar('SDK_INCLUDE_PKGDATA') == '1': 454 if d.getVar('SDK_INCLUDE_PKGDATA') == '1':
445 lockedsigs_base = d.getVar('WORKDIR') + '/locked-sigs-base.inc' 455 lockedsigs_base = d.getVar('WORKDIR') + '/locked-sigs-base.inc'