diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-08 18:26:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 15:54:34 +0000 |
| commit | 38237b7ac53c416f85c4a70a61acafc3404c8b5f (patch) | |
| tree | 3dd3cfa98e5d4153ccb4275f2563029fa9869e2e | |
| parent | f11342f0c838b520828927c9d69f7c17309c1b48 (diff) | |
| download | openembedded-core-38237b7ac53c416f85c4a70a61acafc3404c8b5f.tar.gz openembedded-core-38237b7ac53c416f85c4a70a61acafc3404c8b5f.tar.bz2 openembedded-core-38237b7ac53c416f85c4a70a61acafc3404c8b5f.zip | |
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>
| -rw-r--r-- | meta/files/ext-sdk-prepare.sh | 14 | ||||
| -rw-r--r-- | scripts/lib/devtool/sdk.py | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/meta/files/ext-sdk-prepare.sh b/meta/files/ext-sdk-prepare.sh index 160c71e97c..b3f5d93615 100644 --- 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 7faefabad8..0872df6bd1 100644 --- 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 |