diff options
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-qemu.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-qemu.sh | 203 |
1 files changed, 2 insertions, 201 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-qemu.sh index d4ad40b7..9a316bce 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/03-qemu.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -34,215 +34,16 @@ set -ex -# shellcheck source=../common/unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -sudo apt-get -y install automake autoconf libtool - -DownloadAndBuiltQemu () { - tempDir=$(mktemp -d) - cd ${tempDir} - - commit_sha=c7f1cf01b8245762ca5864e835d84f6677ae8b1f - qemu_tarball="qemu_tarball.zip" - PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/qemu/${qemu_tarball}" - AltUrl="https://github.com/qemu/qemu/archive/${commit_sha}.zip" - SHA1="351289c4420f16575bff060f91ce540d7b3fa2ab" - DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$qemu_tarball" - unzip ${qemu_tarball} - cd qemu-${commit_sha} - - fixes=( 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 04b33e21866412689f18b7ad6daf0a54d8f959a7 cd8133679f7e0e2c292f631f1c78b2452d2435c7 ) - fixes_sha1sums=( e53c4f567b461e7e2905636b369c4458ee8c0277 1914e5fa2f707d69d86ceb7c94957d096c8e8db4 eeca01c307d37eb362913b3f811034d5ac77cac8 ) - for i in $(seq 0 $((${#fixes[@]} - 1))); do - PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/qemu/${fixes[$i]}.diff" - AltUrl="https://github.com/qemu/qemu/commit/${fixes[$i]}.diff" - SHA1="${fixes_sha1sums[$i]}" - DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "${fixes[$i]}.diff" - patch -p1 < ${fixes[$i]}.diff - done - -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 - -patch -p1 <<EOT -From fb4f0fa319e757c083f0b3674f575a09c323f5aa Mon Sep 17 00:00:00 2001 -From: Assam Boudjelthia <assam.boudjelthia@qt.io> -Date: Tue, 20 Aug 2019 09:46:46 +0300 -Subject: [PATCH] Suppress unsupported syscall and ioctl debug messages - -Those messages were spamming the CI tests output, thus they can -only be shown by defining environment variable QEMU_SYSCALL_DEBUG=true - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 94d8abc745..e72cfb0cb5 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -5479,7 +5479,8 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) - ie = ioctl_entries; - for(;;) { - if (ie->target_cmd == 0) { -- gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); -+ if (getenv("QEMU_SYSCALL_DEBUG")) -+ gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); - return -TARGET_ENOSYS; - } - if (ie->target_cmd == cmd) -@@ -12172,7 +12173,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, - - default: - unimplemented: -- gemu_log("qemu: Unsupported syscall: %d\n", num); -+ if (getenv("QEMU_SYSCALL_DEBUG")) -+ gemu_log("qemu: Unsupported syscall: %d\n", num); - #if defined(TARGET_NR_setxattr) || defined(TARGET_NR_get_thread_area) || defined(TARGET_NR_getdomainname) || defined(TARGET_NR_set_robust_list) - unimplemented_nowarn: - #endif --- -2.17.1 -EOT - - ./configure --disable-bsd-user --disable-guest-agent --disable-strip --disable-werror --disable-gcrypt --disable-debug-info --disable-debug-tcg --disable-tcg-interpreter --enable-attr --disable-brlapi --disable-linux-aio --disable-bzip2 --disable-bluez --disable-cap-ng --disable-curl --disable-fdt --disable-glusterfs --disable-gnutls --disable-nettle --disable-gtk --disable-rdma --disable-libiscsi --disable-vnc-jpeg --disable-kvm --disable-lzo --disable-curses --disable-libnfs --disable-numa --disable-opengl --disable-vnc-png --disable-rbd --disable-vnc-sasl --disable-sdl --disable-seccomp --disable-smartcard --disable-snappy --disable-spice --disable-libusb --disable-usb-redir --disable-vde --disable-vhost-net --disable-virglrenderer --disable-virtfs --disable-vnc --disable-vte --disable-xen --disable-xen-pci-passthrough --disable-xfsctl --enable-linux-user --disable-system --disable-blobs --disable-tools --target-list=arm-linux-user,aarch64-linux-user --static --disable-pie --disable-docs - make - sudo make install - -# To create a new qemu.deb file add "--prefix=${tempDir}/qemu_prebuilt/usr/local/" to ./configure -# Then add the following commands, make sure to change the version number. -# mkdir ${tempDir}/qemu_prebuilt/DEBIAN -# echo -n "Package: QEMU -# Version: 2.8.0-833-g09cc6b1ab7-dirty -# Section: misc -# Priority: important -# Architecture: i386 -# Maintainer: Fabrice Bellard and the QEMU Project developers -# Description: QEMU for arm and arm64" > ${tempDir}/qemu_prebuilt/DEBIAN/control -# -# dpkg-deb --build ${tempDir}/qemu_prebuilt/ - rm -rf ${tempDir} -} - -qemu_prebuilt="/tmp/qemu_prebuilt.deb" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/qemu/qemu_prebuilt.deb" -AltUrl=${PrimaryUrl} -SHA1="a50bea7ee79ca7b7b6eebe55f02853997d445ea4" -DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$qemu_prebuilt" 2>&1 && success=$? || success=$? -if [ $success -eq 0 ]; then - sudo dpkg -i ${qemu_prebuilt} -else - DownloadAndBuiltQemu -fi - -# 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" +qemu_env="QT_WAYLAND_DISABLE_WINDOWDECORATION=1" SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\"" |