diff options
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index f758d9874e..c16e228e7e 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
| @@ -108,9 +108,14 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile, conf_initpath): | |||
| 108 | # Create a temporary build directory that we can pass to the env setup script | 108 | # Create a temporary build directory that we can pass to the env setup script |
| 109 | shutil.copyfile(sdkbasepath + '/conf/local.conf', sdkbasepath + '/conf/local.conf.bak') | 109 | shutil.copyfile(sdkbasepath + '/conf/local.conf', sdkbasepath + '/conf/local.conf.bak') |
| 110 | try: | 110 | try: |
| 111 | # Force the use of sstate from the build system | ||
| 111 | with open(sdkbasepath + '/conf/local.conf', 'a') as f: | 112 | with open(sdkbasepath + '/conf/local.conf', 'a') as f: |
| 112 | f.write('\nSSTATE_DIR_forcevariable = "%s"\n' % d.getVar('SSTATE_DIR', True)) | 113 | f.write('\nSSTATE_DIR_forcevariable = "%s"\n' % d.getVar('SSTATE_DIR', True)) |
| 113 | f.write('SSTATE_MIRRORS_forcevariable = ""\n') | 114 | f.write('SSTATE_MIRRORS_forcevariable = ""\n') |
| 115 | # Drop uninative if the build isn't using it (or else NATIVELSBSTRING will | ||
| 116 | # be different and we won't be able to find our native sstate) | ||
| 117 | if not bb.data.inherits_class('uninative', d): | ||
| 118 | f.write('INHERIT_remove = "uninative"\n') | ||
| 114 | 119 | ||
| 115 | # Unfortunately the default SDKPATH (or even a custom value) may contain characters that bitbake | 120 | # Unfortunately the default SDKPATH (or even a custom value) may contain characters that bitbake |
| 116 | # will not allow in its COREBASE path, so we need to rename the directory temporarily | 121 | # will not allow in its COREBASE path, so we need to rename the directory temporarily |