mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes/populate_sdk_base: Show title in SDK installer

Browse Source 
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>
This commit is contained in:
Paul Eggleton
2015-04-20 17:47:08 +01:00
committed by Richard Purdie
parent 617a02d0fd
commit f61e57293e
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/populate_sdk_base.bbclass
View File

@@ -54,6 +54,8 @@ SDK_PACKAGING_FUNC ?= "create_shar"
SDK_POST_INSTALL_COMMAND ?= "" SDK_POST_INSTALL_COMMAND ?= ""
SDK_RELOCATE_AFTER_INSTALL ?= "1" 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" SDK_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.manifest"
python write_target_sdk_manifest () { python write_target_sdk_manifest () {
from oe.sdk import sdk_list_installed_packages from oe.sdk import sdk_list_installed_packages
@@ -134,6 +136,8 @@ EOF
-e 's#@SDKPATH@#${SDKPATH}#g' \ -e 's#@SDKPATH@#${SDKPATH}#g' \
-e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \ -e 's#@OLDEST_KERNEL@#${OLDEST_KERNEL}#g' \
-e 's#@REAL_MULTIMACH_TARGET_SYS@#${REAL_MULTIMACH_TARGET_SYS}#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' \ -e '/@SDK_POST_INSTALL_COMMAND@/d' \
${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.sh

2
meta/classes/populate_sdk_ext.bbclass
View File

@@ -35,6 +35,8 @@ SDK_DIR_task-populate-sdk-ext = "${WORKDIR}/sdk-ext"
B_task-populate-sdk-ext = "${SDK_DIR}" B_task-populate-sdk-ext = "${SDK_DIR}"
TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}" 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 () { python copy_buildsystem () {
import re import re
import oe.copy_buildsystem import oe.copy_buildsystem

3
meta/files/toolchain-shar-extract.sh
View File

@@ -64,6 +64,9 @@ while getopts ":yd:DRS" OPT; do
esac esac
done done
echo "@SDK_TITLE@ installer version @SDK_VERSION@"
echo "==========================================================="
if [ $verbose = 1 ] ; then if [ $verbose = 1 ] ; then
set -x set -x
fi fi

2
meta/recipes-core/meta/buildtools-tarball.bb
View File

@@ -29,6 +29,8 @@ SDK_PACKAGE_ARCHS =+ "buildtools-dummy-${SDKPKGSUFFIX}"
TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}" TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}"
SDK_TITLE = "Build tools"
RDEPENDS = "${TOOLCHAIN_HOST_TASK}" RDEPENDS = "${TOOLCHAIN_HOST_TASK}"
EXCLUDE_FROM_WORLD = "1" EXCLUDE_FROM_WORLD = "1"