mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-20 11:56:31 +08:00
Fix shellcheck complaints about provisioning scripts
Also adds executable attributes to shell scripts that were missing it. Change-Id: Id52ef495147fdbfb5cb1a1f711fac530e0e85f3b Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
@@ -39,14 +39,14 @@ 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'`
|
||||
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"
|
||||
[ "$bootanim" = stopped ] && [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ]
|
||||
}
|
||||
|
||||
for counter in `seq ${EMULATOR_MAX_RETRIES}`
|
||||
for counter in $(seq ${EMULATOR_MAX_RETRIES})
|
||||
do
|
||||
$ADB_EXEC kill-server
|
||||
$ADB_EXEC start-server
|
||||
@@ -62,22 +62,22 @@ do
|
||||
EMULATOR_RUN_LOG_PATH=${EMULATOR_RUN_LOG_PATH//%iter/${counter}}
|
||||
|
||||
echo "Starting emulator ${ANDROID_EMULATOR}, try ${counter}/${EMULATOR_MAX_RETRIES}" \
|
||||
| tee ${EMULATOR_RUN_LOG_PATH}
|
||||
$EMULATOR_EXEC -avd $ANDROID_EMULATOR \
|
||||
| tee "${EMULATOR_RUN_LOG_PATH}"
|
||||
$EMULATOR_EXEC -avd "$ANDROID_EMULATOR" \
|
||||
-gpu swiftshader_indirect -no-audio -no-window -no-boot-anim \
|
||||
-cores 4 -memory 16000 -partition-size 4096 \
|
||||
-detect-image-hang -restart-when-stalled -no-snapshot-save \
|
||||
-no-nested-warnings -logcat-output ${LOGCAT_PATH} \
|
||||
</dev/null >${EMULATOR_RUN_LOG_PATH} 2>&1 &
|
||||
-no-nested-warnings -logcat-output "${LOGCAT_PATH}" \
|
||||
</dev/null >"${EMULATOR_RUN_LOG_PATH}" 2>&1 &
|
||||
emulator_pid=$!
|
||||
disown $emulator_pid
|
||||
|
||||
echo "Waiting ${ADB_MAX_TIMEOUT} seconds for emulated device to appear..."
|
||||
timeout ${ADB_MAX_TIMEOUT} $ADB_EXEC wait-for-device
|
||||
timeout ${ADB_MAX_TIMEOUT} "$ADB_EXEC" wait-for-device
|
||||
|
||||
echo "Waiting a few minutes for the emulator to fully boot..."
|
||||
emulator_status=down
|
||||
for i in `seq ${ADB_MAX_TIMEOUT}`
|
||||
for _ in $(seq ${ADB_MAX_TIMEOUT})
|
||||
do
|
||||
sleep 1
|
||||
|
||||
@@ -95,13 +95,13 @@ do
|
||||
echo "Emulator started successfully"
|
||||
break
|
||||
else
|
||||
if [ $counter -lt $EMULATOR_MAX_RETRIES ]
|
||||
if [ "$counter" -lt "$EMULATOR_MAX_RETRIES" ]
|
||||
then
|
||||
echo "Emulator failed to start," \
|
||||
"forcefully killing current instance and re-starting emulator"
|
||||
kill $emulator_pid || true
|
||||
sleep 5
|
||||
elif [ $counter -eq $EMULATOR_MAX_RETRIES ]
|
||||
elif [ "$counter" -eq "$EMULATOR_MAX_RETRIES" ]
|
||||
then
|
||||
echo "Emulator failed to start, reached maximum number of retries. Aborting\!"
|
||||
exit 2
|
||||
|
||||
@@ -15,12 +15,10 @@ source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
emulator_script="${BASH_SOURCE%/*}/android_emulator_launcher.sh"
|
||||
|
||||
targetFolder="/opt/android"
|
||||
sdkTargetFolder="$targetFolder/sdk"
|
||||
|
||||
sudo mkdir -p $sdkTargetFolder
|
||||
sudo mkdir -p "$sdkTargetFolder"
|
||||
|
||||
basePath="http://ci-files01-hki.ci.qt.io/input/android"
|
||||
|
||||
@@ -54,7 +52,7 @@ function InstallNdk() {
|
||||
ndkVersion=$1
|
||||
ndkSha1=$2
|
||||
|
||||
if [[ ! -d $targetFolder/android-ndk-$ndkVersion ]]; then
|
||||
if [[ ! -d "$targetFolder/android-ndk-$ndkVersion" ]]; then
|
||||
|
||||
ndkFile="android-ndk-$ndkVersion-linux.zip"
|
||||
ndkTargetFile="/tmp/$ndkFile"
|
||||
@@ -97,11 +95,11 @@ if [ "$http_proxy" != "" ]; then
|
||||
echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder \
|
||||
--no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" \
|
||||
"platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \
|
||||
| eval $sdkmanager_no_progress_bar_cmd
|
||||
| eval "$sdkmanager_no_progress_bar_cmd"
|
||||
else
|
||||
echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder \
|
||||
"platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \
|
||||
| eval $sdkmanager_no_progress_bar_cmd
|
||||
| eval "$sdkmanager_no_progress_bar_cmd"
|
||||
fi
|
||||
|
||||
echo "Checking the contents of Android SDK..."
|
||||
@@ -112,19 +110,22 @@ SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
|
||||
SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
|
||||
|
||||
# shellcheck disable=SC2129
|
||||
echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
|
||||
echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
|
||||
echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
|
||||
echo "Android NDK = $ndkVersion" >> ~/versions.txt
|
||||
cat <<EOB >>~/versions.txt
|
||||
Android SDK tools = $toolsVersion
|
||||
Android SDK Build Tools = $sdkBuildToolsVersion
|
||||
Android SDK API level = $sdkApiLevel
|
||||
Android NDK = $ndkVersion
|
||||
EOB
|
||||
|
||||
cd "$sdkTargetFolder/cmdline-tools/tools/bin"
|
||||
./sdkmanager --install "emulator" --sdk_root=$sdkTargetFolder \
|
||||
| eval $sdkmanager_no_progress_bar_cmd
|
||||
echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" | eval $sdkmanager_no_progress_bar_cmd
|
||||
|
||||
echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd
|
||||
|
||||
echo "y" | ./sdkmanager --install "system-images;android-34;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd
|
||||
./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
|
||||
| eval "$sdkmanager_no_progress_bar_cmd"
|
||||
echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \
|
||||
| eval "$sdkmanager_no_progress_bar_cmd"
|
||||
echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" \
|
||||
| eval "$sdkmanager_no_progress_bar_cmd"
|
||||
echo "y" | ./sdkmanager --install "system-images;android-34;google_apis;x86_64" \
|
||||
| eval "$sdkmanager_no_progress_bar_cmd"
|
||||
|
||||
echo "Checking the contents of Android SDK again..."
|
||||
ls -l "$sdkTargetFolder"
|
||||
@@ -141,7 +142,7 @@ echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \
|
||||
echo "Install $sdkApiLevelAutomotive $androidAutomotive"
|
||||
DownloadURL "$androidAutomotive12Url" "$androidAutomotive12Url" "$androidAutomotive12Sha" \
|
||||
"/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz"
|
||||
sudo tar -xzf "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz" -C $sdkTargetFolder/system-images
|
||||
sudo tar -xzf "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz" -C "$sdkTargetFolder/system-images"
|
||||
echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_31 -c 2048M -f \
|
||||
-k "system-images;${sdkApiLevelAutomotive};${androidAutomotive};x86_64"
|
||||
|
||||
@@ -150,6 +151,6 @@ echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_31 -c 2048
|
||||
|
||||
# To be used by the VMs to start the emulator for tests
|
||||
emulator_script_filename="android_emulator_launcher.sh"
|
||||
cp "$(dirname "$(readlink -f "$BASH_SOURCE")")/${emulator_script_filename}" ${HOME}
|
||||
cp "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")/${emulator_script_filename}" "${HOME}"
|
||||
ANDROID_EMULATOR_RUNNER="${HOME}/${emulator_script_filename}"
|
||||
SetEnvVar "ANDROID_EMULATOR_RUNNER" "$ANDROID_EMULATOR_RUNNER"
|
||||
|
||||
@@ -17,9 +17,9 @@ DownloadAndExtract () {
|
||||
file=$3
|
||||
|
||||
DownloadURL "$url" "$url" "$sha" "$file"
|
||||
tar -xzvf $file
|
||||
tar -xzvf "$file"
|
||||
|
||||
rm -rf $file
|
||||
rm -rf "$file"
|
||||
}
|
||||
|
||||
|
||||
@@ -27,13 +27,13 @@ DownloadAndExtract () {
|
||||
sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_6_0-wavefront-2023-03-16-x86_64-gnu_linux.tar.gz"
|
||||
targetFile="bauhaus-suite-7_6_0-wavefront-2023-03-16-x86_64-gnu_linux.tar.gz"
|
||||
sha1="20bfa8872b90ff11394098a833d536229425535e"
|
||||
cd $HOME
|
||||
cd "$HOME"
|
||||
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"
|
||||
|
||||
mkdir $HOME/.bauhaus
|
||||
mkdir "$HOME/.bauhaus"
|
||||
cd "$HOME/.bauhaus"
|
||||
wget http://ci-files01-hki.ci.qt.io/input/axivion/Qt_Evaluation_20231231.key
|
||||
cd $HOME
|
||||
cd "$HOME"
|
||||
|
||||
#Axivion configuration
|
||||
configurationFile="http://ci-files01-hki.ci.qt.io/input/axivion/axivion_config.tar.gz"
|
||||
|
||||
@@ -11,10 +11,10 @@ set -ex
|
||||
wrapper="${HOME}/bootstrap-agent.sh"
|
||||
autostart_folder="${HOME}/.config/autostart"
|
||||
# This directory should exist. Created in base image (tier 1)
|
||||
mkdir -p ${autostart_folder}
|
||||
mkdir -p "${autostart_folder}"
|
||||
|
||||
# Create autostart desktop file and shell wrapper
|
||||
sudo tee ${autostart_folder}/coin-bootstrap-agent.desktop <<"EOF"
|
||||
sudo tee "${autostart_folder}/coin-bootstrap-agent.desktop" <<"EOF"
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Exec=/home/qt/bootstrap-agent.sh
|
||||
@@ -23,7 +23,7 @@ X-GNOME-Autostart-enabled=true
|
||||
Name=Coin
|
||||
EOF
|
||||
|
||||
sudo tee $wrapper <<"EOF"
|
||||
sudo tee "$wrapper" <<"EOF"
|
||||
#!/bin/sh
|
||||
# Wait for network to come up
|
||||
x=0
|
||||
@@ -85,5 +85,5 @@ fi
|
||||
EOF
|
||||
|
||||
# set owner and permissions
|
||||
sudo chown qt:users $wrapper
|
||||
sudo chmod 755 $wrapper
|
||||
sudo chown qt:users "$wrapper"
|
||||
sudo chmod 755 "$wrapper"
|
||||
|
||||
@@ -18,7 +18,7 @@ if grep -q "^$QT_USER:" /etc/passwd; then
|
||||
else
|
||||
echo "(WW) user $QT_USER not found."
|
||||
echo "---- skipping cache cleanup."
|
||||
exit 0;
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# assume /home/qt as ~ won't expand into sudo
|
||||
@@ -32,12 +32,11 @@ if sudo [ -d "$CACHEDIR" ]; then
|
||||
echo "---- removing content:"
|
||||
|
||||
# List files and delete in a loop as wildcard won't expand into sudo
|
||||
FILES=`sudo ls -A1 $CACHEDIR`
|
||||
while read FILE;
|
||||
do
|
||||
sudo ls -A1 "$CACHEDIR" | while read -r FILE
|
||||
do
|
||||
echo "--- rm -rf $FILE"
|
||||
sudo rm -rf "$CACHEDIR/$FILE"
|
||||
done <<< $FILES
|
||||
done
|
||||
else
|
||||
echo "(**) cache in $CACHEDIR is empty."
|
||||
fi
|
||||
@@ -46,7 +45,7 @@ else
|
||||
# replace a cache file with a directory
|
||||
echo "(WW) $CACHEDIR is a file."
|
||||
echo "---- removing $CACHEDIR."
|
||||
sudo rm -rf "$CACHEDIR"
|
||||
sudo rm -r "$CACHEDIR"
|
||||
else
|
||||
echo "(WW) cache directory $CACHEDIR not found."
|
||||
fi
|
||||
|
||||
@@ -8,9 +8,9 @@ echo "Disable Network Time Protocol (NTP)"
|
||||
|
||||
if uname -a |grep -q "Ubuntu\|Debian" ; then
|
||||
sudo timedatectl set-ntp false
|
||||
elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then
|
||||
elif grep "PRETTY_NAME" /etc/os-release | grep -q "Leap 15"; then
|
||||
(sudo systemctl stop chronyd && sudo systemctl disable chronyd)
|
||||
elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then
|
||||
elif grep -q "SUSE Linux Enterprise Server 15" /etc/os-release; then
|
||||
sudo timedatectl set-ntp false
|
||||
else
|
||||
sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
|
||||
|
||||
@@ -7,7 +7,7 @@ set -f
|
||||
QT_USER="qt"
|
||||
CONFDIR=".config"
|
||||
KWINRC="kwinrc"
|
||||
KWC5=`which kwriteconfig5`
|
||||
KWC5=$(which kwriteconfig5)
|
||||
|
||||
if [ -z "$KWC5" ]; then
|
||||
echo "(WW) kwriteconfig5 script not found."
|
||||
|
||||
@@ -4,37 +4,38 @@
|
||||
|
||||
set -e
|
||||
|
||||
|
||||
PROVISIONING_DIR="$(dirname "$0")/../../"
|
||||
. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
|
||||
. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
|
||||
|
||||
# shellcheck source=../unix/common.sourced.sh
|
||||
source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
|
||||
|
||||
localRepo=http://ci-files01-hki.ci.qt.io/input/docker
|
||||
upstreamRepo=https://download.docker.com/linux/ubuntu/dists/focal/pool/stable/amd64/
|
||||
|
||||
echo '
|
||||
2666840157bab3b77a850236fbf323c423fb564a containerd.io_1.6.9-1_amd64.deb
|
||||
ec6a1ad99b19b6a674349fb13bcc10d62c54c404 docker-ce_23.0.0-1~ubuntu.20.04~focal_amd64.deb
|
||||
130774916fa7e2c9997b8fcb4e7696a343f12fb0 docker-ce-cli_23.0.0-1~ubuntu.20.04~focal_amd64.deb
|
||||
' \
|
||||
| xargs -n2 | while read sha f
|
||||
do
|
||||
DownloadURL $localRepo/$f $upstreamRepo/$f $sha
|
||||
done
|
||||
function getEachUpstream () {
|
||||
while read -r sha f
|
||||
do DownloadURL "$localRepo/$f" "$upstreamRepo/$f" "$sha"
|
||||
done
|
||||
}
|
||||
cat <<EOF | getEachUpstream
|
||||
2666840157bab3b77a850236fbf323c423fb564a containerd.io_1.6.9-1_amd64.deb
|
||||
ec6a1ad99b19b6a674349fb13bcc10d62c54c404 docker-ce_23.0.0-1~ubuntu.20.04~focal_amd64.deb
|
||||
130774916fa7e2c9997b8fcb4e7696a343f12fb0 docker-ce-cli_23.0.0-1~ubuntu.20.04~focal_amd64.deb
|
||||
EOF
|
||||
|
||||
sudo apt-get -y install ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
|
||||
rm -f ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
|
||||
|
||||
sudo usermod -a -G docker $USER
|
||||
sudo usermod -a -G docker "$USER"
|
||||
sudo docker --version
|
||||
|
||||
# Download and install the docker-compose extension from https://github.com/docker/compose/releases
|
||||
f=docker-compose-$(uname -s)-$(uname -m)
|
||||
dockerComposeVersion="v2.15.1"
|
||||
DownloadURL \
|
||||
$localRepo/$f-${dockerComposeVersion} \
|
||||
https://github.com/docker/compose/releases/download/${dockerComposeVersion}/$f \
|
||||
"$localRepo/$f-${dockerComposeVersion}" \
|
||||
"https://github.com/docker/compose/releases/download/${dockerComposeVersion}/$f" \
|
||||
bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5
|
||||
sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose
|
||||
sudo docker-compose --version
|
||||
@@ -44,4 +45,4 @@ rm ./docker-compose*
|
||||
sudo apt-get install avahi-daemon -y
|
||||
|
||||
# Start testserver provisioning
|
||||
sudo "$(readlink -f $(dirname ${BASH_SOURCE[0]}))/../shared/testserver/docker_testserver.sh"
|
||||
sudo "$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")/../shared/testserver/docker_testserver.sh"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2023 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
|
||||
|
||||
# This script install cpdb from sources.
|
||||
# This script installs cpdb from sources.
|
||||
# Requires GCC and Perl to be in PATH.
|
||||
# The following dependencies should be pre-installed:
|
||||
# make, autoconf, autopoint, libglib2.0-dev, libdbus-1-dev, libtool
|
||||
@@ -13,14 +13,14 @@ gitUrl="https://github.com/openprinting/$repName.git"
|
||||
tmpdir="/tmp"
|
||||
repDir="$tmpdir/$repName"
|
||||
prefix="/usr"
|
||||
rm -rf $repDir
|
||||
cd $tmpdir
|
||||
git clone $gitUrl >/dev/null
|
||||
cd $repDir
|
||||
rm -rf "$repDir"
|
||||
cd "$tmpdir"
|
||||
git clone -q "$gitUrl"
|
||||
cd "$repDir"
|
||||
# cpdb-libs v2.0b4 with build bug fixed
|
||||
git checkout ce848f1571a82ec03881fce127ff28bec8da239e > /dev/null
|
||||
git checkout -q ce848f1571a82ec03881fce127ff28bec8da239e
|
||||
./autogen.sh > /dev/null
|
||||
./configure --prefix=$prefix > /dev/null
|
||||
make -j$(nproc) > /dev/null && sudo make install > /dev/null
|
||||
./configure --prefix="$prefix" > /dev/null
|
||||
make "-j$(nproc)" > /dev/null && sudo make install > /dev/null
|
||||
sudo ldconfig
|
||||
rm -rf $repDir
|
||||
rm -rf "$repDir"
|
||||
|
||||
@@ -16,11 +16,11 @@ gitUrl="https://github.com/festvox/$repName.git"
|
||||
tmpdir="/tmp"
|
||||
repDir="$tmpdir/$repName"
|
||||
prefix="/usr"
|
||||
rm -rf $repDir
|
||||
cd $tmpdir
|
||||
git clone $gitUrl >/dev/null
|
||||
cd $repDir
|
||||
git checkout v2.2 > /dev/null
|
||||
./configure --with-pic --enable-shared --prefix=$prefix > /dev/null
|
||||
make -j$(nproc) > /dev/null && sudo make install > /dev/null
|
||||
rm -rf $repDir
|
||||
rm -rf "$repDir"
|
||||
cd "$tmpdir"
|
||||
git clone -q "$gitUrl"
|
||||
cd "$repDir"
|
||||
git checkout -q v2.2
|
||||
./configure --with-pic --enable-shared --prefix="$prefix" > /dev/null
|
||||
make "-j$(nproc)" > /dev/null && sudo make install > /dev/null
|
||||
rm -rf "$repDir"
|
||||
|
||||
@@ -18,16 +18,16 @@ targetFile="/tmp/git-$version.tar.gz"
|
||||
sha="a17c11da2968f280a13832d97f48e9039edac354"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
sourceDir="/tmp/git-$version-source"
|
||||
mkdir $sourceDir
|
||||
tar -xzf "$targetFile" -C $sourceDir
|
||||
mkdir "$sourceDir"
|
||||
tar -xzf "$targetFile" -C "$sourceDir"
|
||||
|
||||
cd "$sourceDir/git-$version"
|
||||
installDir="$HOME/git"
|
||||
make configure
|
||||
./configure --prefix=$installDir
|
||||
./configure --prefix="$installDir"
|
||||
make all
|
||||
sudo make install
|
||||
|
||||
SetEnvVar "PATH" "\"$installDir/bin:\$PATH\""
|
||||
|
||||
$installDir/bin/git --version
|
||||
"$installDir/bin/git" --version
|
||||
|
||||
@@ -26,7 +26,7 @@ InstallFromCompressedFileFromURL "$urlToolchainEs7" "$urlToolchainEs7" "$SHA1_to
|
||||
echo "Install Integrity toolchain addons"
|
||||
DownloadURL "$urlLibeglmegapack" "$urlLibeglmegapack" "$SHA1_Libeglmegapack" "/tmp/integrity_libeglmegapack.zip"
|
||||
unzip "/tmp/integrity_libeglmegapack.zip" -d "/tmp"
|
||||
mv /tmp/toolchain/* $targetFolder/toolchain
|
||||
mv $targetFolder/toolchain $targetFolder/integrity_toolchain
|
||||
cp $toolchain_file "$targetFolder/integrity_toolchain/toolchain.cmake"
|
||||
mv /tmp/toolchain/* "$targetFolder/toolchain"
|
||||
mv "$targetFolder/toolchain" "$targetFolder/integrity_toolchain"
|
||||
cp "$toolchain_file" "$targetFolder/integrity_toolchain/toolchain.cmake"
|
||||
sudo rm -fr /tmp/toolchain
|
||||
|
||||
@@ -7,8 +7,10 @@ set -e
|
||||
SSL_VER=$1
|
||||
PACK_TYPE=$2
|
||||
PROVISIONING_DIR="$(dirname "$0")/../../"
|
||||
. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
|
||||
. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
|
||||
# shellcheck source=../unix/common.sourced.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/common.sourced.sh"
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
|
||||
|
||||
localRepo=http://ci-files01-hki.ci.qt.io/input/docker
|
||||
|
||||
@@ -18,9 +18,9 @@ DownloadAndExtract () {
|
||||
folder=$4
|
||||
|
||||
DownloadURL "$url" "$url" "$sha" "$file"
|
||||
sudo tar -C $folder -Jxf $file
|
||||
sudo tar -C "$folder" -Jxf "$file"
|
||||
|
||||
rm -rf $file
|
||||
rm -rf "$file"
|
||||
}
|
||||
|
||||
aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
|
||||
@@ -33,13 +33,13 @@ folderName="qnx710"
|
||||
targetPath="$targetFolder$folderName"
|
||||
qemuTargetPath="$HOME/QNX"
|
||||
qemuIpAddress="172.31.1.10"
|
||||
qemuNetwork="172.31.1.1"
|
||||
export qemuNetwork="172.31.1.1"
|
||||
qemuSSHuser="root"
|
||||
qemuSSHurl="$qemuSSHuser@$qemuIpAddress"
|
||||
qemuLDpath="/proc/boot:/system/lib:/system/lib/dll:/home/qt/work/install/target/lib"
|
||||
|
||||
if [ ! -d "$targetFolder" ]; then
|
||||
mkdir -p $targetFolder
|
||||
mkdir -p "$targetFolder"
|
||||
fi
|
||||
|
||||
# QNX SDP
|
||||
@@ -48,10 +48,10 @@ targetFile="qnx710.tar.xz"
|
||||
sha1="134af2e0f75d7b7c516f824fafee265b89e51d48"
|
||||
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
|
||||
|
||||
sudo cp $aarch64le_toolchain $targetPath
|
||||
sudo cp $armv7le_toolchain $targetPath
|
||||
sudo cp $x8664_toolchain $targetPath
|
||||
cp -R $QNX_qemu_bld_files_dir $qemuTargetPath
|
||||
sudo cp "$aarch64le_toolchain" "$targetPath"
|
||||
sudo cp "$armv7le_toolchain" "$targetPath"
|
||||
sudo cp "$x8664_toolchain" "$targetPath"
|
||||
cp -R "$QNX_qemu_bld_files_dir" "$qemuTargetPath"
|
||||
# fc-match tool is missing from QNX SDP and tst_qfont requires it to work corretly
|
||||
# Download code-only package from https://www.iana.org/time-zones and follow README
|
||||
# to build tools for QNX x86_64. If need to build new tool create new qnx_qemu_utils
|
||||
@@ -60,9 +60,9 @@ sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx_qemu_utils_20211208.tar
|
||||
targetFile="qnx_qemu_utils.tar.xz"
|
||||
targetFolder="$qemuTargetPath/local/misc_files"
|
||||
sha1="7653f5d50f61f1591d7785c3ec261228ecc9dd22"
|
||||
if [ ! -d "$targetFolder" ]; then
|
||||
mkdir -p $targetFolder
|
||||
fi
|
||||
|
||||
mkdir -p "$targetFolder"
|
||||
|
||||
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
|
||||
|
||||
# Add ssl certificates. Expects Ubuntu 20.04 LTS with ca-certificates package installed
|
||||
@@ -73,10 +73,10 @@ cp -PR /etc/ssl/certs/* "$targetFolder/etc/ssl/certs"
|
||||
sudo chown -R qt:users "$targetPath"
|
||||
|
||||
# Verify that we have last files in tars
|
||||
if [ ! -f $targetPath/qnxsdp-env.sh ] || [ ! -f $targetPath/qnx-toolchain-x8664.cmake ]
|
||||
if [ ! -f "$targetPath/qnxsdp-env.sh" ] || [ ! -f "$targetPath/qnx-toolchain-x8664.cmake" ]
|
||||
then
|
||||
echo "QNX toolchain installation failed!"
|
||||
exit -1
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Set env variables
|
||||
|
||||
Reference in New Issue
Block a user