diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 |
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" | |||
54 | SDK_POST_INSTALL_COMMAND ?= "" | 54 | SDK_POST_INSTALL_COMMAND ?= "" |
55 | SDK_RELOCATE_AFTER_INSTALL ?= "1" | 55 | SDK_RELOCATE_AFTER_INSTALL ?= "1" |
56 | 56 | ||
57 | SDK_TITLE ?= "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} SDK" | ||
58 | |||
57 | SDK_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.manifest" | 59 | SDK_MANIFEST = "${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.manifest" |
58 | python write_target_sdk_manifest () { | 60 | python 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" | |||
35 | B_task-populate-sdk-ext = "${SDK_DIR}" | 35 | B_task-populate-sdk-ext = "${SDK_DIR}" |
36 | TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}" | 36 | TOOLCHAIN_OUTPUTNAME_task-populate-sdk-ext = "${SDK_NAME}-toolchain-ext-${SDK_VERSION}" |
37 | 37 | ||
38 | SDK_TITLE_task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME', True) or d.getVar('DISTRO', True)} Extensible SDK" | ||
39 | |||
38 | python copy_buildsystem () { | 40 | python copy_buildsystem () { |
39 | import re | 41 | import re |
40 | import oe.copy_buildsystem | 42 | import oe.copy_buildsystem |