Merge branch 'master' into deploy

Author: mpe

build/Makefile

@@ -13,8 +13,7 @@ ifeq ($(shell uname -m),ppc64le)
 endif
 
 FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@35 fedora@34 fedora@33 fedora@31 fedora
-# Sort is to elimiate duplicates if UBUNTU_LATEST == 21.10
-UBUNTU_DISTROS := $(sort ubuntu@${UBUNTU_LATEST} ubuntu@21.10 ubuntu@21.04 ubuntu@20.04 ubuntu@18.04 ubuntu@16.04 ubuntu)
+UBUNTU_DISTROS := ubuntu@${UBUNTU_LATEST} ubuntu@20.04 ubuntu@18.04 ubuntu@16.04 ubuntu
 KORG_DISTROS := korg@12.1.0 korg@11.3.0 korg@11.1.0 korg@10.3.0 korg@9.4.0 korg@9.3.0 korg@8.5.0 korg@8.1.0 korg@5.5.0
 ALL_DISTROS := ${UBUNTU_DISTROS} ${KORG_DISTROS} ${FEDORA_DISTROS}
 DOCS_DISTRO := docs@${UBUNTU_LATEST}

build/scripts/build.sh

@@ -142,6 +142,10 @@ if [[ "$task" == "kernel" ]]; then
     if [[ -n "$CLANG" ]]; then
         cmd+="-e CLANG=1 "
     fi
+
+    if [[ -n "$LLVM_IAS" ]]; then
+        cmd+="-e LLVM_IAS=$LLVM_IAS "
+    fi
 fi
 
 if [[ "$task" == "ppctests" ]]; then

build/ubuntu/Dockerfile

@@ -7,6 +7,9 @@ ARG apt_mirror
 ENV apt_mirror=${apt_mirror}
 RUN [ -n "$apt_mirror" ] && sed -i -e "s|ports.ubuntu.com|$apt_mirror|" /etc/apt/sources.list || true
 
+# Deal with Ubuntu 21.10 repos moving to old-releases (ppc64le only)
+RUN [ "$from" = "ubuntu:21.10" ] && sed -i -e "s|ports.ubuntu.com/ubuntu-ports|old-releases.ubuntu.com/ubuntu|" /etc/apt/sources.list || true
+
 RUN apt-get -q -y update && \
     DEBIAN_FRONTEND=noninteractive \
     apt-get -q -y install --no-install-recommends \

external/korg-toolchains/Makefile

@@ -50,7 +50,8 @@ ARCHES := alpha \
 	x86_64 \
 	xtensa
 
-VERSIONS := 12.1.0 \
+VERSIONS := 12.2.0 \
+	12.1.0 \
 	11.3.0 \
 	11.1.0 \
 	10.3.0 \
@@ -86,8 +87,8 @@ download-all: $(ALL_TARGETS)
 
 CLEAN_DIRS := $(patsubst %,gcc-%-nolibc,$(VERSIONS))
 
-# Only download powerpc 11.1.0 & 5.5.0 by default
-download: gcc-11.1.0-nolibc/powerpc64-linux gcc-5.5.0-nolibc/powerpc64-linux
+# Only download powerpc 12.2.0 & 5.5.0 by default
+download: gcc-12.2.0-nolibc/powerpc64-linux gcc-5.5.0-nolibc/powerpc64-linux
 
 prepare: download
 

external/qemu-7.1.0/Makefile

@@ -0,0 +1,28 @@
+version=$(shell cat VERSION)
+
+help:
+	@echo "qemu-$(version)"
+	@echo "Available targets:"
+	@echo "  download       # download required sources"
+	@echo "  prepare        # download and install dependencies"
+	@echo "  build          # build it"
+
+qemu.tar.xz:
+	wget --no-verbose -O $@.tmp https://download.qemu.org/qemu-$(version).tar.xz
+	mv $@.tmp $@
+
+download: qemu.tar.xz
+
+prepare: download
+	@./install-deps.sh
+
+build: download
+	+@./build.sh
+
+clean:
+	rm -rf build src install log
+
+distclean: clean
+	rm -f qemu.tar.xz
+
+.PHONY: download prepare build clean distclean help

external/qemu-7.1.0/VERSION

@@ -0,0 +1 @@
+7.1.0

external/qemu-7.1.0/build.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -euo pipefail
+
+if [[ -n ${MAKEFLAGS:-} ]]; then
+    # Don't override existing make flags
+    jflags=
+else
+    jflags="-j $(nproc)"
+fi
+
+echo "Sending output to $PWD/log."
+rm -f log
+
+{
+    rm -rf src
+    tar -xf qemu.tar.xz
+    mv qemu-* src
+
+    rm -rf install
+    mkdir install
+    install="$PWD/install"
+
+    rm -rf build
+    mkdir build
+    cd build
+
+    set -x
+
+    ../src/configure --prefix=$install --target-list=ppc-softmmu,ppc64-softmmu --disable-gtk
+    make $jflags -s
+    make $jflags -s install
+    cd ..
+
+    rm -rf src build
+
+    set +x
+    echo "success: qemu build" >&2
+
+} 2>&1 >> log | tee -a log

external/qemu-7.1.0/install-deps.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+set -euo pipefail
+
+. /etc/os-release
+
+sudo=""
+if [[ $(id -u) != 0 ]]; then
+    sudo="sudo"
+fi
+
+if [[ "$ID" == "fedora" ]]; then
+    (set -x; $sudo dnf -y install \
+        bison \
+        bzip2 \
+        flex \
+        glib2-devel \
+        libcap-ng-devel \
+        libpmem-devel \
+        libseccomp-devel \
+        libudev-devel \
+        meson \
+        ninja-build \
+        pixman-devel
+    )
+elif [[ "$ID_LIKE" == "debian" ]]; then
+    (set -x; $sudo apt-get -y install \
+        bison \
+        bzip2 \
+        flex \
+        libcap-ng-dev \
+        libglib2.0-dev \
+        libpixman-1-dev \
+        libseccomp-dev \
+        meson \
+        ninja-build
+     )
+else
+    echo "Unsupported distro!" >&2
+    exit 1
+fi

lib/pexpect_utils.py

@@ -23,7 +23,7 @@ def __init__(self):
         self.bug_patterns = self.default_bug_patterns
 
     def spawn(self, *args, **kwargs):
-        logging.info("Spawning '%s'" % args)
+        logging.debug("Spawning '%s'" % args)
         self.child = pexpect.spawn(*args, encoding='utf-8', echo=False, **kwargs)
         if '--quiet' not in sys.argv:
             self.log_to(sys.stdout)