Re: [PATCH v4 03/10] build.sh: Add additional parameter

[Henning Schild <henning.schild@siemens.com>]

Am Tue, 24 Jul 2018 22:06:11 +0300
schrieb Alexander Smirnov <asmirnov@ilbers.de>:

> Pass target architecture as a parameter for build.
> 
> Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
> ---
>  meta/recipes-devtools/buildchroot/files/build.sh | 17
> +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/buildchroot/files/build.sh
> b/meta/recipes-devtools/buildchroot/files/build.sh index
> 73c0889..40ba410 100644 ---
> a/meta/recipes-devtools/buildchroot/files/build.sh +++
> b/meta/recipes-devtools/buildchroot/files/build.sh @@ -6,6 +6,19 @@
>  
>  set -e
>  
> +# Create human-readable names
> +target_arch=$2
> +
> +# Notes:
> +#   mk-build-deps for jessie and jtretch has different parameter
> name to specify +#   host architecture.
> +debian_version=$(cat /etc/debian_version | cut -c 1)
> +if [ $(($debian_version)) -ge 9 ]; then
> +    set_arch="--host-arch $target_arch"
> +else
> +    set_arch="-a $target_arch"
> +fi

The way i understand this patch, all callers will have to be updated as
well. Otherwise this patch (applied without the following) breaks the
build.

Henning

>  # Go to build directory
>  cd $1
>  
> @@ -36,7 +49,7 @@ install_cmd="apt-get -o
> Debug::pkgProblemResolver=yes --no-install-recommends -y -o
> APT::Get::List-Cleanup="0" 
>      # Install all build deps
> -    mk-build-deps -t "${install_cmd}" -i -r debian/control
> +    mk-build-deps $set_arch -t "${install_cmd}" -i -r debian/control
>  ) 42>/dpkg.lock
>  
>  # If autotools files have been created, update their timestamp to
> @@ -48,4 +61,4 @@ for i in configure aclocal.m4 Makefile.am
> Makefile.in; do done
>  
>  # Build the package
> -dpkg-buildpackage
> +dpkg-buildpackage -a$target_arch