lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-25 22:27:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

coin: Explicitly specify SBOM_PYTHON_APPS_PATH for all platforms

Browse Source 
Instead of relying on the qtbase coin instructions to compute the
SBOM_PYTHON_APPS_PATH path based on the platform, which does not work
reliably, especially when multiple python installations are present,
explicitly specify the path in the provisioning scripts.

Amends 1f2fb6312c

Task-number: QTBUG-122899
Task-number: QTBUG-124453
Task-number: QTBUG-125211
Change-Id: I097fd1c4119a203d82f88c477dbf0fc0f67f19f2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 6f991b55a3)
This commit is contained in:
Alexandru Croitor
2024-10-07 16:41:27 +02:00
parent db32c6b6ef
commit 81d2c30cb4
13 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh
View File

@@ -258,5 +258,10 @@ pip config --user set global.extra-index-url https://pypi.org/simple/
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
# SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
# Provisioning during installation says:
# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.'
# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
OpenSSLVersion="$(openssl version |cut -b 9-14)"
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt