[Buildroot] [PATCH 1/4] support/docker: move to current bookworm (Debian 12) snapshot

[Buildroot] [PATCH 1/4] support/docker: move to current bookworm (Debian 12) snapshot

[Peter Korsgaard]

Debian 11 is out of security support since 15 August 2024, so move to
current Debian 12 instead.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 support/docker/Dockerfile       | 2 +-
 support/docker/apt-sources.list | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
index 8c6e2add60..71d326cfd0 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:bullseye-20230202
+FROM debian:bookworm-20250203
 
 LABEL maintainer="Buildroot mailing list <buildroot@buildroot.org>" \
       vendor="Buildroot" \
diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list
index 849996d9f7..ddbe15eed8 100644
--- a/support/docker/apt-sources.list
+++ b/support/docker/apt-sources.list
@@ -1,4 +1,4 @@
-# Latest just before 20230207T102800Z:
-deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main
-deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main
-deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main
+# Latest just before 20250205151400Z:
+deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20250205T145632Z/ bookworm main
+deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20250205T145632Z/ bookworm-security main
+deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20250205T145632Z/ bookworm-updates main
-- 
2.39.5

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

[Buildroot] [PATCH 2/4] support/docker: add curl

[Peter Korsgaard]

Commit afece24a7272 ("support/download: introduce curl backend for FTP
transfers") added curl download support, so add it to the container as well.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 support/docker/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
index 71d326cfd0..f6d3978f9b 100644
--- a/support/docker/Dockerfile
+++ b/support/docker/Dockerfile
@@ -28,6 +28,7 @@ RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \
         ca-certificates \
         cmake \
         cpio \
+        curl \
         cvs \
         file \
         g++-multilib \
-- 
2.39.5

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

[Buildroot] [PATCH 3/4] support/docker: add tar 1.35

[Peter Korsgaard]

Since commit b11956fb6690 ("support/dependencies: require tar >= 1.35"),
Buildroot will build host-tar if the host does not have >= 1.35 available,
so add it to the container to save build time.

Debian 12 only provides tar 1.34.  Tar 1.35 is available in testing - But
that then depends on a newer glibc, so instead build it from source using
the --disable-year2038 flag like we do for host-tar and install it into
/usr/local/bin so it shadows the Debian one.

This step runs as root (and needs to for make install), so add
FORCE_UNSAFE_CONFIGURE=1 as otherwise the configure script errors out.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 support/docker/Dockerfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
index f6d3978f9b..e5e45d5a6f 100644
--- a/support/docker/Dockerfile
+++ b/support/docker/Dockerfile
@@ -12,6 +12,9 @@ LABEL maintainer="Buildroot mailing list <buildroot@buildroot.org>" \
       vendor="Buildroot" \
 description="Container with everything needed to run Buildroot"
 
+# We need tar >= 1.35
+ARG TAR_VERSION="1.35"
+
 # Setup environment
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -56,6 +59,16 @@ RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \
     apt-get -y autoremove && \
     apt-get -y clean
 
+# Build host-tar
+RUN curl -sfL https://ftpmirror.gnu.org/tar/tar-${TAR_VERSION}.tar.xz | \
+    tar -Jx -C /tmp && \
+    cd /tmp/tar-${TAR_VERSION} && \
+    FORCE_UNSAFE_CONFIGURE=1 ./configure \
+        --disable-year2028 && \
+    make && \
+    make install && \
+    rm -rf /tmp/tar-${TAR_VERSION}
+
 # To be able to generate a toolchain with locales, enable one UTF-8 locale
 RUN sed -i 's/# \(en_US.UTF-8\)/\1/' /etc/locale.gen && \
     /usr/sbin/locale-gen
-- 
2.39.5

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

[Buildroot] [PATCH 4/4] .gitlab-ci.yml: use Debian 12-based container image with curl / tar 1.35

[Peter Korsgaard]

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d7719568f..7eba876a54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 # Configuration for Gitlab-CI.
 # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
 
-image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123
+image: $CI_REGISTRY/buildroot.org/buildroot/base:20250205.1514
 
 stages:
   - generate-gitlab-ci
-- 
2.39.5

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

Re: [Buildroot] [PATCH 4/4] .gitlab-ci.yml: use Debian 12-based container image with curl / tar 1.35

[Romain Naour via buildroot]

Hello Peter, All,

Le 06/02/2025 à 08:23, Peter Korsgaard a écrit :
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  .gitlab-ci.yml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 3d7719568f..7eba876a54 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,7 +1,7 @@
>  # Configuration for Gitlab-CI.
>  # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
>  
> -image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123
> +image: $CI_REGISTRY/buildroot.org/buildroot/base:20250205.1514

This requires some testing with the Buildroot testsuite. Some tests may requires
an update due to qemu version change.

See this commit as example:

https://gitlab.com/buildroot.org/buildroot/-/commit/d8447c38f53f98e1df4a209e9f70e54f8b60f36e

Best regards,
Romain


>  
>  stages:
>    - generate-gitlab-ci

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

Re: [Buildroot] [PATCH 4/4] .gitlab-ci.yml: use Debian 12-based container image with curl / tar 1.35

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@smile.fr> writes:

Hi,

 >> +++ b/.gitlab-ci.yml
 >> @@ -1,7 +1,7 @@
 >> # Configuration for Gitlab-CI.
 >> # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
 >> 
 >> -image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123
 >> +image: $CI_REGISTRY/buildroot.org/buildroot/base:20250205.1514

 > This requires some testing with the Buildroot testsuite. Some tests may requires
 > an update due to qemu version change.

 > See this commit as example:

 > https://gitlab.com/buildroot.org/buildroot/-/commit/d8447c38f53f98e1df4a209e9f70e54f8b60f36e

Sure, how do we trigger a test run before merging to master?

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/4] .gitlab-ci.yml: use Debian 12-based container image with curl / tar 1.35

