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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/files/ext-sdk-prepare.sh b/meta/files/ext-sdk-prepare.sh
index 160c71e97cab92759faf95779c3a0fe03facfc34..b3f5d9361529811bae19ce88d8453af63d04b511 100644 (file)
--- a/meta/files/ext-sdk-prepare.sh
+++ b/meta/files/ext-sdk-prepare.sh
@@ -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

diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py
index 7faefabad8f4e93fb7068a42a0e850a7519dd653..0872df6bd1dfc3e5cbb377bf8b8c248325272336 100644 (file)
--- a/scripts/lib/devtool/sdk.py
+++ b/scripts/lib/devtool/sdk.py
@@ -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