Update submodules on '6.6.0 in qt/qt5'

Change-Id: I66682550e2e10f1d48f0d12f18d62418c0e52a92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-21 15:38:15 +08:00 · 2023-10-04 05:20:22 +00:00 · 2023-10-02 17:24:10 +00:00 · 2023-10-01 18:25:49 +03:00 · 2023-10-01 15:25:44 +00:00 · 2023-10-01 15:25:40 +00:00
51 changed files with 66 additions and 53 deletions
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -287,6 +287,8 @@ Configurations:
    Environment variables: [
        'DEBIAN_RULES_REF=6.6_dev',
        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
+        'COIN_SBUILD_CHROOT=focal-arm64-sbuild',
+        'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ focal main universe multiverse',
    ]
 -
    Id: 'focal-amd64-debian-pkg-packaging'
@@ -296,4 +298,7 @@ Configurations:
    Environment variables: [
        'DEBIAN_RULES_REF=6.6_dev',
        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
+        'COIN_SBUILD_CHROOT=focal-amd64-sbuild',
+        'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ focal main universe multiverse',
+
    ]
--- a/coin/provisioning/common/unix/install-ffmpeg.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg.sh
@@ -68,8 +68,8 @@ ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.t
 install_ff_nvcodec_headers() {
  nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
  nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip"
-  nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/$nv_codec_version.zip"
-  nv_codec_sha1="bfaa2801725a2eea476939f2177ab50817c3a6ad"
+  nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip"
+  nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e"
  #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
  nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version"
  if [ ! -d  "$nv_codec_dir" ];
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
@@ -213,6 +213,7 @@ installPackages+=(net-tools)
 installPackages+=(bridge-utils)
 ## For debian building debian packages
 installPackages+=(sbuild)
+installPackages+=(ubuntu-dev-tools)
 installPackages+=(apt-cacher-ng)
 installPackages+=(devscripts)
 installPackages+=(piuparts)
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh
@@ -77,12 +77,15 @@ sudo sbuild-adduser $LOGNAME
 newgrp sbuild

 # Create chroot
-#sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64-sbuild http://127.0.0.1:3142/deb.debian.org/debian
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64-sbuild
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64
+# For ubuntu 20.04
+echo "Create chroot for Ubuntu Focal"
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-arm64 http://ports.ubuntu.com/ubuntu-ports/
+echo "Done creating chroot for Ubuntu Focal"

 # Update chroot
 sudo sbuild-update -udcar stable
-
+sudo sbuild-update -udcar focal



--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh
@@ -43,7 +43,7 @@
 mkdir -p /home/qt/debian_packages
 cd /home/qt/debian_packages
 # Backported cmake 3.24
-wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-focal/cmake-3.24-deb.tar.gz
+wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/arm64-focal/cmake-3.24-deb.tar.gz
 tar xzf cmake-3.24-deb.tar.gz
 # get rest of ready made Ubuntu focal arm debian packages
 # so that sbuild can find those
--- 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
@@ -251,6 +251,7 @@ installPackages+=(net-tools)
 installPackages+=(bridge-utils)
 # For Debian packaging
 installPackages+=(sbuild)
+installPackages+=(ubuntu-dev-tools)

 echo "Running update for apt"
 waitLoop
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh
@@ -77,12 +77,15 @@ sudo sbuild-adduser $LOGNAME
 newgrp sbuild

 # Create chroot
-#sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64-sbuild http://127.0.0.1:3142/deb.debian.org/debian
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64-sbuild
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64
+# For ubuntu 20.04
+echo "Create chroot for Ubuntu Focal"
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-amd64 http://archive.ubuntu.com/ubuntu/
+echo "Done creating chroot for Ubuntu Focal"

 # Update chroot
 sudo sbuild-update -udcar stable
-
+sudo sbuild-update -udcar focal



--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	244fc45435	Update submodules on '6.6.0 in qt/qt5' Change-Id: I66682550e2e10f1d48f0d12f18d62418c0e52a92 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-10-04 05:20:22 +00:00
Qt Submodule Update Bot	462345a443	Update submodules on '6.6.0 in qt/qt5' Change-Id: I14687fb8e4084f7d0c2150331db1d09150cd9858 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-10-02 17:24:10 +00:00
Simo Fält	43e1a3d2f5	COIN: Use Ubuntu Focal chroot instead of Debian stable We need to use older chroot to build debian packages. Pick-to: 6.6 dev Task-number: QTBUG-117120 Change-Id: I044e398324c380716b309dad5b087e97bc6688ab Reviewed-by: Toni Saario <toni.saario@qt.io>	2023-10-01 18:25:49 +03:00
Qt Submodule Update Bot	7e5f5266db	Update submodules on '6.6.0 in qt/qt5' Change-Id: I23fc73c5331db008857709fbbf03f76db52a912b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-10-01 15:25:44 +00:00
Elias Toivola	f548b71f7d	Fix FFmpeg nv-codec file SHA and cache External URL file SHA changed and the cache file didn't exist. Task-number: QTQAINFRA-5862 Change-Id: Ib4670d367d6541e67eb54dd3fb84079548b13722 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit `bbbe558077`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit `710d6e5cb0`)	2023-10-01 15:25:40 +00:00
Simo Fält	f8f18afaa2	CI: Fix cmake debian package path for arm Pick-to: dev 6.6 Change-Id: Ib1ea0b7bec0e00b50c957ae0f530284ae32bbe9b Reviewed-by: Toni Saario <toni.saario@qt.io>	2023-10-01 15:25:33 +00:00
Qt Submodule Update Bot	15edd7b4f9	Update submodules on '6.6.0 in qt/qt5' Change-Id: I0fb49899126f2e455816f7e42e23df668e6118db Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-09-28 20:30:35 +00:00
Qt Submodule Update Bot	118535d55b	Update submodules on '6.6.0 in qt/qt5' Change-Id: I0f2ce2f80a399944312fe21fb388859141e6d5af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-09-27 02:41:57 +00:00