Re: [PATCH v5 05/12] build.sh: Add additional parameter

[Alexander Smirnov <asmirnov@ilbers.de>]

Hi everybody,

On 02.08.2018 10:56, Henning Schild wrote:
> Am Wed, 1 Aug 2018 17:51:57 +0300
> schrieb Alexander Smirnov <asmirnov@ilbers.de>:
> 
>> On 30.07.2018 22:39, Alexander Smirnov wrote:
>>> 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..c2967d2 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=$(cut -c1 /etc/debian_version)
>>> +if [ $(($debian_version)) -ge 9 ]; then
>>
>> Damn! This doesn't work on stretch:
>>
>> $ cat /etc/debian_version
>> stretch/sid
> 
> Maybe that is an old installation when stretch was still sid?
> What does "lsb_release -r" say on that machine? That might be the
> better tool, instead of looking directly at the file.
> And it might be a good idea to turn the logic around. So if the check
> somehow does not work we default to "new".
> 

Sorry for the false alarm, I was in Ubuntu 16.04 chroot. :-( For Debian 
it's correct:

$ cat /etc/debian_version
9.5

Alex

> Henning
> 
>> But on jessie there were numbers. Will fix this.
>>
>> Alex
>>
>>> +    set_arch="--host-arch $target_arch"
>>> +else
>>> +    set_arch="-a $target_arch"
>>> +fi
>>> +
>>>    # 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
>>>    
>>
>