summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-03-21 18:14:01 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-25 10:29:13 +0000
commit58d2e5625fc80cf1b857864687d47445d7a3eb74 (patch)
tree04fe613913ad9dace2bf73046d0bb21577b68306 /meta
parent06845723d4f4461dc5730da814c4e193b27b5d03 (diff)
downloadpoky-58d2e5625fc80cf1b857864687d47445d7a3eb74.tar.gz
classes/populate_sdk_ext: parse metadata on minimal SDK install
Instead of skipping the build system preparation step within the extensible SDK install process when SDK_EXT_TYPE is "minimal", run bitbake -p so that the cache is populated ready for the first time devtool is run. (From OE-Core rev: 6b38a991a3475fb82889428b94563968c7570473) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
-rw-r--r--meta/files/ext-sdk-prepare.py10
2 files changed, 8 insertions, 4 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index be4bcc02e9..cabf8155b4 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -374,7 +374,7 @@ sdk_ext_postinst() {
374 # Warn if trying to use external bitbake and the ext SDK together 374 # Warn if trying to use external bitbake and the ext SDK together
375 echo "(which bitbake > /dev/null 2>&1 && echo 'WARNING: attempting to use the extensible SDK in an environment set up to run bitbake - this may lead to unexpected results. Please source this script in a new shell session instead.') || true" >> $env_setup_script 375 echo "(which bitbake > /dev/null 2>&1 && echo 'WARNING: attempting to use the extensible SDK in an environment set up to run bitbake - this may lead to unexpected results. Please source this script in a new shell session instead.') || true" >> $env_setup_script
376 376
377 if [ "$prepare_buildsystem" != "no" -a -n "${@SDK_INSTALL_TARGETS.strip()}" ]; then 377 if [ "$prepare_buildsystem" != "no" ]; then
378 printf "Preparing build system...\n" 378 printf "Preparing build system...\n"
379 # dash which is /bin/sh on Ubuntu will not preserve the 379 # dash which is /bin/sh on Ubuntu will not preserve the
380 # current working directory when first ran, nor will it set $1 when 380 # current working directory when first ran, nor will it set $1 when
diff --git a/meta/files/ext-sdk-prepare.py b/meta/files/ext-sdk-prepare.py
index c99e34f371..7887696153 100644
--- a/meta/files/ext-sdk-prepare.py
+++ b/meta/files/ext-sdk-prepare.py
@@ -30,10 +30,14 @@ def exec_watch(cmd, **options):
30 30
31def main(): 31def main():
32 if len(sys.argv) < 2: 32 if len(sys.argv) < 2:
33 print('Please specify target to prepare with') 33 sdk_targets = []
34 return 1 34 else:
35 sdk_targets = ' '.join(sys.argv[1:]).split()
36 if not sdk_targets:
37 # Just do a parse so the cache is primed
38 ret, _ = exec_watch('bitbake -p')
39 return ret
35 40
36 sdk_targets = ' '.join(sys.argv[1:]).split()
37 print('Preparing SDK for %s...' % ', '.join(sdk_targets)) 41 print('Preparing SDK for %s...' % ', '.join(sdk_targets))
38 42
39 ret, out = exec_watch('bitbake %s --setscene-only' % ' '.join(sdk_targets)) 43 ret, out = exec_watch('bitbake %s --setscene-only' % ' '.join(sdk_targets))