* [PATCH] populate_sdk_base: move template files location to variables
@ 2018-10-04 6:40 Andrej Valek
2018-10-09 8:04 ` Andrej Valek
0 siblings, 1 reply; 2+ messages in thread
From: Andrej Valek @ 2018-10-04 6:40 UTC (permalink / raw)
To: openembedded-core
Let users to use custom toolchain template files instead of overloading
the whole function.
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
---
meta/classes/populate_sdk_base.bbclass | 11 +++++++----
1 file 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() {
tar ${SDKTAROPTS} -cf - . | xz -T 0 > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.tar.xz
}
+TOOLCHAIN_SHAR_EXT_TMPL ?= "${COREBASE}/meta/files/toolchain-shar-extract.sh"
+TOOLCHAIN_SHAR_REL_TMPL ?= "${COREBASE}/meta/files/toolchain-shar-relocate.sh"
+
fakeroot create_shar() {
# copy in the template shar extractor script
- cp ${COREBASE}/meta/files/toolchain-shar-extract.sh ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
+ cp ${TOOLCHAIN_SHAR_EXT_TMPL} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
rm -f ${T}/pre_install_command ${T}/post_install_command
if [ ${SDK_RELOCATE_AFTER_INSTALL} -eq 1 ] ; then
- cp ${COREBASE}/meta/files/toolchain-shar-relocate.sh ${T}/post_install_command
+ cp ${TOOLCHAIN_SHAR_REL_TMPL} ${T}/post_install_command
fi
cat << "EOF" >> ${T}/pre_install_command
${SDK_PRE_INSTALL_COMMAND}
@@ -299,8 +302,8 @@ def sdk_variables(d):
do_populate_sdk[vardeps] += "${@sdk_variables(d)}"
-do_populate_sdk[file-checksums] += "${COREBASE}/meta/files/toolchain-shar-relocate.sh:True \
- ${COREBASE}/meta/files/toolchain-shar-extract.sh:True"
+do_populate_sdk[file-checksums] += "${TOOLCHAIN_SHAR_REL_TMPL}:True \
+ ${TOOLCHAIN_SHAR_EXT_TMPL}:True"
do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}"
do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS').split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}"
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] populate_sdk_base: move template files location to variables
2018-10-04 6:40 [PATCH] populate_sdk_base: move template files location to variables Andrej Valek
@ 2018-10-09 8:04 ` Andrej Valek
0 siblings, 0 replies; 2+ messages in thread
From: Andrej Valek @ 2018-10-09 8:04 UTC (permalink / raw)
To: openembedded-core
Do we have some blocker for this?
Regards,
Andrej
On 10/4/18 8:40 AM, Andrej Valek wrote:
> Let users to use custom toolchain template files instead of overloading
> the whole function.
>
> Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
> ---
> meta/classes/populate_sdk_base.bbclass | 11 +++++++----
> 1 file 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() {
> tar ${SDKTAROPTS} -cf - . | xz -T 0 > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.tar.xz
> }
>
> +TOOLCHAIN_SHAR_EXT_TMPL ?= "${COREBASE}/meta/files/toolchain-shar-extract.sh"
> +TOOLCHAIN_SHAR_REL_TMPL ?= "${COREBASE}/meta/files/toolchain-shar-relocate.sh"
> +
> fakeroot create_shar() {
> # copy in the template shar extractor script
> - cp ${COREBASE}/meta/files/toolchain-shar-extract.sh ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
> + cp ${TOOLCHAIN_SHAR_EXT_TMPL} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.sh
>
> rm -f ${T}/pre_install_command ${T}/post_install_command
>
> if [ ${SDK_RELOCATE_AFTER_INSTALL} -eq 1 ] ; then
> - cp ${COREBASE}/meta/files/toolchain-shar-relocate.sh ${T}/post_install_command
> + cp ${TOOLCHAIN_SHAR_REL_TMPL} ${T}/post_install_command
> fi
> cat << "EOF" >> ${T}/pre_install_command
> ${SDK_PRE_INSTALL_COMMAND}
> @@ -299,8 +302,8 @@ def sdk_variables(d):
>
> do_populate_sdk[vardeps] += "${@sdk_variables(d)}"
>
> -do_populate_sdk[file-checksums] += "${COREBASE}/meta/files/toolchain-shar-relocate.sh:True \
> - ${COREBASE}/meta/files/toolchain-shar-extract.sh:True"
> +do_populate_sdk[file-checksums] += "${TOOLCHAIN_SHAR_REL_TMPL}:True \
> + ${TOOLCHAIN_SHAR_EXT_TMPL}:True"
>
> do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}"
> do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS').split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}"
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-09 8:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-04 6:40 [PATCH] populate_sdk_base: move template files location to variables Andrej Valek
2018-10-09 8:04 ` Andrej Valek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.