diff options
| author | Simo Fält <simo.falt@qt.io> | 2024-01-10 15:10:38 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-01-31 11:36:58 +0000 |
| commit | 08691342122d4e7f49091aaff0d48dc9f82b7fd9 (patch) | |
| tree | be50843400b9ad121d9aa1916c57237e97db1f83 /coin | |
| parent | 3154bf2a7ba96c8787179f9bba70134cb7477236 (diff) | |
COIN: Enable setting Debian target distro with env variable
Change-Id: I8cc0e9127ee7dd1e810812688ad32e759510cbe9
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit d4568bcfdbf17866436eae8d96ceb7ae035ecf5d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/debian/debian_build_module.yaml | 2 | ||||
| -rw-r--r-- | coin/instructions/debian/prepare_debian_env.yaml | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/coin/instructions/debian/debian_build_module.yaml b/coin/instructions/debian/debian_build_module.yaml index a302c07bef..0aa239e1c6 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 fd130cebc7..ab8d51ab60 100644 --- a/coin/instructions/debian/prepare_debian_env.yaml +++ b/coin/instructions/debian/prepare_debian_env.yaml @@ -5,6 +5,13 @@ enable_if: 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" enable_if: |