From 1a28d5735a007164d95fae006a6c6e0e007f9103 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 13 Feb 2026 16:04:44 +0200 Subject: [PATCH] Add missing comment line to describe patchelf usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patchelf is added to fix dependencies in shared ffmpeg libs (amends 83adc86c532f826565729cd963996222033e840c) Pick-to: 6.8 Task-number: QTBUG-120990 Change-Id: Ia9359c1a77e82203d53e3d2940885a0c254024c9 Reviewed-by: Edward Welbourne Reviewed-by: Simo Fält (cherry picked from commit 7a5b6bdeaa8a418943257c9b79adb1164fd8c482) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 672289571101b0e62cf44558691eb0625ba23ee5) --- coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 3 +-- coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh index 0b2de252..9af34998 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh @@ -236,9 +236,8 @@ installPackages+=(cifs-utils) installPackages+=(uml-utilities) # To save iptables rules installPackages+=(iptables-persistent) - +# Fix dependencies in shared ffmpeg libs installPackages+=(patchelf) - # For Firebird in RTA installPackages+=(libtommath-dev) # For tst_license.pl with all the machines generating SBOM diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh index 67233502..fe459d05 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh @@ -245,7 +245,7 @@ installPackages+=(keyutils) installPackages+=(cifs-utils) # VxWorks QEMU network setup (tunctl) installPackages+=(uml-utilities) - +# Fix dependencies in shared ffmpeg libs installPackages+=(patchelf) echo "Running update for apt"