From 70f168a4224f03996c4feeba527c3702f561b1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Tomkiel?= Date: Thu, 24 Oct 2024 13:43:01 +0200 Subject: [PATCH] [Tizen] Pass runner's path as QEMU argument (#36173) * Allow runner's path to be passed * Bump version --- integrations/docker/images/base/chip-build/version | 2 +- .../images/stage-3/chip-build-tizen-qemu/Dockerfile | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index c79147db54915d..f44401475bad25 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -85 : [Silabs] Update Silabs docker Simplicity SDK v2024.6.2 \ No newline at end of file +86 : [Tizen] Pass runner's path as QEMU argument \ No newline at end of file diff --git a/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile b/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile index d731ab2dc6a804..2d0bb55e3afeef 100644 --- a/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-tizen-qemu/Dockerfile @@ -182,9 +182,13 @@ RUN set -x \ && echo -n \ "#!/bin/bash\n" \ "grep -q 'rootshell' /proc/cmdline && exit\n" \ - "if [[ -x /mnt/chip/runner.sh ]]; then\n" \ + "runner=\$(grep -o 'runner=[^ ]*' /proc/cmdline | sed 's/runner=//')\n" \ + "if [[ -z \"\$runner\" ]]; then\n" \ + " runner='/mnt/chip/runner.sh' \n" \ + "fi\n" \ + "if [[ -x \"\$runner\" ]]; then\n" \ " echo '### RUNNER START ###'\n" \ - " /mnt/chip/runner.sh\n" \ + " \"\$runner\"\n" \ " echo '### RUNNER STOP:' \$?\n" \ "else\n" \ " read -r -t 5 -p 'Press ENTER to access root shell...' && exit || echo ' timeout.'\n" \