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 23:26:28 +0000 |
commit | 0269219fbebd4e92b9505b3d76d593dbf4e2c539 (patch) | |
tree | 0d8ddfdee64f7422abb463602d7da8511c8228d5 | |
parent | 1ee08426d792ce27213dd411a885595d8435ae33 (diff) | |
download | poky-0269219fbebd4e92b9505b3d76d593dbf4e2c539.tar.gz |
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>
-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 @@ | |||
5 | target_sdk_dir="$1" | 5 | target_sdk_dir="$1" |
6 | sdk_targets="$2" | 6 | sdk_targets="$2" |
7 | 7 | ||
8 | # Avoid actually building images during this phase, but still | 8 | bitbake $sdk_targets --setscene-only || exit 1 |
9 | # ensure all dependencies are extracted from sstate | ||
10 | # This is a hack, to be sure, but we really don't need to do this here | ||
11 | for sdktarget in $sdk_targets ; do | ||
12 | bbappend=`recipetool newappend $target_sdk_dir/workspace $sdktarget` | ||
13 | printf 'python do_rootfs_forcevariable () {\n bb.utils.mkdirhier(d.getVar("IMAGE_ROOTFS", True))\n}\n' > $bbappend | ||
14 | printf 'python do_bootimg () {\n pass\n}\n' >> $bbappend | ||
15 | printf 'python do_bootdirectdisk () {\n pass\n}\n' >> $bbappend | ||
16 | printf 'python do_vmimg () {\n pass\n}\n' >> $bbappend | ||
17 | printf "Created bbappend %s\n" "$bbappend" | ||
18 | done | ||
19 | bitbake $sdk_targets || exit 1 | ||
20 | rm -rf $target_sdk_dir/workspace/appends/* | ||
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): | |||
178 | sdk_targets = config.get('SDK', 'sdk_targets') | 178 | sdk_targets = config.get('SDK', 'sdk_targets') |
179 | logger.info("Preparing build system... (This may take some time.)") | 179 | logger.info("Preparing build system... (This may take some time.)") |
180 | try: | 180 | try: |
181 | exec_build_env_command(config.init_path, basepath, 'bitbake %s' % sdk_targets) | 181 | exec_build_env_command(config.init_path, basepath, 'bitbake %s --setscene-only' % sdk_targets) |
182 | except: | 182 | except: |
183 | logger.error('bitbake %s failed' % sdk_targets) | 183 | logger.error('bitbake %s failed' % sdk_targets) |
184 | return -1 | 184 | return -1 |