summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-15 12:54:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-15 12:58:00 +0100
commitb85fd33e7d54644f18b418a142bfd6b15e31d1c3 (patch)
tree8964e5bbeb0771827159e792dcbc7fb5eb8d8798
parent652fdf8719ba5cf2c486bf3d19904b5140dbd0d1 (diff)
downloadpoky-b85fd33e7d54644f18b418a142bfd6b15e31d1c3.tar.gz
sstate: Fixes for eSDK generation after zstd switch
(From OE-Core rev: f5a90df08631117cd66bec68cb1851db96822bb8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
-rwxr-xr-xscripts/gen-lockedsig-cache3
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 35679208bc..9187f53f13 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -550,7 +550,7 @@ python copy_buildsystem () {
550 # We don't need sstate do_package files 550 # We don't need sstate do_package files
551 for root, dirs, files in os.walk(sstate_out): 551 for root, dirs, files in os.walk(sstate_out):
552 for name in files: 552 for name in files:
553 if name.endswith("_package.tgz"): 553 if name.endswith("_package.tar.zst"):
554 f = os.path.join(root, name) 554 f = os.path.join(root, name)
555 os.remove(f) 555 os.remove(f)
556 556
diff --git a/scripts/gen-lockedsig-cache b/scripts/gen-lockedsig-cache
index cd8f9a4356..cc674f9c1b 100755
--- a/scripts/gen-lockedsig-cache
+++ b/scripts/gen-lockedsig-cache
@@ -94,8 +94,7 @@ print("Gathering file list took %.1fs" % elapsed)
94print('Processing files') 94print('Processing files')
95for f in files: 95for f in files:
96 sys.stdout.write('Processing %s... ' % f) 96 sys.stdout.write('Processing %s... ' % f)
97 _, ext = os.path.splitext(f) 97 if not f.endswith(('.tar.zst', '.siginfo', '.sig')):
98 if not ext in ['.tgz', '.siginfo', '.sig']:
99 # Most likely a temp file, skip it 98 # Most likely a temp file, skip it
100 print('skipping') 99 print('skipping')
101 continue 100 continue