Re: [PATCH v3 2/5] isar: Change build folders tree

[Claudius Heine <claudius.heine.ext@siemens.com>]

Hi Alex,

On 09/11/2017 09:27 PM, Alexander Smirnov wrote:
> diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
> index ccba683..722007d 100644
> --- a/meta/recipes-devtools/buildchroot/buildchroot.bb
> +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
> @@ -21,7 +21,7 @@ BUILDCHROOT_PREINSTALL ?= "gcc \
>                              apt \
>                              automake"
>   
> -WORKDIR = "${TMPDIR}/work/${PF}/${DISTRO}"
> +WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}"
>   
>   do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
>   
> @@ -34,18 +34,20 @@ do_build() {
>       install -m 755 ${THISDIR}/files/setup.sh ${WORKDIR}
>       install -m 755 ${THISDIR}/files/download_dev-random ${WORKDIR}/hooks_multistrap/
>   
> -    # Adjust multistrap config
> -    sed -i 's|##BUILDCHROOT_PREINSTALL##|${BUILDCHROOT_PREINSTALL}|' ${WORKDIR}/multistrap.conf
> -    sed -i 's|##DISTRO##|${DISTRO}|' ${WORKDIR}/multistrap.conf
> -    sed -i 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|' ${WORKDIR}/multistrap.conf
> -    sed -i 's|##DISTRO_SUITE##|${DISTRO_SUITE}|' ${WORKDIR}/multistrap.conf
> -    sed -i 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|' ${WORKDIR}/multistrap.conf
> -    sed -i 's|##CONFIG_SCRIPT##|./tmp/work/${PF}/${DISTRO}/configscript.sh|' ${WORKDIR}/multistrap.conf
> -    sed -i 's|##SETUP_SCRIPT##|./tmp/work/${PF}/${DISTRO}/setup.sh|' ${WORKDIR}/multistrap.conf
> -    sed -i 's|##DIR_HOOKS##|./tmp/work/${PF}/${DISTRO}/hooks_multistrap|' ${WORKDIR}/multistrap.conf
> -
> -    # Multistrap config use relative paths, so ensure that we are in the right folder
> +    # Multistrap accepts only relative path in configuration files, so get it:
>       cd ${TOPDIR}
> +    WORKDIR_REL=$(python -c "import os.path; print os.path.relpath('${WORKDIR}')")
Better. But have you tried something like this:

     WORKDIR_REL="${@ os.path.relpath(d.getVar(WORKDIR, True))}"

Since bitbake allows python inline code and the 'os' module should be 
imported per default it should work.

> +
> +    # Adjust multistrap config
> +    sed -i -e 's|##IMAGE_PREINSTALL##|${IMAGE_PREINSTALL}|g' \
> +           -e 's|##DISTRO##|${DISTRO}|g' \
> +           -e 's|##DISTRO_APT_SOURCE##|${DISTRO_APT_SOURCE}|g' \
> +           -e 's|##DISTRO_SUITE##|${DISTRO_SUITE}|g' \
> +           -e 's|##DISTRO_COMPONENTS##|${DISTRO_COMPONENTS}|g' \
> +           -e 's|##CONFIG_SCRIPT##|./'"$WORKDIR_REL"'/configscript.sh|g' \
> +           -e 's|##SETUP_SCRIPT##|./'"$WORKDIR_REL"'/setup.sh|g' \
> +           -e 's|##DIR_HOOKS##|./'"$WORKDIR_REL"'/hooks_multistrap|g' \
> +              ${WORKDIR}/multistrap.conf

Thanks for making it so easier for my eyes :)

>   
>       # Create root filesystem
>       sudo multistrap -a ${DISTRO_ARCH} -d "${BUILDCHROOT_DIR}" -f "${WORKDIR}/multistrap.conf" || true
> 

Cheers,
Claudius

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de