AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 <toni.saario@qt.io>
This commit is contained in:
Alexandru Croitor 2023-11-06 13:23:42 +01:00
parent d2c6e9ab99
commit b4738ebb1e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coin/instructions/call_host_install.yaml
View File

@ -8,7 +8,7 @@ instructions:
enable_if: enable_if:
condition: runtime condition: runtime
env_var: TESTED_MODULE_COIN env_var: TESTED_MODULE_COIN
equals_value: qtbase contains_value: qtbase
userMessageOnFailure: > userMessageOnFailure: >
Failed to install package. Failed to install package.
- type: ExecuteCommand - type: ExecuteCommand
@ -19,6 +19,6 @@ instructions:
disable_if: disable_if:
condition: runtime condition: runtime
env_var: TESTED_MODULE_COIN env_var: TESTED_MODULE_COIN
equals_value: qtbase contains_value: qtbase
userMessageOnFailure: > userMessageOnFailure: >
Failed to install package. Failed to install package.

4
coin/instructions/call_target_install.yaml
View File

@ -8,7 +8,7 @@ instructions:
enable_if: enable_if:
condition: runtime condition: runtime
env_var: TESTED_MODULE_COIN env_var: TESTED_MODULE_COIN
equals_value: qtbase contains_value: qtbase
userMessageOnFailure: > userMessageOnFailure: >
Failed to install package. Failed to install package.
- type: ExecuteCommand - type: ExecuteCommand
@ -19,6 +19,6 @@ instructions:
disable_if: disable_if:
condition: runtime condition: runtime
env_var: TESTED_MODULE_COIN env_var: TESTED_MODULE_COIN
equals_value: qtbase contains_value: qtbase
userMessageOnFailure: > userMessageOnFailure: >
Failed to install package. Failed to install package.