summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/populate_sdk_base.bbclass11
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index e07ad0cc6b..d9a391c613 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -228,14 +228,17 @@ fakeroot tar_sdk() {
228 tar ${SDKTAROPTS} -cf - . | xz -T 0 > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.tar.xz 228 tar ${SDKTAROPTS} -cf - . | xz -T 0 > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.tar.xz
229} 229}
230 230
231TOOLCHAIN_SHAR_EXT_TMPL ?= "${COREBASE}/meta/files/toolchain-shar-extract.sh"
232TOOLCHAIN_SHAR_REL_TMPL ?= "${COREBASE}/meta/files/toolchain-shar-relocate.sh"
233
231fakeroot create_shar() { 234fakeroot create_shar() {
232 # copy in the template shar extractor script 235 # copy in the template shar extractor script
233 cp ${COREBASE}/meta/files/toolchain-shar-extract.sh ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh 236 cp ${TOOLCHAIN_SHAR_EXT_TMPL} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
234 237
235 rm -f ${T}/pre_install_command ${T}/post_install_command 238 rm -f ${T}/pre_install_command ${T}/post_install_command
236 239
237 if [ ${SDK_RELOCATE_AFTER_INSTALL} -eq 1 ] ; then 240 if [ ${SDK_RELOCATE_AFTER_INSTALL} -eq 1 ] ; then
238 cp ${COREBASE}/meta/files/toolchain-shar-relocate.sh ${T}/post_install_command 241 cp ${TOOLCHAIN_SHAR_REL_TMPL} ${T}/post_install_command
239 fi 242 fi
240 cat << "EOF" >> ${T}/pre_install_command 243 cat << "EOF" >> ${T}/pre_install_command
241${SDK_PRE_INSTALL_COMMAND} 244${SDK_PRE_INSTALL_COMMAND}
@@ -299,8 +302,8 @@ def sdk_variables(d):
299 302
300do_populate_sdk[vardeps] += "${@sdk_variables(d)}" 303do_populate_sdk[vardeps] += "${@sdk_variables(d)}"
301 304
302do_populate_sdk[file-checksums] += "${COREBASE}/meta/files/toolchain-shar-relocate.sh:True \ 305do_populate_sdk[file-checksums] += "${TOOLCHAIN_SHAR_REL_TMPL}:True \
303 ${COREBASE}/meta/files/toolchain-shar-extract.sh:True" 306 ${TOOLCHAIN_SHAR_EXT_TMPL}:True"
304 307
305do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}" 308do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}"
306do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS').split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}" 309do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS').split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}"