[DistroKit] [PATCH 1/2] gitignore: ignore _r5 toolchain from ti

[DistroKit] [PATCH 1/2] gitignore: ignore _r5 toolchain from ti

[Fabian Pflug]

The ci-prepare script will create a selected_toolchain_r5 file, that was
not part of gitignore. If not created by ci, then it is still needed to
be created manually and should therefore be ignored and never checked
in.

Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de>
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8d11b907..8f169b45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 /selected_collectionconfig
 /selected_platformconfig
 /selected_ptxconfig
-/selected_toolchain
+/selected_toolchain*
 /p
 /src
 *.sw*
-- 
2.47.3

[DistroKit] [PATCH 2/2] ci-prepare: create r5 toolchain system independent

[Fabian Pflug]

The previously linked toolchain is very system dependent and not
portable and might give problems down the line if the v7a compiler and
tollchain might change. Use the ptxdist with the v7a platformconfig to
get a suitable toolchain gives the same result, but much cleaner to
read.
Only downside is, that the currenlty selected toolchain would be
overwritten. Therefor move it out of the way before createing _r5
toolchain and move then back in afterwards.

Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de>
---
 ci-prepare | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ci-prepare b/ci-prepare
index 2cd9e1b5..4144d28e 100755
--- a/ci-prepare
+++ b/ci-prepare
@@ -1,6 +1,14 @@
 #!/bin/sh
 case "${JOB_BASE_NAME}" in
        *v8a*)
-               ln -sfvT /opt/OSELAS.Toolchain-2024.11.1/arm-v7a-linux-gnueabihf/gcc-14.2.1-clang-19.1.7-glibc-2.40-binutils-2.43.1-kernel-6.11.6-sanitized/bin selected_toolchain_r5
+                [ -e selected_toolchain_r5 ] || {
+                        # store away the currently selected toolchain
+                        [ -e selected_toolchain ] && mv selected_toolchain selected_toolchain_ci_backup
+                        # create toolchain based on v7a platform, which is needed for R5 processor.
+                        ptxdist toolchain --platformconfig=configs/platform-v7a/platformconfig
+                        mv selected_toolchain selected_toolchain_r5
+                        # restore the selected toolchain, if there was one before
+                        [ -e selected_toolchain_ci_backup ] && mv selected_toolchain_ci_backup selected_toolchain
+                }
                ;;
-esac
\ No newline at end of file
+esac
-- 
2.47.3

Re: [DistroKit] [PATCH 1/2] gitignore: ignore _r5 toolchain from ti

[Robert Schwebel]

applied series to next

On Tue, Oct 21, 2025 at 03:23:40PM +0200, Fabian Pflug wrote:
> The ci-prepare script will create a selected_toolchain_r5 file, that was
> not part of gitignore. If not created by ci, then it is still needed to
> be created manually and should therefore be ignored and never checked
> in.
> 
> Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de>
> ---
>  .gitignore | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 8d11b907..8f169b45 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -4,7 +4,7 @@
>  /selected_collectionconfig
>  /selected_platformconfig
>  /selected_ptxconfig
> -/selected_toolchain
> +/selected_toolchain*
>  /p
>  /src
>  *.sw*
> -- 
> 2.47.3
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |