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

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

Hi,

On 09/08/2017 11:48 AM, Alexander Smirnov wrote:
> @@ -40,9 +39,9 @@ do_build() {
>       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
> +    sed -i 's|##CONFIG_SCRIPT##|./tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF}/configscript.sh|' ${WORKDIR}/multistrap.conf
> +    sed -i 's|##SETUP_SCRIPT##|./tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF}/setup.sh|' ${WORKDIR}/multistrap.conf
> +    sed -i 's|##DIR_HOOKS##|./tmp/work/${DISTRO}-${DISTRO_ARCH}/${PF}/hooks_multistrap|' ${WORKDIR}/multistrap.conf

Since you are touching this part in this patch series. Can you clean 
this up a bit in a seperate patch?

Something like this just looks so much nicer, don't you agree?

   sed -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##|./tmp/work/${PN}/${MACHINE}/configscript.sh|g' \
       -e 's|##SETUP_SCRIPT##|${WORKDIR}/setup.sh|g' \
       -e 's|##DIR_HOOKS##|./tmp/work/${PN}/${MACHINE}/hooks_multistrap|g' \
          ${WORKDIR}/multistrap.conf.in > ${WORKDIR}/multistrap.conf

Of course you have to fit that to your code here.

Thanks.

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