diff options
| author | Randy Witt <randy.e.witt@linux.intel.com> | 2016-02-04 12:31:44 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-06 23:08:57 +0000 |
| commit | 35f79652ab5f1ca754fb726a9bc88d0add0114c8 (patch) | |
| tree | 67342a0331dda08af71b19e5787e9fc0e1902f2e | |
| parent | e9349939e22ca9cf0efe0795291c01fbdeb96a8c (diff) | |
| download | openembedded-core-35f79652ab5f1ca754fb726a9bc88d0add0114c8.tar.gz openembedded-core-35f79652ab5f1ca754fb726a9bc88d0add0114c8.tar.bz2 openembedded-core-35f79652ab5f1ca754fb726a9bc88d0add0114c8.zip | |
populate_sdk_ext: Add support for a "minimal" type
If the user sets the SDK_EXT_TYPE variable to "minimal" then the sdk won't
contain any sstate. The sstate can come from an sstate mirror and be
installed on demand as usual.
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index ba30023444..caf8b6e6cd 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -18,6 +18,9 @@ SDK_RELOCATE_AFTER_INSTALL_task-populate-sdk-ext = "0" SDK_EXT = "" SDK_EXT_task-populate-sdk-ext = "-ext" +# Options are full or minimal +SDK_EXT_TYPE ?= "full" + SDK_LOCAL_CONF_WHITELIST ?= "" SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \ BB_NUMBER_THREADS \ @@ -29,7 +32,7 @@ SDK_INHERIT_BLACKLIST ?= "buildhistory icecc" SDK_UPDATE_URL ?= "" SDK_TARGETS ?= "${PN}" -SDK_INSTALL_TARGETS = "${SDK_TARGETS} ${@'meta-world-pkgdata:do_allpackagedata' if d.getVar('SDK_INCLUDE_PKGDATA', True) == '1' else ''}" +SDK_INSTALL_TARGETS = "${@SDK_TARGETS if d.getVar('SDK_EXT_TYPE', True) != 'minimal' else ''} ${@'meta-world-pkgdata:do_allpackagedata' if d.getVar('SDK_INCLUDE_PKGDATA', True) == '1' else ''}" OE_INIT_ENV_SCRIPT ?= "oe-init-build-env" # The files from COREBASE that you want preserved in the COREBASE copied @@ -203,10 +206,6 @@ python copy_buildsystem () { bb.utils.remove(sstate_out, True) # uninative.bbclass sets NATIVELSBSTRING to 'universal' fixedlsbstring = 'universal' - oe.copy_buildsystem.create_locked_sstate_cache(lockedsigs_pruned, - d.getVar('SSTATE_DIR', True), - sstate_out, d, - fixedlsbstring) # Add packagedata if enabled if d.getVar('SDK_INCLUDE_PKGDATA', True) == '1': @@ -218,7 +217,9 @@ python copy_buildsystem () { d.getVar('STAGING_DIR_HOST', True) + '/world-pkgdata/locked-sigs-pkgdata.inc', lockedsigs_pruned, lockedsigs_copy) - oe.copy_buildsystem.create_locked_sstate_cache(lockedsigs_copy, + + if d.getVar('SDK_EXT_TYPE', True) != 'minimal': + oe.copy_buildsystem.create_locked_sstate_cache(lockedsigs_pruned, d.getVar('SSTATE_DIR', True), sstate_out, d, fixedlsbstring) @@ -302,7 +303,7 @@ sdk_ext_postinst() { # For now this is where uninative.bbclass expects the tarball mv *-nativesdk-libc.tar.* $target_sdk_dir/`dirname ${oe_init_build_env_path}` - if [ "$prepare_buildsystem" != "no" ]; then + if [ "$prepare_buildsystem" != "no" -a -n "${@SDK_INSTALL_TARGETS.strip()}" ]; then printf "Preparing build system...\n" # dash which is /bin/sh on Ubuntu will not preserve the # current working directory when first ran, nor will it set $1 when |