Re: [Buildroot] [PATCH 11/16] support/docker: bump docker image for the gitlab-ci to Debian bullseye

[Romain Naour <romain.naour@gmail.com>]

Hello Arnout,

Le 22/09/2021 à 22:13, Arnout Vandecappelle a écrit :
> 
> 
> On 12/09/2021 16:11, Romain Naour wrote:
>> Starting with Qemu 6.1.0, gcc 7.5 is needed to build.
>> Since we build host-qemu package for qemu defconfig, we have to
>> upgrade to (at least) Debian buster that provide gcc 8 as host compiler.
>>
>> While testing this upgrate, the test_edk2 failed since it actually
>> requires Qemu >= 4.1.0 to support arm SBSA reference machine [1].
>> Debian Buster only provide Qemu 3.1.
>>
>> Finally, upgrade to Debian bullseye but it requires some linux
>> kernel version bump in several defconfigs since host gcc is based
>> on gcc-10 [2].
>>
>> Add explicitely python package in the Docker file to install python2
>> on the host.
>>
>> [1]
>> https://git.qemu.org/?p=qemu.git;a=commit;h=64580903c2b3aee08d74d64e6248a313b246cb69
>>
>> [2]
>> http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=621f2ded601546119fabccd1651b1ae29d26cd38
>>
>>
>> Signed-off-by: Romain Naour <romain.naour@gmail.com>
>> ---
>> The docker image must be rebuild and pushed to
>> https://hub.docker.com/r/buildroot/base/
>> ---
>>   support/docker/Dockerfile       | 4 +++-
>>   support/docker/apt-sources.list | 8 ++++----
>>   2 files changed, 7 insertions(+), 5 deletions(-)
>>
>> diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
>> index a9bacca3a0..795b26c276 100644
>> --- a/support/docker/Dockerfile
>> +++ b/support/docker/Dockerfile
>> @@ -6,7 +6,7 @@
>>   # We use a specific tag for the base image *and* the corresponding date
>>   # for the repository., so do not forget to update the apt-sources.list
>>   # file that is shipped next to this Dockerfile.
>> -FROM debian:stretch-20171210
>> +FROM debian:bullseye-20210902
>>     LABEL maintainer="Buildroot mailing list <buildroot@buildroot.org>" \
>>         vendor="Buildroot" \
>> @@ -36,6 +36,8 @@ RUN apt-get install -y --no-install-recommends \
>>           libncurses5-dev \
>>           locales \
>>           mercurial \
>> +        python \
>> +        python-six \
> 
>  As discussed, I applied to master without these python changes, pushed a new
> docker image to dockerhub, and sent a patch that updates .gitlab-ci.yml.

Ok, great!

>  I believe the rest of the series can only be applied after that update is
> committed, right?

Yes, we need to switch to this new Docker image before merging qemu update.
I tested the series using image stored in my dockerhub account.
But we can't avoid the ubifs regression in the testsuite...

Best regards,
Romain

> 
>  Regards,
>  Arnout
> 
>>           python3 \
>>           python3-flake8 \
>>           python3-nose2 \
>> diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list
>> index 789fb8fc17..0f872fd398 100644
>> --- a/support/docker/apt-sources.list
>> +++ b/support/docker/apt-sources.list
>> @@ -1,4 +1,4 @@
>> -# Latest just before 20171210T000000Z:
>> -deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch main
>> -deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch-updates main
>> -deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian-security/20171209T224618Z/
>> stretch/updates main
>> +# Latest just before 20210817T000000Z:
>> +deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye main
>> +deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian-security/20210902T193650Z/
>> bullseye-security main
>> +deb [check-valid-until=no]
>> http://snapshot.debian.org/archive/debian/20210902T205533Z/ bullseye-updates main
>>

_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot