Merge branch 'master' into deploy

Author: mpe

README.md

@@ -66,11 +66,12 @@ There are images for various toolchains, they are encoded in the distro name/ver
  - `ubuntu@20.04`: Ubuntu 20.04, gcc 9.4.0, binutils 2.34
  - `ubuntu@18.04`: Ubuntu 18.04, gcc 7.5.0, binutils 2.30
  - `ubuntu@16.04`: Ubuntu 16.04, gcc 5.4.0, binutils 2.26.1
- - `fedora@36`: Fedora 36, gcc 12.1.1, binutils 2.37-7
- - `fedora@35`: Fedora 35, gcc 11.2.1, binutils 2.37-3
- - `fedora@34`: Fedora 34, gcc 11.2.1, binutils 2.35.2
- - `fedora@33`: Fedora 33, gcc 10.2.1, binutils 2.35.1
- - `fedora@31`: Fedora 31, gcc 9.2.1, binutils 2.32
+ - `fedora@37`: Fedora 37, gcc 12.2.1, binutils 2.38-5, clang 15.0.7
+ - `fedora@36`: Fedora 36, gcc 12.1.1, binutils 2.37-7, clang 14.0.5
+ - `fedora@35`: Fedora 35, gcc 11.2.1, binutils 2.37-3, clang 13.0.1
+ - `fedora@34`: Fedora 34, gcc 11.2.1, binutils 2.35.2, clang 12.0.1
+ - `fedora@33`: Fedora 33, gcc 10.2.1, binutils 2.35.1, clang 11.0.0
+ - `fedora@31`: Fedora 31, gcc 9.2.1, binutils 2.32, clang 9.0.1
 
 Only the Ubuntu toolchains can build the selftests.
 

build/Makefile

@@ -1,6 +1,6 @@
 all: help
 
-export FEDORA_LATEST := 36
+export FEDORA_LATEST := 37
 export UBUNTU_LATEST := 22.04
 
 # If we're on ppc64le
@@ -12,7 +12,7 @@ ifeq ($(shell uname -m),ppc64le)
     endif
 endif
 
-FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@35 fedora@34 fedora@33 fedora@31 fedora
+FEDORA_DISTROS := fedora@${FEDORA_LATEST} fedora@36 fedora@35 fedora@34 fedora@33 fedora@31 fedora
 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}

build/fedora/Dockerfile

@@ -1,7 +1,7 @@
 ARG from
 FROM ${from}
 
-RUN dnf -y install \
+RUN dnf -y install --setopt=install_weak_deps=False \
         bc \
         bison \
         bzip2 \
@@ -22,6 +22,8 @@ RUN dnf -y install \
         hostname \
         kmod \
         libmpc-devel \
+        lld \
+        llvm \
         lz4 \
         lzop \
         make \

build/scripts/image.sh

@@ -34,23 +34,61 @@ elif [[ "$task" == "pull-image" ]]; then
 	exit $?
     fi
 
+    # Tag the arch specific image with the generic tag
     cmd="$DOCKER tag $arch_image $image"
     (set -x; $cmd)
+    if [[ $? -ne 0 ]]; then
+        echo "Error: tagging $arch_image as $image?" >&2
+        exit 1
+    fi
+
+    # Remove the arch tag (not the whole image)
+    cmd="$DOCKER rmi $arch_image"
+    (set -x; $cmd)
+    if [[ $? -ne 0 ]]; then
+        echo "Error: untagging $arch_image?" >&2
+        exit 1
+    fi
 
-    exit $?
+    exit 0
 elif [[ "$task" == "push-image" ]]; then
     if [[ -n "$DOCKER_PASSWORD" && -n "$DOCKER_USER" ]]; then
 	cmd="$DOCKER login -u $DOCKER_USER -p $DOCKER_PASSWORD"
 	(set -x; $cmd)
     fi
 
-    image="$image-$(uname -m)"
-    cmd="$DOCKER push $image"
+    # Temporarily tag the image with the arch
+    arch_image="$image-$(uname -m)"
+    cmd="$DOCKER tag $image $arch_image"
+    (set -x; $cmd)
+    if [[ $? -ne 0 ]]; then
+        echo "Error: tagging $image as $arch_image?" >&2
+        exit 1
+    fi
+
+    cmd="$DOCKER push $arch_image"
+    (set -x; $cmd)
+    if [[ $? -ne 0 ]]; then
+        echo "Error: pushing $arch_image?" >&2
+        exit 1
+    fi
+
+    # Remove the arch tag (not the whole image)
+    cmd="$DOCKER rmi $arch_image"
     (set -x; $cmd)
