aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2023-08-21 08:58:45 +0000
committerHeikki Halmet <heikki.halmet@qt.io>2023-09-04 11:06:21 +0000
commit7ac3fe0df9de15a4d34c81e6bf7863aade9e797e (patch)
tree664626b891b8f8175ca4529aa1c6676570499962
parent4fd8c3bc6f258526bd3a6b9a6784a84187f268a2 (diff)
Provisioning: Install needed SW for Debian ARM IFW targets
Task-number: QTIFW-3073 Change-Id: I613b658c1ef3dbac597d8018a937a7324b582e58 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
-rwxr-xr-xcoin/provisioning/common/unix/common.sourced.sh2
-rwxr-xr-xcoin/provisioning/common/unix/libclang.sh5
-rwxr-xr-xcoin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh3
-rwxr-xr-xcoin/provisioning/qtci-linux-Debian-11.6-aarch64/05-libclang-v100-dyn.sh6
-rwxr-xr-xcoin/provisioning/qtci-linux-Debian-11.6-aarch64/05-libclang.sh6
5 files changed, 20 insertions, 2 deletions
diff --git a/coin/provisioning/common/unix/common.sourced.sh b/coin/provisioning/common/unix/common.sourced.sh
index aba0f78e..180dd472 100755
--- a/coin/provisioning/common/unix/common.sourced.sh
+++ b/coin/provisioning/common/unix/common.sourced.sh
@@ -145,7 +145,7 @@ set_common_environment () {
uname_m="$(uname -m)"
case "$uname_m" in
x86_64|amd64) PROVISIONING_ARCH=amd64 ;;
- arm64) PROVISIONING_ARCH=arm64 ;;
+ arm64|aarch64) PROVISIONING_ARCH=arm64 ;;
i[3456]86) PROVISIONING_ARCH=x86 ;;
*) fatal "Unknown architecture in uname: $uname_m" 43 ;;
esac
diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index 7a25b54c..af4c89d5 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -73,6 +73,11 @@ elif [ "$PROVISIONING_OS_ID" = ubuntu ]; then
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
+elif [ "$PROVISIONING_OS_ID" = debian ]; then
+ version=$libclang_version
+ url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
+ url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
+ sha1="c7b1d28ef835192b033f317c96686780d85d8eba"
else
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
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 26b52d07..6f823202 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
@@ -276,7 +276,8 @@ installPackages+=(pkg-config)
installPackages+=(pkg-kde-tools)
installPackages+=(unixodbc-dev)
installPackages+=(zlib1g-dev)
-
+# For IFW
+installPackages+=(libbz2-dev)
echo "Running update for apt"
waitLoop
diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/05-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/05-libclang-v100-dyn.sh
new file mode 100755
index 00000000..fbf34ddd
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/05-libclang-v100-dyn.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -ex
+
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/unix/libclang-v100-dyn.sh
+"$BASEDIR/../common/unix/libclang-v100-dyn.sh"
diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/05-libclang.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/05-libclang.sh
new file mode 100755
index 00000000..7074cbc1
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/05-libclang.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -ex
+
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/unix/libclang.sh
+"$BASEDIR/../common/unix/libclang.sh"