summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-04-20 17:47:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-24 11:06:55 +0100
commitf61e57293ecc2a3211c644c68f17234eeae5fd91 (patch)
treebd5600de9072bde9b9687004cad8e226485a3836 /meta/classes
parent617a02d0fdeb1a06bddf3aab257b35acc5d73832 (diff)
downloadpoky-f61e57293ecc2a3211c644c68f17234eeae5fd91.tar.gz
classes/populate_sdk_base: Show title in SDK installer
Show a friendly title when running the SDK installer, so the user knows what SDK they are installing. The title is controlled by the SDK_INSTALLER_TITLE variable and includes the distro name and SDK version by default. (From OE-Core rev: 0af913887f4c0a79c6b950bd5d57c06333520a14) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/populate_sdk_base.bbclass4
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
2 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 5c0769373a..13a0b1fdee 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -54,6 +54,8 @@ SDK_PACKAGING_FUNC ?= "create_shar"
54SDK_POST_INSTALL_COMMAND ?= "" 54SDK_POST_INSTALL_COMMAND ?= ""
55SDK_RELOCATE_AFTER_INSTALL ?= "1" 55SDK_RELOCATE_AFTER_INSTALL ?= "1"
56 56
57SDK_TITLE ?= "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} SDK"
58
57SDK_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.manifest" 59SDK_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.manifest"
58python write_target_sdk_manifest () { 60python write_target_sdk_manifest () {
59 from oe.sdk import sdk_list_installed_packages 61 from oe.sdk import sdk_list_installed_packages
@@ -134,6 +136,8 @@ EOF
134 -e 's#@SDKPATH@#${SDKPATH}#g' \ 136 -e 's#@SDKPATH@#${SDKPATH}#g' \
135 -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \ 137 -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \
136 -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \ 138 -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \
139 -e 's#@SDK_TITLE@#${SDK_TITLE}#g' \
140 -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \
137 -e '/@SDK_POST_INSTALL_COMMAND@/d' \ 141 -e '/@SDK_POST_INSTALL_COMMAND@/d' \
138 ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh 142 ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh
139 143
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 44b926e2d7..dc2c58e2d1 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -35,6 +35,8 @@ SDK_DIR_task-populate-sdk-ext = "${WORKDIR}/sdk-ext"
35B_task-populate-sdk-ext = "${SDK_DIR}" 35B_task-populate-sdk-ext = "${SDK_DIR}"
36TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}" 36TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}"
37 37
38SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} Extensible SDK"
39
38python copy_buildsystem () { 40python copy_buildsystem () {
39 import re 41 import re
40 import oe.copy_buildsystem 42 import oe.copy_buildsystem