From d387c64e8b8d7528f5e475c0d0965647e9fa07f4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 31 Jul 2024 19:02:28 +0200 Subject: [PATCH] coin: Explicitly provision the libzstd-dev package It used to be installed as a dependency of some other package, but stopped doing lately, which causes qtbase to build without zstd support. This change explicitly installs the libzstd-dev package to prevent this from happening again. Fixes: QTBUG-124787 Fixes: QTBUG-127644 Change-Id: I72793ed96ef39ec07244079c51efe17ae1f9af66 Reviewed-by: Alexey Edelev (cherry picked from commit 8ad05756ed0b1a760d2aefc15b8596d10e5bd577) Reviewed-by: Alexey Edelev (cherry picked from commit c3a5651bd0d4f0adc474079d741a5092f841c2eb) Reviewed-by: Toni Saario --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 1 + .../qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 1 + 9 files changed, 9 insertions(+) diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh index 2ce4aef9..ac46389e 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh @@ -169,6 +169,7 @@ installPackages+=(ssh) installPackages+=(diffstat) installPackages+=(binfmt-support) installPackages+=(zstd) +installPackages+=(libzstd-dev) # Vulkan is needed for examples installPackages+=(libvulkan-dev) # Needed for qtdltlogging diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh index fda995ca..4abf653f 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh @@ -27,6 +27,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # EGL support installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libGL-devel) diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh index da03076a..7057c9f8 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh @@ -28,6 +28,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # EGL support installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libGL-devel) diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh index 9a81bd12..de8b2017 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh @@ -29,6 +29,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # update kernel installPackages+=(kernel) installPackages+=(kernel-tools) diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 3f2829ac..14b50073 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -29,6 +29,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # update kernel installPackages+=(kernel) installPackages+=(kernel-tools) diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh index 79c3476a..fff4ba3b 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh @@ -29,6 +29,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # EGL support # mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash installPackages+=(mesa-libEGL-devel-21.3.4-2.el9) diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index 0adcec27..a7dddccf 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -29,6 +29,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # EGL support # mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash #installPackages+=(mesa-libEGL-devel-21.3.4-2.el9) diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index 135b7811..e3c558f5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -198,6 +198,7 @@ installPackages+=(ssh) installPackages+=(diffstat) installPackages+=(binfmt-support) installPackages+=(zstd) +installPackages+=(libzstd-dev) # Vulkan is needed for examples installPackages+=(libvulkan-dev) # Needed for qtdltlogging 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 763846fa..3cc6e53b 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 @@ -202,6 +202,7 @@ installPackages+=(ssh) installPackages+=(diffstat) installPackages+=(binfmt-support) installPackages+=(zstd) +installPackages+=(libzstd-dev) installPackages+=(lz4) # Vulkan is needed for examples installPackages+=(libvulkan-dev)