coin: Fix installation failing during tqtc-qt5.git integrations

During tqtc repo submodule updates, the repo names contain the tqtc- prefix. But during the final tqtc-qt5.git integration, the submodule names don't contain the tqtc- prefix. This causes errors like: CMake Error: Error processing file: /qt-cmake-private-install.cmake Use contains_value in the condition instead of equals_value, to ensure it works for both scenarios. This assumes there will be no repos that contain 'qtbase' in their name which are not the original qtbase repo. Amends 7e334bc7fc4c6c9de379e19076197af5b7fef9ee picked from commit 6556a943ce8625ce1043a2da64deed187b7ce209 in the tqtc repo, so that we don't need to do it for every new lts branch. Change-Id: Ib38c855525c91032d35c235bf33d860204474fe0 Reviewed-by: Toni Saario <[email protected]>
qt · Nov 22, 2023 · b4738eb · b4738eb
1 parent d2c6e9a
commit b4738eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/coin/instructions/call_host_install.yaml b/coin/instructions/call_host_install.yaml
@@ -8,7 +8,7 @@ instructions:
  enable_if:
  condition: runtime
  env_var: TESTED_MODULE_COIN
- equals_value: qtbase
+ contains_value: qtbase
  userMessageOnFailure: >
  Failed to install package.
  - type: ExecuteCommand
@@ -19,6 +19,6 @@ instructions:
  disable_if:
  condition: runtime
  env_var: TESTED_MODULE_COIN
- equals_value: qtbase
+ contains_value: qtbase
  userMessageOnFailure: >
  Failed to install package.
diff --git a/coin/instructions/call_target_install.yaml b/coin/instructions/call_target_install.yaml
@@ -8,7 +8,7 @@ instructions:
  enable_if:
  condition: runtime
  env_var: TESTED_MODULE_COIN
- equals_value: qtbase
+ contains_value: qtbase
  userMessageOnFailure: >
  Failed to install package.
  - type: ExecuteCommand
@@ -19,6 +19,6 @@ instructions:
  disable_if:
  condition: runtime
  env_var: TESTED_MODULE_COIN
- equals_value: qtbase
+ contains_value: qtbase
  userMessageOnFailure: >
  Failed to install package.