populate_sdk_ext: Use new --setscene-only option to bitbake instead of workarounds

Rather than horrible workarounds, use the new --setscene-only option
of bitbake to pre-populate the SDK structures.

(From OE-Core rev: 38237b7ac53c416f85c4a70a61acafc3404c8b5f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2016-01-08 18:26:39 +00:00
parent 1ee08426d7
commit 0269219fbe
2 changed files with 2 additions and 14 deletions

View File

@ -5,16 +5,4 @@
target_sdk_dir="$1"
sdk_targets="$2"
# Avoid actually building images during this phase, but still
# ensure all dependencies are extracted from sstate
# This is a hack, to be sure, but we really don't need to do this here
for sdktarget in $sdk_targets ; do
bbappend=`recipetool newappend $target_sdk_dir/workspace $sdktarget`
printf 'python do_rootfs_forcevariable () {\n bb.utils.mkdirhier(d.getVar("IMAGE_ROOTFS", True))\n}\n' > $bbappend
printf 'python do_bootimg () {\n pass\n}\n' >> $bbappend
printf 'python do_bootdirectdisk () {\n pass\n}\n' >> $bbappend
printf 'python do_vmimg () {\n pass\n}\n' >> $bbappend
printf "Created bbappend %s\n" "$bbappend"
done
bitbake $sdk_targets || exit 1
rm -rf $target_sdk_dir/workspace/appends/*
bitbake $sdk_targets --setscene-only || exit 1

View File

@ -178,7 +178,7 @@ def sdk_update(args, config, basepath, workspace):
sdk_targets = config.get('SDK', 'sdk_targets')
logger.info("Preparing build system... (This may take some time.)")
try:
exec_build_env_command(config.init_path, basepath, 'bitbake %s' % sdk_targets)
exec_build_env_command(config.init_path, basepath, 'bitbake %s --setscene-only' % sdk_targets)
except:
logger.error('bitbake %s failed' % sdk_targets)
return -1