[PATCH v3 0/1] Update hexagon cross container to 22.1.0

[PATCH v3 0/1] Update hexagon cross container to 22.1.0

[Brian Cain]

*** Note *** that this patch should not land without
"tests/tcg/multiarch/linux-test: use portable alternative for dirent64",
a newer musl present in this toolchain exposes this test issue.

Changes in v3:
 * change debian from 12->13

Changes in v2:
* none -> v2 was unintentionally chosen for the first rev of
this patch.  :(

v2: https://lore.kernel.org/qemu-devel/20260303175444.1540049-1-brian.cain@oss.qualcomm.com/
v1: <none>

Brian Cain (1):
  tests/docker: Update hexagon cross toolchain to 22.1.0

 .../dockerfiles/debian-hexagon-cross.docker   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

-- 
2.34.1

[PATCH v3 1/1] tests/docker: Update hexagon cross toolchain to 22.1.0

[Brian Cain]

Update the hexagon cross-compiler Docker container to use toolchain
version 22.1.0, replacing the previous 12.Dec.2023 release.

This requires upgrading the base image from Debian 11 to Debian 13
because the new toolchain needs glibc >= 2.34. Additional changes
to accommodate the new base image and toolchain:

- Use DEB822 format for enabling deb-src (Debian 13 sources format)
- Add libc++1, libc++abi1, libunwind-19 runtime deps for the new
  LLVM-based toolchain
- Add zstd for the new .tar.zst archive format
- Replace pip3 install tomli with python3-tomli system package
  (Debian 13 enforces PEP 668)
- Update artifact URL domain to artifacts.codelinaro.org

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
 .../dockerfiles/debian-hexagon-cross.docker   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker
index 23152b4918..b4c42661eb 100644
--- a/tests/docker/dockerfiles/debian-hexagon-cross.docker
+++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker
@@ -5,10 +5,10 @@
 # needs to be able to build QEMU itself in CI we include its
 # build-deps.
 #
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:13-slim
 
-# Duplicate deb line as deb-src
-RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
+# Enable deb-src for build-dep support
+RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.sources
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
     DEBIAN_FRONTEND=noninteractive eatmydata \
@@ -17,7 +17,11 @@ RUN apt-get update && \
         curl \
         ccache \
         xz-utils \
+        zstd \
         ca-certificates \
+        libc++1 \
+        libc++abi1 \
+        libunwind-19 \
         bison \
         flex \
         git \
@@ -25,6 +29,7 @@ RUN apt-get update && \
         python3-pip \
         python3-setuptools \
         python3-venv \
+        python3-tomli \
         python3-wheel && \
 # Install QEMU build deps for use in CI
     DEBIAN_FRONTEND=noninteractive eatmydata \
@@ -36,15 +41,13 @@ RUN apt-get update && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc && \
     dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt
 
-RUN /usr/bin/pip3 install tomli
-
 ENV TOOLCHAIN_INSTALL /opt
-ENV TOOLCHAIN_RELEASE 12.Dec.2023
+ENV TOOLCHAIN_RELEASE 22.1.0
 ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl"
-ENV TOOLCHAIN_URL https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/${TOOLCHAIN_RELEASE}/${TOOLCHAIN_BASENAME}.tar.xz
+ENV TOOLCHAIN_URL https://artifacts.codelinaro.org/artifactory/codelinaro-toolchain-for-hexagon/${TOOLCHAIN_RELEASE}_/${TOOLCHAIN_BASENAME}.tar.zst
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 
-RUN curl -#SL "$TOOLCHAIN_URL" | tar -xJC "$TOOLCHAIN_INSTALL"
+RUN curl -#SL "$TOOLCHAIN_URL" | tar --zstd -xC "$TOOLCHAIN_INSTALL"
 ENV PATH $PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-gnu/bin
 ENV MAKE /usr/bin/make
 # As a final step configure the user (if env is defined)
-- 
2.34.1

Re: [PATCH v3 1/1] tests/docker: Update hexagon cross toolchain to 22.1.0

[Alex Bennée]

Brian Cain <brian.cain@oss.qualcomm.com> writes:

> Update the hexagon cross-compiler Docker container to use toolchain
> version 22.1.0, replacing the previous 12.Dec.2023 release.
>
> This requires upgrading the base image from Debian 11 to Debian 13
> because the new toolchain needs glibc >= 2.34. Additional changes
> to accommodate the new base image and toolchain:
>
> - Use DEB822 format for enabling deb-src (Debian 13 sources format)
> - Add libc++1, libc++abi1, libunwind-19 runtime deps for the new
>   LLVM-based toolchain
> - Add zstd for the new .tar.zst archive format
> - Replace pip3 install tomli with python3-tomli system package
>   (Debian 13 enforces PEP 668)
> - Update artifact URL domain to artifacts.codelinaro.org
>
> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>

Acked-by: Alex Bennée <alex.bennee@linaro.org>

I assume you will merge with your next hexagon PR?

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH v3 1/1] tests/docker: Update hexagon cross toolchain to 22.1.0

[Brian Cain]

