Explorar el Código

sstate: Fixes for eSDK generation after zstd switch

(From OE-Core rev: f5a90df08631117cd66bec68cb1851db96822bb8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Richard Purdie hace 3 años
padre
commit
b85fd33e7d
Se han modificado 2 ficheros con 2 adiciones y 3 borrados
  1. 1 1
      meta/classes/populate_sdk_ext.bbclass
  2. 1 2
      scripts/gen-lockedsig-cache

+ 1 - 1
meta/classes/populate_sdk_ext.bbclass

@@ -550,7 +550,7 @@ python copy_buildsystem () {
     # We don't need sstate do_package files
     for root, dirs, files in os.walk(sstate_out):
         for name in files:
-            if name.endswith("_package.tgz"):
+            if name.endswith("_package.tar.zst"):
                 f = os.path.join(root, name)
                 os.remove(f)
 

+ 1 - 2
scripts/gen-lockedsig-cache

@@ -94,8 +94,7 @@ print("Gathering file list took %.1fs" % elapsed)
 print('Processing files')
 for f in files:
     sys.stdout.write('Processing %s... ' % f)
-    _, ext = os.path.splitext(f)
-    if not ext in ['.tgz', '.siginfo', '.sig']:
+    if not f.endswith(('.tar.zst', '.siginfo', '.sig')):
         # Most likely a temp file, skip it
         print('skipping')
         continue