[DistroKit] [PATCH v2 1/3] ci-prepare: fix indentation

[DistroKit] [PATCH v2 1/3] ci-prepare: fix indentation

[Roland Hieber]

Use tabs for indentation as anywhere else in the codebase. No functional
change intended.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2:
* reorder to beginning of series
* fix unindented pun in the commit message

v1: https://lore.distrokit.org/distrokit/20251022122947.241881-3-rhi@pengutronix.de
---
 ci-prepare | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ci-prepare b/ci-prepare
index 4144d28eca2f..1e2605c05553 100755
--- a/ci-prepare
+++ b/ci-prepare
@@ -1,14 +1,14 @@
 #!/bin/sh
 case "${JOB_BASE_NAME}" in
-       *v8a*)
-                [ -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
-                }
-               ;;
+	*v8a*)
+		[ -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
-- 
2.47.3

[DistroKit] [PATCH v2 2/3] ci-prepare: use the correct ptxdist script inside Jenkins environment

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2:
* reorder after indentation change

v1: https://lore.distrokit.org/distrokit/20251022122947.241881-1-rhi@pengutronix.de
---
 ci-prepare | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci-prepare b/ci-prepare
index 1e2605c05553..93e9bc0d68ca 100755
--- a/ci-prepare
+++ b/ci-prepare
@@ -1,11 +1,13 @@
 #!/bin/sh
+# Note: this script is sourced by Jenkins, which has the auto-detected PTXdist
+# version symlinked to ./p
 case "${JOB_BASE_NAME}" in
 	*v8a*)
 		[ -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
+			./p 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
-- 
2.47.3

[DistroKit] [PATCH v2 3/3] ci-prepare: make return value safe

[Roland Hieber]

If ./selected_toolchain_r5 does not exist, the script will return
falsely using the return value of the last [ -e selected_toolchain_r5 ]
call, failing the build. Ignore the return values by wrapping the test
calls into ifs instead of relying on short-circuit.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
v2:
* reorder after indentation change
* fix missing negation when testing for selected_toolchain_r5 existence
* improve commit message

v1: https://lore.distrokit.org/distrokit/20251022122947.241881-2-rhi@pengutronix.de
---
 ci-prepare | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ci-prepare b/ci-prepare
index 93e9bc0d68ca..e4263bf7dac3 100755
--- a/ci-prepare
+++ b/ci-prepare
@@ -3,14 +3,18 @@
 # version symlinked to ./p
 case "${JOB_BASE_NAME}" in
 	*v8a*)
-		[ -e selected_toolchain_r5 ] || {
+		if [ ! -e selected_toolchain_r5 ]; then
 			# store away the currently selected toolchain
-			[ -e selected_toolchain ] && mv selected_toolchain selected_toolchain_ci_backup
+			if [ -e selected_toolchain ]; then
+				mv selected_toolchain selected_toolchain_ci_backup
+			fi
 			# create toolchain based on v7a platform, which is needed for R5 processor.
 			./p 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
-		}
+			if [ -e selected_toolchain_ci_backup ]; then
+				mv selected_toolchain_ci_backup selected_toolchain
+			fi
+		fi
 		;;
 esac
-- 
2.47.3