summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2016-02-04 12:31:44 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-06 23:10:45 +0000
commit4f7656a2047f4f67c3965693c3ca9f94e634cd9d (patch)
tree35f4db6b9bcccfb393d19b54b0d4057e766292d2 /meta
parent71bb33266de151f4f2bc6f0dd2e184d7a662b035 (diff)
downloadpoky-4f7656a2047f4f67c3965693c3ca9f94e634cd9d.tar.gz
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. (From OE-Core rev: 35f79652ab5f1ca754fb726a9bc88d0add0114c8) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass15
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"
18SDK_EXT = "" 18SDK_EXT = ""
19SDK_EXT_task-populate-sdk-ext = "-ext" 19SDK_EXT_task-populate-sdk-ext = "-ext"
20 20
21# Options are full or minimal
22SDK_EXT_TYPE ?= "full"
23
21SDK_LOCAL_CONF_WHITELIST ?= "" 24SDK_LOCAL_CONF_WHITELIST ?= ""
22SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \ 25SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \
23 BB_NUMBER_THREADS \ 26 BB_NUMBER_THREADS \
@@ -29,7 +32,7 @@ SDK_INHERIT_BLACKLIST ?= "buildhistory icecc"
29SDK_UPDATE_URL ?= "" 32SDK_UPDATE_URL ?= ""
30 33
31SDK_TARGETS ?= "${PN}" 34SDK_TARGETS ?= "${PN}"
32SDK_INSTALL_TARGETS = "${SDK_TARGETS} ${@'meta-world-pkgdata:do_allpackagedata' if d.getVar('SDK_INCLUDE_PKGDATA', True) == '1' else ''}" 35SDK_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 ''}"
33OE_INIT_ENV_SCRIPT ?= "oe-init-build-env" 36OE_INIT_ENV_SCRIPT ?= "oe-init-build-env"
34 37
35# The files from COREBASE that you want preserved in the COREBASE copied 38# The files from COREBASE that you want preserved in the COREBASE copied
@@ -203,10 +206,6 @@ python copy_buildsystem () {
203 bb.utils.remove(sstate_out, True) 206 bb.utils.remove(sstate_out, True)
204 # uninative.bbclass sets NATIVELSBSTRING to 'universal' 207 # uninative.bbclass sets NATIVELSBSTRING to 'universal'
205 fixedlsbstring = 'universal' 208 fixedlsbstring = 'universal'
206 oe.copy_buildsystem.create_locked_sstate_cache(lockedsigs_pruned,
207 d.getVar('SSTATE_DIR', True),
208 sstate_out, d,
209 fixedlsbstring)
210 209
211 # Add packagedata if enabled 210 # Add packagedata if enabled
212 if d.getVar('SDK_INCLUDE_PKGDATA', True) == '1': 211 if d.getVar('SDK_INCLUDE_PKGDATA', True) == '1':
@@ -218,7 +217,9 @@ python copy_buildsystem () {
218 d.getVar('STAGING_DIR_HOST', True) + '/world-pkgdata/locked-sigs-pkgdata.inc', 217 d.getVar('STAGING_DIR_HOST', True) + '/world-pkgdata/locked-sigs-pkgdata.inc',
219 lockedsigs_pruned, 218 lockedsigs_pruned,
220 lockedsigs_copy) 219 lockedsigs_copy)
221 oe.copy_buildsystem.create_locked_sstate_cache(lockedsigs_copy, 220
221 if d.getVar('SDK_EXT_TYPE', True) != 'minimal':
222 oe.copy_buildsystem.create_locked_sstate_cache(lockedsigs_pruned,
222 d.getVar('SSTATE_DIR', True), 223 d.getVar('SSTATE_DIR', True),
223 sstate_out, d, 224 sstate_out, d,
224 fixedlsbstring) 225 fixedlsbstring)
@@ -302,7 +303,7 @@ sdk_ext_postinst() {
302 # For now this is where uninative.bbclass expects the tarball 303 # For now this is where uninative.bbclass expects the tarball
303 mv *-nativesdk-libc.tar.* $target_sdk_dir/`dirname ${oe_init_build_env_path}` 304 mv *-nativesdk-libc.tar.* $target_sdk_dir/`dirname ${oe_init_build_env_path}`
304 305
305 if [ "$prepare_buildsystem" != "no" ]; then 306 if [ "$prepare_buildsystem" != "no" -a -n "${@SDK_INSTALL_TARGETS.strip()}" ]; then
306 printf "Preparing build system...\n" 307 printf "Preparing build system...\n"
307 # dash which is /bin/sh on Ubuntu will not preserve the 308 # dash which is /bin/sh on Ubuntu will not preserve the
308 # current working directory when first ran, nor will it set $1 when 309 # current working directory when first ran, nor will it set $1 when