-    exit $?
+    if [[ $? -ne 0 ]]; then
+        echo "Error: untagging $arch_image?" >&2
+        exit 1
+    fi
+
+    exit 0
 fi
 
-cmd="$DOCKER build --pull -f $distro/Dockerfile "
+cmd="$DOCKER build -f $distro/Dockerfile "
+
+if [[ "$distro" != "ubuntu-allcross" ]]; then
+    cmd+="--pull "
+fi
 
 if [[ -n "$http_proxy" ]]; then
     cmd+="--build-arg http_proxy=$http_proxy "
@@ -73,7 +111,7 @@ from="${DOCKER_REGISTRY}$distro:$version"
 if [[ "$distro" == "docs" ]]; then
     from="${DOCKER_REGISTRY}ubuntu:$version"
 elif [[ "$distro" == "ubuntu-allcross" ]]; then
-	from="${DOCKER_REGISTRY}linuxppc/build:ubuntu-$version-$(uname -m)"
+	from="${DOCKER_REGISTRY}linuxppc/build:ubuntu-$version"
 elif [[ "$distro" == "korg" ]]; then
     cmd+="--build-arg compiler_version=$version "
 
@@ -94,7 +132,6 @@ cmd+="--build-arg uid=$UID "
 cmd+="--build-arg gid=$GID "
 cmd+="--build-arg from=$from "
 cmd+="--build-arg apt_mirror=$APT_MIRROR "
-cmd+="-t $image-$(uname -m) "
 cmd+="-t $image ."
 
 (set -x; $cmd)

build/scripts/lib.sh

@@ -33,13 +33,9 @@ function get_output_dir()
     fi
 
     if [[ -n "$CI_OUTPUT" ]]; then
-        d="$CI_OUTPUT/$subarch@$distro"
+        d="$CI_OUTPUT"
     else
-        d="$script_base/../output/$subarch@$distro"
-    fi
-
-    if [[ -n "$version" ]]; then
-        d="$d@$version"
+        d="$script_base/../output"
     fi
 
     case "$task" in
@@ -68,7 +64,16 @@ function get_output_dir()
     esac
 
     if [[ -n "$clang" ]]; then
-	d="${d}_clang"
+        # Append "+clang" if it's not already part of the defconfig name
+        if [[ "$defconfig" != *"+"* ]]; then
+            d="${d}+clang"
+        fi
+    fi
+
+    d="$d@$subarch@$distro"
+
+    if [[ -n "$version" ]]; then
+        d="$d@$version"
     fi
 
     echo "$d"

build/ubuntu/Dockerfile

@@ -1,5 +1,6 @@
 ARG from
 FROM ${from}
+ARG from
 
 COPY ubuntu/packages.sh /tmp/packages.sh
 
@@ -8,7 +9,7 @@ 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 if echo "$from" | grep -q ".*ubuntu:21.10"; then sed -i -e "s|ports.ubuntu.com/ubuntu-ports|old-releases.ubuntu.com/ubuntu|" /etc/apt/sources.list; fi
 
 RUN apt-get -q -y update && \
     DEBIAN_FRONTEND=noninteractive \

etc/configs/4k-pages.config

@@ -0,0 +1,2 @@
+CONFIG_PPC_4K_PAGES=y
+CONFIG_PPC_64K_PAGES=n

etc/configs/9p.config

@@ -0,0 +1,13 @@
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_9P_FS=y
+CONFIG_NET_9P_DEBUG=n
+CONFIG_NET_9P_FD=y
+CONFIG_NET_9P_RDMA=n
+CONFIG_NET_9P_VIRTIO=y
+CONFIG_NET_9P=y
+CONFIG_NETFS_STATS=n
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_PCI=y
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=y

etc/configs/criu.config

@@ -0,0 +1,2 @@
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_MEM_SOFT_DIRTY=y

etc/configs/debug-atomic-sleep.config

@@ -0,0 +1 @@
+CONFIG_DEBUG_ATOMIC_SLEEP=y