Skip to contentSkip to conversation

populate_sdk_ext: fix working with uninative sstate

PATCH New Ed Bartosh 1 participant 2 messages Jan 4, 2017

lore
Share & tools
lore

Ed Bartosh

author
#0 lore raw

PATCH 1/2 populate_sdk_ext: fix working with uninative sstate

Mapped uninative sstate directories to make ext SDK installer to use them when it's run on systems with gcc version different from gcc version used to build installer.

[YOCTO #10832]

meta/classes/populate_sdk_ext.bbclass +4 -1
index 0812eea..fc9cc22 100644
@@ -308,7 +308,10 @@ python copy_buildsystem () {
             f.write('BB_SETSCENE_ENFORCE_WHITELIST = "%:* *:do_shared_workdir *:do_rm_work"\n\n')
 
             # Hide the config information from bitbake output (since it's fixed within the SDK)
-            f.write('BUILDCFG_HEADER = ""\n')
+            f.write('BUILDCFG_HEADER = ""\n\n')
+
+            # Map gcc-dependent uninative sstate cache for installer usage
+            f.write('SSTATE_MIRRORS = "file://universal/(.*) file://universal-4.9/\\1\\nfile://universal-4.9/(.*) file://universal-4.8/\\1"\n\n')
 
             # Allow additional config through sdk-extra.conf
             fn = bb.cookerdata.findConfigFile('sdk-extra.conf', d)
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 2/2 populate_sdk_ext: whitelist do_package tasks

With enabled SSTATE_MIRRORS sstate code expects mirrors to contain entries for all tasks, which is not the case for ext installer as it uses reduced sstate cache.

Added do_package tasks to BB_SETSCENE_ENFORCE_WHITELIST to prevent installer failing with ERROR: Sstate artifact unavailable

[YOCTO #10832]

meta/classes/populate_sdk_ext.bbclass +1 -1
index fc9cc22..d1b3fb4 100644
@@ -305,7 +305,7 @@ python copy_buildsystem () {
             f.write('SIGGEN_LOCKEDSIGS_TASKSIG_CHECK = "warn"\n\n')
 
             # Set up whitelist for run on install
-            f.write('BB_SETSCENE_ENFORCE_WHITELIST = "%:* *:do_shared_workdir *:do_rm_work"\n\n')
+            f.write('BB_SETSCENE_ENFORCE_WHITELIST = "%:* *:do_shared_workdir *:do_rm_work *:do_package"\n\n')
 
             # Hide the config information from bitbake output (since it's fixed within the SDK)
             f.write('BUILDCFG_HEADER = ""\n\n')
Signature · 1 line
2.1.4