[-- Attachment #1: Type: text/plain, Size: 1553 bytes --]

On Wed, Mar 4, 2026 at 8:51 AM Alex Bennée <alex.bennee@linaro.org> wrote:

> Brian Cain <brian.cain@oss.qualcomm.com> writes:
>
> > Update the hexagon cross-compiler Docker container to use toolchain
> > version 22.1.0, replacing the previous 12.Dec.2023 release.
> >
> > This requires upgrading the base image from Debian 11 to Debian 13
> > because the new toolchain needs glibc >= 2.34. Additional changes
> > to accommodate the new base image and toolchain:
> >
> > - Use DEB822 format for enabling deb-src (Debian 13 sources format)
> > - Add libc++1, libc++abi1, libunwind-19 runtime deps for the new
> >   LLVM-based toolchain
> > - Add zstd for the new .tar.zst archive format
> > - Replace pip3 install tomli with python3-tomli system package
> >   (Debian 13 enforces PEP 668)
> > - Update artifact URL domain to artifacts.codelinaro.org
> >
> > Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> > Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
>
> Acked-by: Alex Bennée <alex.bennee@linaro.org>
>
> I assume you will merge with your next hexagon PR?
>
>
Yeah - can do.  But I'd prefer to put it in its own PR just so we isolate
the impact of toolchain changes from anything else.

Can you review Matheus' dirent64 change when you get a chance?  That is
required for the new toolchain.

https://lore.kernel.org/qemu-devel/af31d21c4d668cfb940ba4159f584fa6454c3d82.1772107448.git.matheus.bernardino@oss.qualcomm.com/



> --
> Alex Bennée
> Virtualisation Tech Lead @ Linaro
>

[-- Attachment #2: Type: text/html, Size: 2996 bytes --]

Re: [PATCH v3 0/1] Update hexagon cross container to 22.1.0

[Alex Bennée]

Brian Cain <brian.cain@oss.qualcomm.com> writes:

> *** Note *** that this patch should not land without
> "tests/tcg/multiarch/linux-test: use portable alternative for dirent64",
> a newer musl present in this toolchain exposes this test issue.
>
> Changes in v3:
>  * change debian from 12->13

Actually I meant to grab this one, but I get merge conflicts :-/


>
> Changes in v2:
> * none -> v2 was unintentionally chosen for the first rev of
> this patch.  :(
>
> v2: https://lore.kernel.org/qemu-devel/20260303175444.1540049-1-brian.cain@oss.qualcomm.com/
> v1: <none>
>
> Brian Cain (1):
>   tests/docker: Update hexagon cross toolchain to 22.1.0
>
>  .../dockerfiles/debian-hexagon-cross.docker   | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH v3 0/1] Update hexagon cross container to 22.1.0

[Alex Bennée]

Alex Bennée <alex.bennee@linaro.org> writes:

> Brian Cain <brian.cain@oss.qualcomm.com> writes:
>
>> *** Note *** that this patch should not land without
>> "tests/tcg/multiarch/linux-test: use portable alternative for dirent64",
>> a newer musl present in this toolchain exposes this test issue.
>>
>> Changes in v3:
>>  * change debian from 12->13
>
> Actually I meant to grab this one, but I get merge conflicts :-/

Conflicts with:

e2d4646a026 * tests/docker: upgrade most non-lcitool debian tests to debian 13

>
>
>>
>> Changes in v2:
>> * none -> v2 was unintentionally chosen for the first rev of
>> this patch.  :(
>>
>> v2: https://lore.kernel.org/qemu-devel/20260303175444.1540049-1-brian.cain@oss.qualcomm.com/
>> v1: <none>
>>
>> Brian Cain (1):
>>   tests/docker: Update hexagon cross toolchain to 22.1.0
>>
>>  .../dockerfiles/debian-hexagon-cross.docker   | 19 +++++++++++--------
>>  1 file changed, 11 insertions(+), 8 deletions(-)

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH v3 0/1] Update hexagon cross container to 22.1.0

[Brian Cain]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

On Wed, Mar 4, 2026 at 11:54 AM Alex Bennée <alex.bennee@linaro.org> wrote:

> Alex Bennée <alex.bennee@linaro.org> writes:
>
> > Brian Cain <brian.cain@oss.qualcomm.com> writes:
> >
> >> *** Note *** that this patch should not land without
> >> "tests/tcg/multiarch/linux-test: use portable alternative for dirent64",
> >> a newer musl present in this toolchain exposes this test issue.
> >>
> >> Changes in v3:
> >>  * change debian from 12->13
> >
> > Actually I meant to grab this one, but I get merge conflicts :-/
>
> Conflicts with:
>
> e2d4646a026 * tests/docker: upgrade most non-lcitool debian tests to
> debian 13
>
>
oops.  I'll rebase and send a v4.



> >
> >
> >>
> >> Changes in v2:
> >> * none -> v2 was unintentionally chosen for the first rev of
> >> this patch.  :(
> >>
> >> v2:
> https://lore.kernel.org/qemu-devel/20260303175444.1540049-1-brian.cain@oss.qualcomm.com/
> >> v1: <none>
> >>
> >> Brian Cain (1):
> >>   tests/docker: Update hexagon cross toolchain to 22.1.0
> >>
> >>  .../dockerfiles/debian-hexagon-cross.docker   | 19 +++++++++++--------
> >>  1 file changed, 11 insertions(+), 8 deletions(-)
>
> --
> Alex Bennée
> Virtualisation Tech Lead @ Linaro
>

[-- Attachment #2: Type: text/html, Size: 2372 bytes --]