From 30373669bc6b4fef5e364374f0cdf722f75ba038 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Wed, 24 Feb 2021 18:46:46 +0100 Subject: [PATCH] array params can't be used in scripts? --- kernel-build-debian-task.yaml | 9 ++++++--- kernel-build-pine64-armbian.yaml | 5 ++--- kernel-build-riotboard.yaml | 8 +++----- kernel-build-trimslice.yaml | 5 ++--- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/kernel-build-debian-task.yaml b/kernel-build-debian-task.yaml index e16f0e3..476de01 100644 --- a/kernel-build-debian-task.yaml +++ b/kernel-build-debian-task.yaml @@ -12,9 +12,12 @@ spec: - name: kernel_version type: string - name: make_flags - type: array + type: string + default: "" - name: config type: string + - name: localversion + type: string resources: inputs: - name: kernel-configs @@ -46,14 +49,14 @@ spec: echo "res.input.ke...path: $(resources.inputs.kernel-configs.path)" echo $PATH cp $(resources.inputs.kernel-configs.path)/$(params.config) \ - /usr/src/linux-source-${VER}/.config || exit 1 + /usr/src/linux-source-${params.kernel_version}/.config || exit 1 cd /usr/src/linux-source-$(params.kernel_version) #distcc config echo "localhost/1,cpp,lzo --randomize distcc-0.distcc,cpp,lzo distcc-1.distcc,cpp,lzo distcc-2.distcc,cpp,lzo distcc-3.distcc,cpp,lzo" >/etc/distcc/hosts echo "ALL DISTCC HOSTS" distcc --show-hosts echo "/ALL DISTCC HOSTS" - distcc-pump make -j20 bindeb-pkg CC=distcc $(params.make_flags[*]) + distcc-pump make -j20 bindeb-pkg CC=distcc LOCALVERSION=$(params.localversion) $(params.make_flags) workspaces: - name: usr-src mountPath: /usr/src \ No newline at end of file diff --git a/kernel-build-pine64-armbian.yaml b/kernel-build-pine64-armbian.yaml index 494dd2f..5ecb7f7 100644 --- a/kernel-build-pine64-armbian.yaml +++ b/kernel-build-pine64-armbian.yaml @@ -10,9 +10,8 @@ spec: value: '5.10' - name: config value: pine64-armbian - - name: make_flags - value: - - LOCALVERSION=-pine1 + - name: localversion + value: -pine1 resources: inputs: - name: kernel-configs diff --git a/kernel-build-riotboard.yaml b/kernel-build-riotboard.yaml index 9e762b9..6c67666 100644 --- a/kernel-build-riotboard.yaml +++ b/kernel-build-riotboard.yaml @@ -10,12 +10,10 @@ spec: value: '5.10' - name: config value: riotboard + - name: localversion + value: -riot2 - name: make_flags - value: - - LOCALVERSION=-riot2 - - ARCH=arm - - KBUILD_DEBARCH=armhf - - CROSS_COMPILE=arm-linux-gnueabihf- + value: ARCH=arm KBUILD_DEBARCH=armhf CROSS_COMPILE=arm-linux-gnueabihf- resources: inputs: - name: kernel-configs diff --git a/kernel-build-trimslice.yaml b/kernel-build-trimslice.yaml index d34b0b2..316ecb7 100644 --- a/kernel-build-trimslice.yaml +++ b/kernel-build-trimslice.yaml @@ -10,9 +10,8 @@ spec: value: '5.10' - name: config value: trimslice - - name: make_flags - value: - - LOCALVERSION=-trimslice1 + - name: localversion + value: -trimslice1 resources: inputs: - name: kernel-configs