Update submodules on '6.10.0 in qt/qt5'

Change-Id: I31416716d5267d186f30650bf25694d8fa6b752c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.10
+	branch = 6.10.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.10
+	branch = 6.10.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.10
+	branch = 6.10.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.10
+	branch = 6.10.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.10
+	branch = 6.10.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.10
+	branch = 6.10.0
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.10
+	branch = 6.10.0
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.10
+	branch = 6.10.0
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.10
+	branch = 6.10.0
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.10
+	branch = 6.10.0
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,88 +252,88 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.10
+	branch = 6.10.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.10
+	branch = 6.10.0
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.10
+	branch = 6.10.0
 	status = addon

coin/platform_configs/cmake_platforms.yaml

@@ -7,7 +7,14 @@ Include: [
     macos.yaml
     ]
 Configurations:
-# Build on Ubuntu 22.04
+# Build on Ubuntu 22.04 and test on both X11 and Wayland later
+-
+    Id: 'ubuntu-22.04-developer-build'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
+    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
+    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE']
 -
     Id: 'ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
@@ -18,6 +25,19 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE'
     ]
+# Test on Ubuntu 22.04 X11
+-
+    Id: 'ubuntu-22.04-developer-build-x11-tests'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'TestOnly']
+    Platform dependency: 'ubuntu-22.04-developer-build'
+-
+    Id: 'ubuntu-22.04-x11-tests'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'TestOnly']
+    Platform dependency: 'ubuntu-22.04'
 # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
 -
     Id: 'ubuntu-24.04-arm64-developer-build'
@@ -92,13 +112,13 @@ Configurations:
     Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
     Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
     Platform dependency: 'ubuntu-24.04-x64-developer-build'
 -
     Id: 'ubuntu-24.04-x64-x11-tests'
     Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
     Platform dependency: 'ubuntu-24.04-x64'
 -
     Id: 'opensuse-15.6-developer-build'
@@ -176,7 +196,7 @@ Configurations:
     Template: 'qtci-windows-11_24H2-x86_64-71'
     Compiler: 'MSVC2022'
     Target arch: 'arm64'
-    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Platform dependency: 'windows-10_22h2-mingw13'
     Environment variables: [
         'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -199,7 +219,7 @@ Configurations:
     Platform dependency: 'windows-10_22h2-mingw13'
     Environment variables: [
         'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
         'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
         'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
@@ -355,7 +375,7 @@ Configurations:
         'DEBIAN_RULES_REF=6.10_gles',
         'COIN_TARGET_DIST=tqtc-bookworm',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
-        'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
+        'COIN_SBUILD_CHROOT=bookworm-arm64-sbuild',
         'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
         'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
     ]

coin/platform_configs/cmake_platforms_static_release.yaml

@@ -24,6 +24,19 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
+-
+    Id: 'windows-11_23h2-arm64-msvc2022-minimal-static-test'
+    Template: 'qtci-windows-11_23H2-aarch64-53'
+    Compiler: 'MSVC2022'
+    Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
+    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
+        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
+        'VCPKG_HOST_TRIPLET=arm64-windows-qt',
+        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+    ]
 -
     Id: 'rhel-8.10-minimal-static-test'
     Template: 'qtci-linux-RHEL-8.10-x86_64-51'

coin/platform_configs/precheck.yaml

