mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-26 06:37:45 +08:00
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I433d7f0d4fd69509acc405b3de3979426dbbc660
This commit is contained in:
@@ -96,6 +96,7 @@ installPackages+=(g++-multilib)
|
||||
installPackages+=(python3-dev)
|
||||
installPackages+=(python3-pip)
|
||||
installPackages+=(python3-virtualenv)
|
||||
installPackages+=(python3-wheel)
|
||||
# python2 development package
|
||||
installPackages+=(python-dev)
|
||||
# Automates interactive applications (Needed by RTA to automate configure testing)
|
||||
@@ -155,3 +156,9 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}
|
||||
echo "Running update for apt"
|
||||
waitLoop
|
||||
sudo apt-get update
|
||||
|
||||
# Install all needed packages in a special wheel cache directory
|
||||
pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
|
||||
|
||||
9
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh
Executable file
9
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh
Executable file
@@ -0,0 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/linux/gcc.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
|
||||
|
||||
InstallGCC 8.2.0 50 19e40bea7df5dbadb22eec09ada621ecd9235687 19926bdb6c4b58891015929853d41aeff019d400
|
||||
|
||||
2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
Normal file → Executable file
2
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
Normal file → Executable file
@@ -5,7 +5,7 @@
|
||||
## Copyright (C) 2018 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the test suite of the Qt Toolkit.
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/env bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/bin/env bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
|
||||
4
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
Executable file
4
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
Executable file
@@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/linux/docker.sh
|
||||
@@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
$BASEDIR/../common/linux/ubuntu-version.sh
|
||||
55
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh
Executable file
55
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh
Executable file
@@ -0,0 +1,55 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2018 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL21$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see http://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at http://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 2.1 or version 3 as published by the Free
|
||||
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
## following information to ensure the GNU Lesser General Public License
|
||||
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
##
|
||||
## As a special exception, The Qt Company gives you certain additional
|
||||
## rights. These rights are described in The Qt Company LGPL Exception
|
||||
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
|
||||
|
||||
url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa"
|
||||
sha1="1b0d651661c33a654ac89ef3c97bbe06d6bf1ca1"
|
||||
sshKey="$HOME/.ssh/test_farm_id_rsa"
|
||||
|
||||
DownloadURL "$url" "$url" "$sha1" "$sshKey"
|
||||
chmod 600 "$sshKey"
|
||||
|
||||
echo "Configuring ssh config file for Yocto"
|
||||
cat <<EOT >> "$HOME/.ssh/config"
|
||||
StrictHostKeyChecking=no
|
||||
Host codereview.qt-project.org
|
||||
Port 29418
|
||||
User qt-builder
|
||||
IdentityFile "$sshKey"
|
||||
EOT
|
||||
|
||||
Reference in New Issue
Block a user