From 08691342122d4e7f49091aaff0d48dc9f82b7fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 10 Jan 2024 15:10:38 +0200 Subject: [PATCH] COIN: Enable setting Debian target distro with env variable Change-Id: I8cc0e9127ee7dd1e810812688ad32e759510cbe9 Reviewed-by: Toni Saario (cherry picked from commit d4568bcfdbf17866436eae8d96ceb7ae035ecf5d) Reviewed-by: Qt Cherry-pick Bot --- coin/instructions/debian/debian_build_module.yaml | 2 +- coin/instructions/debian/prepare_debian_env.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/instructions/debian/debian_build_module.yaml b/coin/instructions/debian/debian_build_module.yaml index a302c07bef2..0aa239e1c6c 100644 --- a/coin/instructions/debian/debian_build_module.yaml +++ b/coin/instructions/debian/debian_build_module.yaml @@ -104,7 +104,7 @@ instructions: - type: ExecuteCommand command: ["sbuild", "--build-dep-resolver=apt", - "-sAd", "tqtc-focal", + "-sAd", "{{.Env.COIN_TARGET_DIST}}", "-c", "{{.Env.COIN_SBUILD_CHROOT}}", "--build-dir", "output/debian_packages", "--extra-repository={{.Env.COIN_EXTRA_DEBIAN_REPO}}", diff --git a/coin/instructions/debian/prepare_debian_env.yaml b/coin/instructions/debian/prepare_debian_env.yaml index fd130cebc72..ab8d51ab600 100644 --- a/coin/instructions/debian/prepare_debian_env.yaml +++ b/coin/instructions/debian/prepare_debian_env.yaml @@ -4,6 +4,13 @@ enable_if: property: features contains_value: DebianPackaging instructions: + - type: EnvironmentVariable + variableName: COIN_TARGET_DIST + variableValue: "tqtc-focal" + enable_if: + condition: runtime + env_var: COIN_TARGET_DIST + equals_value: null - type: EnvironmentVariable variableName: COIN_SBUILD_CHROOT variableValue: "stable-arm64-sbuild"