@@ -3,8 +3,8 @@ Module only: True
 Include: [
   cmake_platforms.yaml: [
     "ubuntu-22.04",
-    "ubuntu-24.04-x64-developer-build",
+    "ubuntu-22.04-developer-build",
-    "ubuntu-24.04-x64-developer-build-x11-tests",
+    "ubuntu-22.04-developer-build-x11-tests",
     "windows-11_24H2-msvc2022-developer-build",
     "ios-universal"
   ],

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -6,7 +6,7 @@ Include: [
   ],
   cmake_platforms.yaml: [
     "ubuntu-22.04",
-    "ubuntu-24.04-x64-developer-build",
+    "ubuntu-22.04-developer-build",
     "ubuntu-24.04-arm64",
     "opensuse-15.6-developer-build",
     "sles-15_sp6-static",

coin/platform_configs/qtsaferenderer.yaml

@@ -7,7 +7,7 @@ Include: [
   ],
   cmake_platforms.yaml: [
     "ubuntu-22.04",
-    "ubuntu-24.04-x64-developer-build",
+    "ubuntu-22.04-developer-build",
     "ubuntu-24.04-arm64",
     "opensuse-15.6-developer-build",
     "sles-15_sp6-static",
@@ -70,6 +70,17 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
+-
+    Id: 'Windows-MSVC2022-arm64_Static-23H2'
+    Template: 'qtci-windows-11_23H2-aarch64-53'
+    Compiler: 'MSVC2022'
+    Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']
+    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
+        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+    ]
 -
     Id: 'Windows-MSVC2022_Static'
     Template: 'qtci-windows-10_22H2-x86_64-53'

coin/provisioning/common/linux/android/gradle_project/app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
         android:allowBackup="true"
         android:label="gradle_project"
         android:supportsRtl="true"
-        tools:targetApi="34">
+        tools:targetApi="35">
         <activity
             android:name=".MainActivity"
             android:exported="true">

coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-agp = "8.8.0"
+agp = "8.10.1"
-core = "1.13.1"
+core = "1.16.0"
-appcompat = "1.6.1"
+appcompat = "1.7.1"
-material = "1.11.0"
+material = "1.12.0"
-constraintlayout = "2.1.4"
+constraintlayout = "2.2.1"
 
 [libraries]
 core = { group = 'androidx.core', name = "core", version.ref = "core" }

coin/provisioning/common/linux/android_emulator_launcher.sh

@@ -25,13 +25,12 @@ function check_for_android_device
 }
 
 # WARNING: On the very first boot of the emulator it happens that the device
-# "finishes" booting and getprop shows bootanim=stopped and
+# "finishes" booting and getprop shows boot_completed=1. But sometimes not all
-# boot_completed=1. But sometimes not all packages have been installed (`pm
+# packages have been installed (`pm list packages` shows only 16 packages
-# list packages` shows only 16 packages installed), and after around half a
+# installed), and after around half a minute the boot animation starts spinning
-# minute the boot animation starts spinning (bootanim=running) again despite
+# again despite boot_completed=1 all the time. After some minutes the boot
-# boot_completed=1 all the time. After some minutes the boot animation stops
+# animation stops again and the list of packages contains 80 packages.
-# again and the list of packages contains 80 packages. Only then the device is
+# Only then the device is fully booted, and only then is dev.bootcomplete=1.
-# fully booted, and only then is dev.bootcomplete=1.
 #
 # To reproduce the emulator booting as the first time, you have to delete the
 # cached images found inside $HOME/.android/avd/{avd_name}.avd/ especially the
@@ -39,11 +38,10 @@ function check_for_android_device
 function check_if_fully_booted
 {
     # The "getprop" command separates lines with \r\n so we trim them
-    bootanim=$(      timeout 1 "$ADB_EXEC" shell getprop init.svc.bootanim  | tr -d '\r\n')
     boot_completed=$(timeout 1 "$ADB_EXEC" shell getprop sys.boot_completed | tr -d '\r\n')
     bootcomplete=$(  timeout 1 "$ADB_EXEC" shell getprop dev.bootcomplete   | tr -d '\r\n')
-    echo "bootanim=$bootanim boot_completed=$boot_completed bootcomplete=$bootcomplete"
+    echo "boot_completed=$boot_completed bootcomplete=$bootcomplete"
-    [ "$bootanim" = stopped ] && [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ]
+    [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ]
 }
 
 for counter in $(seq ${EMULATOR_MAX_RETRIES})

coin/provisioning/common/linux/android_linux.sh

@@ -240,7 +240,7 @@ cp -r "${scripts_dir_name}/android/gradle_project" /tmp/gradle_project
 cd /tmp/gradle_project
 # Get Gradle files from qtbase
 qtbaseGradleUrl="https://code.qt.io/cgit/qt/qtbase.git/plain/src/3rdparty/gradle"
-commit_sha="e5f79573fe2f21cf7bea8f63386f39bb18b351f0"
+commit_sha="5bc160bc8385f6a2e590ffb964d1d390c1ab4ce6"
 curl "$qtbaseGradleUrl/gradle.properties?h=$commit_sha" > gradle.properties
 curl "$qtbaseGradleUrl/gradlew?h=$commit_sha" > gradlew
 curl "$qtbaseGradleUrl/gradlew.bat?h=$commit_sha" > gradlew.bat

coin/provisioning/common/linux/apt_wait_loop.sh

@@ -5,9 +5,13 @@
 set -ex
 
 function waitLoop {
+    while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1; do
+        echo "Waiting for other software managers to finish... 1/2"
+        sleep 0.5
+    done
 
-while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
+    while sudo fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do
-    echo "Waiting for other software managers to finish..."
+        echo "Waiting for other software managers to finish... 2/2"
-    sleep 0.5
+        sleep 0.5
-done
+    done
 }

coin/provisioning/common/macos/docker.sh

@@ -23,7 +23,7 @@ DownloadURL "$urlCache" "$urlOccifical" "$sha" "/tmp/Docker_${chip}.dmg"
 
 sudo hdiutil attach "/tmp/Docker_${chip}.dmg"
 sudo /Volumes/Docker/Docker.app/Contents/MacOS/install --accept-license --user qt
-sudo hdiutil detach /Volumes/Docker
+sudo hdiutil detach /Volumes/Docker -force
 
 # Add registry mirror for docker images
 mkdir "$HOME/.docker"

coin/provisioning/common/macos/homebrew.sh

@@ -12,10 +12,10 @@ INSTALLTYPE="$1"
 VERSION="$2"
 CHECKSUM="$3"
 
-DEFAULT_PKG_VERSION="4.4.21"
+DEFAULT_PKG_VERSION="4.6.8"
-DEFAULT_PKG_VERSION_CHECKSUM="cd83c4123d5db7d07eb3042f1c785ed7f599183c5c542040bc6abfa722583861"
+DEFAULT_PKG_VERSION_CHECKSUM="91157b34fcc58eeaf4149f2f2b3063f2904a3d5e5cc3bf84d3c79627ba26afd9"
-DEFAULT_GIT_VERSION="deb02e27d99fd2cb27ae16760e3a5272b612fded"
+DEFAULT_GIT_VERSION="bce07c53def3dbe54aa14a88adfc63eb7ba91f48"
-DEFAULT_GIT_VERSION_CHECKSUM="a30b9fbf0d5c2cff3eb1d0643cceee30d8ba6ea1bb7bcabf60d3188bd62e6ba6"
+DEFAULT_GIT_VERSION_CHECKSUM="c95d3a95a38f9c2cb122335a2101d49af196a1c5"
 
 source "$(dirname "$0")"/../../common/unix/DownloadURL.sh
 source "$(dirname "$0")"/../../common/unix/SetEnvVar.sh
@@ -32,8 +32,6 @@ installPkg() {
         "/tmp/Homebrew-$VERSION.pkg"
 
     sudo installer -pkg "/tmp/Homebrew-$VERSION.pkg" -target /
-    # Add homebrew to PATH
-    SetEnvVar "PATH" "/opt/homebrew/bin:\$PATH"
 
     echo "Homebrew = $VERSION" >> ~/versions.txt
 }
@@ -55,7 +53,7 @@ installGit() {
     DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw"
     { pw=$(cat "/Users/qt/pw"); } 2> /dev/null
     sudo chmod 755 /tmp/homebrew_install.sh
-    { (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null
+    { (echo "$pw" | CI=1 /tmp/homebrew_install.sh); } 2> /dev/null
     rm -f "/Users/qt/pw"
 }
 
@@ -65,6 +63,14 @@ else
     installPkg
 fi
 
+ARCH_TYPE=$(arch)
+# Add homebrew to PATH
+if [ "$ARCH_TYPE" == "arm64" ]; then
+    SetEnvVar "PATH" "/opt/homebrew/bin:\$PATH"
+else
+    SetEnvVar "PATH" "/usr/local/bin:\$PATH"
+fi
+
 # Disable non-ascii output for homebrew to make logs more readable
 SetEnvVar "HOMEBREW_NO_COLOR" "1"
 SetEnvVar "HOMEBREW_NO_EMOJI" "1"

coin/provisioning/common/macos/libiodbc.sh

@@ -9,7 +9,17 @@ set -ex
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@"
+# HOMEBREW_DIR depends on acrhitecture
+ARCH_TYPE=$(arch)
+if [ "$ARCH_TYPE" == "arm64" ]; then
+    HOMEBREW_DIR="/opt/homebrew/Library/Taps/local/homebrew-libiodbc/Formula"
+else
+    HOMEBREW_DIR="/usr/local/Homebrew/Library/Taps/local/homebrew-libiodbc/Formula"
+fi
+
+brew tap-new local/libiodbc
+cp "${BASH_SOURCE%/*}/libiodbc.rb" "$HOMEBREW_DIR/"
+brew install local/libiodbc/libiodbc "$@"
 
 read -r -a arr <<< "$(brew list --versions libiodbc)"
 version=${arr[1]}

coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh

@@ -31,6 +31,12 @@ if ! command -v patchelf; then
     exit 1
 fi
 
+# Get patchelf version
+patchelf_version=$(patchelf --version 2>/dev/null | awk '{print $2}')
+if [[ "$patchelf_version" == "0.18.0" ]]; then
+    echo "WARNING: patchelf version 0.18.0 is known to have issues with Android." >&2
+fi
+
 ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale")
 stub_prefix="Qt6FFmpegStub-"
 

coin/provisioning/common/shared/testserver/californium/Dockerfile

@@ -4,12 +4,13 @@ RUN apt-get update && apt-get -y install $packages
 
 # Get californium-based CoAP test server
 WORKDIR /root/src
-ADD californium-*.tar.gz .
+ADD californium-3.8.0.tar.gz .
 RUN mv californium-* californium
 WORKDIR /root/src/californium
 ADD qt_changes.patch ./
 RUN patch -p1 < qt_changes.patch
-RUN mvn clean install -q -DskipTests
+ADD californium-m2deps-3.8.0.tar.gz /root
+RUN mvn clean install -o -q -DskipTests
 WORKDIR /
 
 EXPOSE 5683/udp 5684/udp

coin/provisioning/common/shared/testserver/docker_images.sh

@@ -60,6 +60,16 @@ DownloadURL  \
     24f8ca393f26c922739462e4586b8ced1ff75f99bfa795defa34a967b5a4a5a0  \
     californium-3.8.0.tar.gz
 mv californium-3.8.0.tar.gz "$SERVER_PATH/californium/"
+# Download cached maven dependencies for californium.
+# The dependency archive is built by
+# "mvn dependency:go-offline -DskipTests -Dos.detected.classifier=linux-x86_64"
+# and archived from /root/.m2
+DownloadURL  \
+    http://ci-files01-hki.ci.qt.io/input/docker/californium-m2deps-3.8.0.tar.gz \
+    http://ci-files01-hki.ci.qt.io/input/docker/californium-m2deps-3.8.0.tar.gz \
+    e2fade7dde3cca02bb910eed99a5d8b5cb8ff945240c65bf06ce50411d70d3f2  \
+    californium-m2deps-3.8.0.tar.gz
+mv californium-m2deps-3.8.0.tar.gz "$SERVER_PATH/californium/"
 
 
 echo 'Building the docker images...'

coin/provisioning/common/unix/install-ffmpeg-android.sh

@@ -48,6 +48,12 @@ build_ffmpeg_android() {
         target_cpu=i686
         openssl_libs="$openssl_android_path/x86"
         libs_prefix="_x86"
+    elif [ "$target_arch" == "arm32" ]; then
+        target_toolchain_arch="armv7a-linux-androideabi"
+        target_arch=arm
+        target_cpu=armv7-a
+        openssl_libs="$openssl_android_path/armeabi-v7a"
+        libs_prefix="_arm32-v7a"
     elif [ "$target_arch" == "arm64" ]; then
         target_toolchain_arch="aarch64-linux-android"
         target_arch=aarch64
@@ -116,6 +122,12 @@ elif  [ "$os" == "android-x86_64" ]; then
     envvar_latest="FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST"
     envvar_nightly1="FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY1"
     envvar_nightly2="FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY2"
+elif  [ "$os" == "android-arm32" ]; then
+    target_arch=arm32
+    target_dir="/usr/local/android/ffmpeg-arm32"
+    envvar_latest="FFMPEG_DIR_ANDROID_ARM32_NDK_LATEST"
+    envvar_nightly1="FFMPEG_DIR_ANDROID_ARM32_NDK_NIGHTLY1"
+    envvar_nightly2="FFMPEG_DIR_ANDROID_ARM32_NDK_NIGHTLY2"
 elif  [ "$os" == "android-arm64" ]; then
     target_arch=arm64
     target_dir="/usr/local/android/ffmpeg-arm64"
@@ -134,19 +146,19 @@ fi
 
 assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_LATEST"
 assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_LATEST"
-build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST"
+build_ffmpeg_android "$target_arch" "$target_dir/latest" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST"
-set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir"
+set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir/latest"
 
 if [ "${ANDROID_NDK_ROOT_NIGHTLY1}" ]; then
     assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY1"
     assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY1"
-    build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1"
+    build_ffmpeg_android "$target_arch" "$target_dir/nightly1" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1"
     set_ffmpeg_dir_env_var "$envvar_nightly1" "$target_dir/nightly1"
 fi
 
 if [ "${ANDROID_NDK_ROOT_NIGHTLY2}" ]; then
     assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY2"
     assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY2"
-    build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2"
+    build_ffmpeg_android "$target_arch" "$target_dir/nightly2" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2"
     set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir/nightly2"
 fi

coin/provisioning/common/unix/install-patchelf.sh

@@ -5,6 +5,7 @@
 
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # version 0.18.0 doesn't work correctly for Android binaries, so we use 0.17.2
+# See patchelf bugreport: https://github.com/NixOS/patchelf/issues/576.
 patchelf_version="0.17.2"
 
 url_cached="https://ci-files01-hki.ci.qt.io/input/android/patchelf/$patchelf_version.tar.gz"

coin/provisioning/common/windows/install-ffmpeg.ps1

@@ -30,6 +30,52 @@ function GetFfmpegDefaultConfiguration {
     return $defaultConfiguration
 }
 
+# Returns the absolute installation path of FFmpeg for this build
+# variant.
+function ResolveFFmpegInstallDir {
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]$buildSystem,
+
+        [Parameter(Mandatory = $false)]
+        [ValidateNotNullOrEmpty()]
+        [string]$ndkVer
+    )
+
+    if ($ndkVer) {
+        $prefix = "installed-ndk-$ndkVer"
+    } else {
+        $prefix = "installed"
+    }
+
+    return "C:\$ffmpeg_name\build\$buildSystem\$prefix"
+}
+
+# Returns the absolute installation path of FFmpeg for this build
+# variant. Returns a path that is compatible with MSYS.
+#
+# TODO: There is some code duplications here. Make a helper function
+# that translates native Windows paths into MSYS compatible paths.
+function ResolveFFmpegInstallDirMsys {
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]$buildSystem,
+
+        [Parameter(Mandatory = $false)]
+        [ValidateNotNullOrEmpty()]
+        [string]$ndkVer
+    )
+    if ($ndkVer) {
+        $prefix = "installed-ndk-$ndkVer"
+    } else {
+        $prefix = "installed"
+    }
+
+    return "/c/$ffmpeg_name/build/$buildSystem/$prefix"
+}
+
 function InstallFfmpeg {
     Param (
         [string]$config,
@@ -53,15 +99,16 @@ function InstallFfmpeg {
     $env:MSYSTEM = $msystem
 
     if ($ndk_ver) {
-        $prefix = "installed-ndk-$ndk_ver"
+        $installDir = ResolveFFmpegInstallDir -buildSystem $buildSystem -ndkVer $ndk_ver
+        $installDirForMsys = ResolveFFmpegInstallDirMsys -buildSystem $buildSystem -ndkVer $ndk_ver
     } else {
-        $prefix = "installed"
+        $installDir = ResolveFFmpegInstallDir -buildSystem $buildSystem
+        $installDirForMsys = ResolveFFmpegInstallDirMsys -buildSystem $buildSystem
     }
-    $installDir = "C:\$ffmpeg_name\build\$buildSystem\$prefix"
 
     $cmd = "cd /c/$ffmpeg_name"
     $cmd += " && mkdir -p build/$buildSystem && cd build/$buildSystem"
-    $cmd += " && ../../configure --prefix=$prefix $config"
+    $cmd += " && ../../configure --prefix=$installDirForMsys $config"
     if ($toolchain) {
         $cmd += " --toolchain=$toolchain"
     }
@@ -191,8 +238,8 @@ function InstallAndroidArmv7 {
     $config += " --extra-cflags=-I${openssl_path}/include --extra-ldflags=-L${openssl_path}/armeabi-v7a"
     $config += " --strip=$strip"
 
-
+    $buildSystem = "android-arm"
-    $result= InstallFfmpeg -config $config -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar $ffmpeg_dir_android_envvar_name -shared $shared -ndk_ver $ndk_version
+    $result= InstallFfmpeg -config $config -buildSystem $buildSystem -msystem "ANDROID_CLANG" -ffmpegDirEnvVar $ffmpeg_dir_android_envvar_name -shared $shared -ndk_ver $ndk_version
 
     Remove-Item -Path ${openssl_path}/armeabi-v7a/libcrypto.so
     Remove-Item -Path ${openssl_path}/armeabi-v7a/libssl.so
@@ -218,9 +265,14 @@ function InstallAndroidArmv7 {
 
     Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"cd C:/patchelf-0.17.2 && ./bootstrap.sh && ./configure && make install`"")
 
-    $command = "${PSScriptRoot}/../shared/fix_ffmpeg_dependencies.sh C:/${ffmpeg_name}/build/android-arm/installed/ _armeabi-v7a no"
+    $installDirForMsys = ResolveFFmpegInstallDirMsys -buildSystem $buildSystem -ndkVer $ndk_version
+    $command = "${PSScriptRoot}/../shared/fix_ffmpeg_dependencies.sh ${installDirForMsys} _armeabi-v7a no"
     $command = $command.Replace("\", "/")
-    Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"$command`"")
+    $patchResult = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"$command`"")
+    if ($patchResult.ExitCode) {
+        Write-Host "fix_ffmpeg_dependencies.sh did not finish successfully"
+        return $false
+    }
 
     return $result
 }

coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh

@@ -249,6 +249,8 @@ installPackages+=(zlib1g-dev)
 installPackages+=(libusb-1.0-0-dev)
 # password management support for Qt Creator
 installPackages+=(libsecret-1-dev)
+installPackages+=(debian-archive-keyring)
+
 
 echo "Running update for apt"
 waitLoop

coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh

@@ -41,8 +41,8 @@ EOF
 sudo sbuild-adduser "$LOGNAME"
 newgrp sbuild
 
-# Create chroot for debian stable
+# Create chroot for debian bookworm
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-arm64
 
 echo "Create chroot for Ubuntu Jammy"
 # First we need update the deboostrap scripts
@@ -60,5 +60,5 @@ sudo sbuild-createchroot --include=gnupg,ca-certificates jammy /srv/chroot/jammy
 echo "Done creating chroot for Ubuntu Jammy"
 
 # Update chroot.
-sudo sbuild-update -udcar stable
+sudo sbuild-update -udcar bookworm
 sudo sbuild-update -udcar jammy

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh

@@ -181,6 +181,9 @@ sudo /usr/bin/pip3 install dataclasses
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh

@@ -145,5 +145,8 @@ sudo /usr/bin/pip3 install wheel
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh

@@ -157,5 +157,8 @@ sudo /usr/bin/pip3 install wheel
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh

@@ -167,5 +167,8 @@ sudo /usr/bin/pip3 install dataclasses
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh

@@ -181,6 +181,9 @@ sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/requirements.t
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh

@@ -171,5 +171,8 @@ sudo ln -s /usr/bin/python3 /usr/local/bin/python3
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh

@@ -202,6 +202,9 @@ sudo ln -s /usr/bin/python3 /usr/local/bin/python3
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh

@@ -205,6 +205,9 @@ sudo ln -s /usr/bin/python3 /usr/local/bin/python3
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh

@@ -101,3 +101,6 @@ sudo zypper -nq install openssl-3
 
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
+
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt

coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh

@@ -113,5 +113,8 @@ sudo zypper -nq install perl-JSON
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh

@@ -116,5 +116,8 @@ sudo zypper -nq install perl-JSON
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh

@@ -66,6 +66,9 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh

@@ -266,5 +266,8 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh

@@ -39,8 +39,13 @@ EOF
 sudo sbuild-adduser "$LOGNAME"
 newgrp sbuild
 
+# For debian repo we need to update the bookworm release pgp key
+mkdir -p /home/qt/.debian_key_ring
+wget https://ftp-master.debian.org/keys/archive-key-12.asc -O /home/qt/.debian_key_ring/archive-key-12.asc
+gpg --no-default-keyring --keyring=/home/qt/.debian_key_ring/debian_chroot.gpg --import /home/qt/.debian_key_ring/archive-key-12.asc
+
 # Create chroot
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-amd64 http://deb.debian.org/debian --keyring=/home/qt/.debian_key_ring/debian_chroot.gpg
 
 # For ubuntu 22.04
 echo "Create chroot for Ubuntu Jammy"
@@ -49,7 +54,7 @@ sudo sbuild-createchroot --include=eatmydata,gnupg,ca-certificates jammy /srv/ch
 echo "Done creating chroot for Ubuntu Jammy"
 
 # Update chroot.
-sudo sbuild-update -udcar stable
+sudo sbuild-update -udcar bookworm
 
 
 

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2025 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 # Install required packages with APT
@@ -20,15 +20,14 @@ function set_internal_repo {
     sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}
 
     sudo tee "/etc/apt/sources.list.d/ubuntu.list" > /dev/null <<-EOC
-    deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble main restricted universe multiverse
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-arm64 main restricted universe multiverse
-    deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-updates main restricted universe multiverse
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-updates-arm64 main restricted universe multiverse
-    deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-backports main restricted universe
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-backports-arm64 main restricted universe
-    deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-security main restricted universe multiverse
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-security-arm64 main restricted universe multiverse
 EOC
 }
 
-#(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
+(ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
-echo "Internal package repository not loading Translation en package (QTQAINFRA-6297). Using public repositories."
 
 # Make sure needed ca-certificates are available
 sudo apt-get install --reinstall ca-certificates
@@ -262,5 +261,8 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

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

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2025 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 # Install required packages with APT
@@ -20,18 +20,16 @@ function set_internal_repo {
     sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}
 
     sudo tee "/etc/apt/sources.list.d/ubuntu.list" > /dev/null <<-EOC
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-amd64 main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-updates main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-updates-amd64 main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-backports main restricted universe
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-backports-amd64 main restricted universe
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-security main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-security-amd64 main restricted universe multiverse
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble main restricted
+    deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-i386 main restricted universe multiverse
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-updates main restricted
+    deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-updates-i386 main restricted universe multiverse
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble universe
 EOC
 }
 
-#(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
+(ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
-echo "Internal package repository not loading Translation en package (QTQAINFRA-6297). Using public repositories."
 
 # Make sure needed ca-certificates are available
 sudo apt-get install --reinstall ca-certificates
@@ -273,5 +271,8 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh

@@ -72,5 +72,8 @@ sudo zypper -nq install java-17-openjdk
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh

@@ -78,5 +78,8 @@ sudo zypper -nq install java-17-openjdk
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh

@@ -91,5 +91,8 @@ sudo zypper -nq install java-17-openjdk
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh

@@ -90,5 +90,8 @@ sudo zypper -nq install perl-JSON
 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
+glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "glibc = $glibcVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-macos-14-arm/28-patchelf.sh

@@ -4,4 +4,4 @@
 
 set -ex
 
-brew install patchelf
+source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"