diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-04-20 17:47:08 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-24 11:05:57 +0100 |
| commit | 0af913887f4c0a79c6b950bd5d57c06333520a14 (patch) | |
| tree | 10c961af426fa4f85ab322259755d4807adbc114 | |
| parent | 80bbd763448fa061e3dbc3ace8d6bc9f65e4bfaf (diff) | |
| download | openembedded-core-contrib-0af913887f4c0a79c6b950bd5d57c06333520a14.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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 | ||||
| -rw-r--r-- | meta/files/toolchain-shar-extract.sh | 3 | ||||
| -rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 2 |
4 files changed, 11 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" SDK_POST_INSTALL_COMMAND ?= "" SDK_RELOCATE_AFTER_INSTALL ?= "1" +SDK_TITLE ?= "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} SDK" + SDK_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.manifest" python write_target_sdk_manifest () { from oe.sdk import sdk_list_installed_packages @@ -134,6 +136,8 @@ EOF -e 's#@SDKPATH@#${SDKPATH}#g' \ -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \ -e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#g' \ + -e 's#@SDK_TITLE@#${SDK_TITLE}#g' \ + -e 's#@SDK_VERSION@#${SDK_VERSION}#g' \ -e '/@SDK_POST_INSTALL_COMMAND@/d' \ ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh 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" B_task-populate-sdk-ext = "${SDK_DIR}" TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}" +SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} Extensible SDK" + python copy_buildsystem () { import re import oe.copy_buildsystem diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 516aa3a142..13b5951e0e 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -64,6 +64,9 @@ while getopts ":yd:DRS" OPT; do esac done +echo "@SDK_TITLE@ installer version @SDK_VERSION@" +echo "===========================================================" + if [ $verbose = 1 ] ; then set -x fi diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 6d4c8c8fe1..3d2169baab 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -29,6 +29,8 @@ SDK_PACKAGE_ARCHS =+ "buildtools-dummy-${SDKPKGSUFFIX}" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}" +SDK_TITLE = "Build tools" + RDEPENDS = "${TOOLCHAIN_HOST_TASK}" EXCLUDE_FROM_WORLD = "1" |