diff options
Diffstat (limited to 'meta/classes/populate_sdk_ext.bbclass')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 71686bc993..1bdfd92847 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -117,7 +117,7 @@ python write_host_sdk_ext_manifest () { | |||
117 | f.write("%s %s %s\n" % (info[1], info[2], info[3])) | 117 | f.write("%s %s %s\n" % (info[1], info[2], info[3])) |
118 | } | 118 | } |
119 | 119 | ||
120 | SDK_POSTPROCESS_COMMAND_append_task-populate-sdk-ext = "write_target_sdk_ext_manifest; write_host_sdk_ext_manifest; " | 120 | SDK_POSTPROCESS_COMMAND_append_task-populate-sdk-ext = " write_target_sdk_ext_manifest; write_host_sdk_ext_manifest; " |
121 | 121 | ||
122 | SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME') or d.getVar('DISTRO')} Extensible SDK" | 122 | SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME') or d.getVar('DISTRO')} Extensible SDK" |
123 | 123 | ||
@@ -247,7 +247,9 @@ python copy_buildsystem () { | |||
247 | 247 | ||
248 | # Create a layer for new recipes / appends | 248 | # Create a layer for new recipes / appends |
249 | bbpath = d.getVar('BBPATH') | 249 | bbpath = d.getVar('BBPATH') |
250 | bb.process.run(['devtool', '--bbpath', bbpath, '--basepath', baseoutpath, 'create-workspace', '--create-only', os.path.join(baseoutpath, 'workspace')]) | 250 | env = os.environ.copy() |
251 | env['PYTHONDONTWRITEBYTECODE'] = '1' | ||
252 | bb.process.run(['devtool', '--bbpath', bbpath, '--basepath', baseoutpath, 'create-workspace', '--create-only', os.path.join(baseoutpath, 'workspace')], env=env) | ||
251 | 253 | ||
252 | # Create bblayers.conf | 254 | # Create bblayers.conf |
253 | bb.utils.mkdirhier(baseoutpath + '/conf') | 255 | bb.utils.mkdirhier(baseoutpath + '/conf') |
@@ -360,6 +362,10 @@ python copy_buildsystem () { | |||
360 | # Hide the config information from bitbake output (since it's fixed within the SDK) | 362 | # Hide the config information from bitbake output (since it's fixed within the SDK) |
361 | f.write('BUILDCFG_HEADER = ""\n\n') | 363 | f.write('BUILDCFG_HEADER = ""\n\n') |
362 | 364 | ||
365 | # Write METADATA_REVISION | ||
366 | # Needs distro override so it can override the value set in the bbclass code (later than local.conf) | ||
367 | f.write('METADATA_REVISION:%s = "%s"\n\n' % (d.getVar('DISTRO'), d.getVar('METADATA_REVISION'))) | ||
368 | |||
363 | f.write('# Provide a flag to indicate we are in the EXT_SDK Context\n') | 369 | f.write('# Provide a flag to indicate we are in the EXT_SDK Context\n') |
364 | f.write('WITHIN_EXT_SDK = "1"\n\n') | 370 | f.write('WITHIN_EXT_SDK = "1"\n\n') |
365 | 371 | ||
@@ -664,7 +670,7 @@ sdk_ext_postinst() { | |||
664 | 670 | ||
665 | # A bit of another hack, but we need this in the path only for devtool | 671 | # A bit of another hack, but we need this in the path only for devtool |
666 | # so put it at the end of $PATH. | 672 | # so put it at the end of $PATH. |
667 | echo "export PATH=$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH" >> $env_setup_script | 673 | echo "export PATH=\"$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH\"" >> $env_setup_script |
668 | 674 | ||
669 | echo "printf 'SDK environment now set up; additionally you may now run devtool to perform development tasks.\nRun devtool --help for further details.\n'" >> $env_setup_script | 675 | echo "printf 'SDK environment now set up; additionally you may now run devtool to perform development tasks.\nRun devtool --help for further details.\n'" >> $env_setup_script |
670 | 676 | ||