[Romain Naour via buildroot]

Le 06/02/2025 à 10:03, Peter Korsgaard a écrit :
>>>>>> "Romain" == Romain Naour <romain.naour@smile.fr> writes:
> 
> Hi,
> 
>  >> +++ b/.gitlab-ci.yml
>  >> @@ -1,7 +1,7 @@
>  >> # Configuration for Gitlab-CI.
>  >> # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines
>  >> 
>  >> -image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123
>  >> +image: $CI_REGISTRY/buildroot.org/buildroot/base:20250205.1514
> 
>  > This requires some testing with the Buildroot testsuite. Some tests may requires
>  > an update due to qemu version change.
> 
>  > See this commit as example:
> 
>  > https://gitlab.com/buildroot.org/buildroot/-/commit/d8447c38f53f98e1df4a209e9f70e54f8b60f36e
> 
> Sure, how do we trigger a test run before merging to master?
> 

Last time I used my personal gitlab fork to trigger a new pipeline and local
builds when gitlab-ci minutes was exhausted... but it takes a lot of time.

I guess you needs some volunteers to tests this update.

Is it ok to push a testing branch to trigger a pipeline for the runtime tests?

Best regards,
Romain

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

Re: [Buildroot] [PATCH 4/4] .gitlab-ci.yml: use Debian 12-based container image with curl / tar 1.35

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@smile.fr> writes:

Hi,

 >> Sure, how do we trigger a test run before merging to master?

 > Last time I used my personal gitlab fork to trigger a new pipeline and local
 > builds when gitlab-ci minutes was exhausted... but it takes a lot of time.

 > I guess you needs some volunteers to tests this update.

 > Is it ok to push a testing branch to trigger a pipeline for the runtime tests?

Yes please (I see you alredy did) - Thanks!

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/4] .gitlab-ci.yml: use Debian 12-based container image with curl / tar 1.35

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

>>>>> "Romain" == Romain Naour <romain.naour@smile.fr> writes:
 > Hi,

 >>> Sure, how do we trigger a test run before merging to master?

 >> Last time I used my personal gitlab fork to trigger a new pipeline and local
 >> builds when gitlab-ci minutes was exhausted... but it takes a lot of time.

 >> I guess you needs some volunteers to tests this update.

 >> Is it ok to push a testing branch to trigger a pipeline for the runtime tests?

 > Yes please (I see you alredy did) - Thanks!

With the basic shellcheck and flake8 issues fixed I have now
rebuilt/repushed the container and applied the series, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot