diff options
author | Joni Jantti <joni.jantti@qt.io> | 2018-02-07 16:03:26 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-08-30 04:53:50 +0000 |
commit | e89420945f368ec7b6d03b8aeb6e6b478ee960fe (patch) | |
tree | f21878ab73bd1e37ec7cb172b36716d1c077948b /coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64 | |
parent | e470da9d650c1e58c866807e3ae93197e1517756 (diff) |
Add Ubuntu 18.04 to the CI
Qt 5.12 will have both 16.04 and 18.04
LTS releases verified. Some configurations
are upgraded from 16.04 to 18.04.
Task-number: QTQAINFRA-1983
Change-Id: I1b5c2a1c23ce209040b3478cff21b7f6436a9b54
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64')
3 files changed, 0 insertions, 303 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh deleted file mode 100755 index edabeb0c..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh +++ /dev/null @@ -1,175 +0,0 @@ -#!/usr/bin/env bash -############################################################################# -## -## Copyright (C) 2017 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/SetEnvVar.sh" - -# build latest qemu to usermode -sudo apt-get -y install automake autoconf libtool - -tempDir=$(mktemp -d) -git clone git://git.qemu.org/qemu.git "$tempDir" -cd "$tempDir" - -#latest commit from the master proven to work -git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f -git submodule update --init pixman - -patch -p1 <<EOT -From aad6a8f17dc7ad3681d2d98a01e474a8904a129b Mon Sep 17 00:00:00 2001 -From: Simon Hausmann <simon.hausmann@qt.io> -Date: Fri, 24 Aug 2018 10:38:29 +0200 -Subject: [PATCH] linux-user: add support for MADV_DONTNEED - -Most flags to madvise() are just hints, so typically ignoring the -syscall and returning okay is fine. However applications exist that do -rely on MADV_DONTNEED behavior to guarantee that upon subsequent access -the mapping is refreshed from the backing file or zero for anonymous -mappings. ---- - linux-user/mmap.c | 18 ++++++++++++++++++ - linux-user/qemu.h | 1 + - linux-user/syscall.c | 6 +----- - 3 files changed, 20 insertions(+), 5 deletions(-) - -diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 61685bf79e..cb3069f27e 100644 ---- a/linux-user/mmap.c -+++ b/linux-user/mmap.c -@@ -764,3 +764,16 @@ int target_msync(abi_ulong start, abi_ulong len, int flags) - start &= qemu_host_page_mask; - return msync(g2h(start), end - start, flags); - } -+ -+int target_madvise(abi_ulong start, abi_ulong len, int flags) -+{ -+ /* A straight passthrough may not be safe because qemu sometimes -+ turns private file-backed mappings into anonymous mappings. -+ Most flags are hints, except for MADV_DONTNEED that applications -+ may rely on to zero out pages, so we pass that through. -+ Otherwise returning success is ok. */ -+ if (flags & MADV_DONTNEED) { -+ return madvise(g2h(start), len, MADV_DONTNEED); -+ } -+ return 0; -+} -diff --git a/linux-user/qemu.h b/linux-user/qemu.h -index 4edd7d0c08..3c975909a1 100644 ---- a/linux-user/qemu.h -+++ b/linux-user/qemu.h -@@ -429,6 +429,7 @@ int target_munmap(abi_ulong start, abi_ulong len); - abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, - abi_ulong new_size, unsigned long flags, - abi_ulong new_addr); -+int target_madvise(abi_ulong start, abi_ulong len, int flags); - int target_msync(abi_ulong start, abi_ulong len, int flags); - extern unsigned long last_brk; - extern abi_ulong mmap_next_start; -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 11a311f9db..94d8abc745 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -11148,11 +11148,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, - - #ifdef TARGET_NR_madvise - case TARGET_NR_madvise: -- /* A straight passthrough may not be safe because qemu sometimes -- turns private file-backed mappings into anonymous mappings. -- This will break MADV_DONTNEED. -- This is a hint, so ignoring and returning success is ok. */ -- ret = get_errno(0); -+ ret = get_errno(target_madvise(arg1, arg2, arg3)); - break; - #endif - #if TARGET_ABI_BITS == 32 --- -2.17.1 -EOT - -./configure --target-list=arm-linux-user,aarch64-linux-user --static -make -sudo make install -rm -rf "$tempDir" - -# Enable binfmt support -sudo apt-get -y install binfmt-support - -# Install qemu binfmt for 32bit and 64bit arm architectures -sudo update-binfmts --package qemu-arm --install arm \ -/usr/local/bin/qemu-arm \ ---magic \ -"\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ ---mask \ -"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" -sudo update-binfmts --package qemu-aarch64 --install aarch64 \ -/usr/local/bin/qemu-aarch64 \ ---magic \ -"\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00" \ ---mask \ -"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" - -# First test using QFont fails if fonts-noto-cjk is installed. This happens because -# running fontcache for that font takes > 5 mins when run on QEMU. Running fc-cache -# doesn't help since host version creates cache for a wrong architecture and running -# armv7 fc-cache segfaults on QEMU. -sudo DEBIAN_FRONTEND=noninteractive apt-get -y remove fonts-noto-cjk - -# If normal fontconfig paths are used, qemu parses what ever files it finds from -# the toolchain sysroot and the rest from the system fonts. -QEMU_FONTCONFPATH=~/qemu_fonts -QEMU_FONTCONFFILE=$QEMU_FONTCONFPATH/fonts.qemu.conf -mkdir -p $QEMU_FONTCONFPATH - -# Copy system font configuration files from system to a location with prefix that can't be found from -# the toolchain sysroot -cp -Lr /etc/fonts/* $QEMU_FONTCONFPATH - -# Create links to the actual system font files -ln -s /usr/share/fonts $QEMU_FONTCONFPATH/fonts -ln -s /usr/local/share/fonts $QEMU_FONTCONFPATH/local_fonts - -# Change font configuration file to point to files that can't be found from the toolchain sysroot -sed $QEMU_FONTCONFPATH/fonts.conf -e "s:conf.d:$QEMU_FONTCONFPATH/conf.d:" > $QEMU_FONTCONFFILE -sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i -sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i - -# Set QEMU font configuration variables -qemu_env="FONTCONFIG_FILE=$QEMU_FONTCONFFILE" -qemu_env="${qemu_env},FONTCONFIG_PATH=$QEMU_FONTCONFPATH" - -# Disable QtWayland window decorations, as they cause flakiness when used inside qemu (QTBUG-66173) -qemu_env="${qemu_env},QT_WAYLAND_DISABLE_WINDOWDECORATION=1" - -SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\"" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh deleted file mode 100755 index fbe669d9..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -# This script installs the Yocto toolchain - -set -ex - -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -echo "Installing Yocto toolchain for 32-bit b2qt..." - -versionARM="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="db7a0f4f9ddd5992a563d5348889021a7ceb1c56" -yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" -yoctoLocationARMv7="/opt/yocto-armv7" -sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi" -crosscompileARMv7="sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-" - -DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" -chmod +x "$yoctoInstaller" - -/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARMv7" -rm -rf "$yoctoInstaller" - -echo "Installing Yocto toolchain for 64-bit b2qt..." - -versionARM64="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="5dcae7c6cbc266798ba49a9e51fff1f06790729d" -yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" -yoctoLocationARM64="/opt/yocto-arm64" -sysrootARM64="sysroots/aarch64-poky-linux" -crosscompileARM64="sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-" - -DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" -chmod +x "$yoctoInstaller" - -/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" -rm -rf "$yoctoInstaller" - -if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then - SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7" - SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" - SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" - SetEnvVar "QEMUARM64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARM64/$crosscompileARM64" -else - echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2 - exit 1 -fi - -echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt -echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh deleted file mode 100755 index 0f89e72c..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2017 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/linux/openssl_for_android_linux.sh" |