kernel: Remove support for s390x

WIP #3676

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>

kernel/Dockerfile

@@ -18,6 +18,7 @@ RUN apk add \
     installkernel \
     kmod \
     elfutils-dev \
+    libunwind-dev \
     linux-headers \
     mpc1-dev \
     mpfr-dev \
@@ -32,9 +33,6 @@ RUN apk add \
     xz-dev \
     zlib-dev
 
-# libunwind-dev pkg is missing for s390x for now. Only install on other arch
-RUN [ $(uname -m) != s390x ] && apk add libunwind-dev || true
-
 ARG KERNEL_VERSION
 ARG KERNEL_SERIES
 ARG EXTRA
@@ -107,7 +105,6 @@ RUN set -e && \
 RUN tar cJf /out/src/linux.tar.xz /linux
 
 # Kernel config
-# The s390x defconfig moved with 5.2.x
 RUN case $(uname -m) in \
     x86_64) \
         KERNEL_DEF_CONF=/linux/arch/x86/configs/x86_64_defconfig; \
@@ -115,13 +112,6 @@ RUN case $(uname -m) in \
     aarch64) \
         KERNEL_DEF_CONF=/linux/arch/arm64/configs/defconfig; \
         ;; \
-    s390x) \
-        if [ -f /linux/arch/s390/defconfig ]; then \
-            KERNEL_DEF_CONF=/linux/arch/s390/defconfig; \
-        else \
-            KERNEL_DEF_CONF=/linux/arch/s390/configs/defconfig; \
-        fi; \
-        ;; \
     esac  && \
     cp /config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \
     if [ -n "${EXTRA}" ] && [ -f "/config-${KERNEL_SERIES}-$(uname -m)${EXTRA}" ]; then \
@@ -138,15 +128,7 @@ RUN case $(uname -m) in \
 
 
 # Kernel
-RUN case $(uname -m) in \
+RUN make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="-fno-pie" && \
-    s390x) \
-        KCFLAGS="-fno-pie -fPIC"; \
-        ;; \
-    *) \
-        KCFLAGS="-fno-pie"; \
-        ;; \
-    esac && \
-    make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="$KCFLAGS" && \
     case $(uname -m) in \
     x86_64) \
         cp arch/x86_64/boot/bzImage /out/kernel; \
@@ -154,9 +136,6 @@ RUN case $(uname -m) in \
     aarch64) \
         cp arch/arm64/boot/Image.gz /out/kernel; \
         ;; \
-    s390x) \
-        cp arch/s390/boot/bzImage /out/kernel; \
-        ;; \
     esac && \
     cp System.map /out && \
     ([ -n "${DEBUG}" ] && cp vmlinux /out || true)

kernel/Dockerfile.kconfig

@@ -44,13 +44,6 @@ RUN set -e && \
         fi && \
         [ ! -f /config-${SERIES}-x86_64 ] || mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
         [ ! -f /config-${SERIES}-aarch64 ] || mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig ; \
-        if [ -f /config-${SERIES}-s390x ]; then \
-            if [ -f /linux/arch/s390/defconfig ]; then \
-                mv /config-${SERIES}-s390x arch/s390/defconfig; \
-            else \
-                mv /config-${SERIES}-s390x arch/s390/configs/defconfig; \
-            fi; \
-        fi; \
     done
 
 ENTRYPOINT ["/bin/sh"]

kernel/Makefile

@@ -49,9 +49,6 @@ endif
 ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64))
 SUFFIX=-arm64
 endif
-ifeq ($(ARCH),s390x)
-SUFFIX=-s390x
-endif
 
 TAG=$(HASH)$(DIRTY)
 
@@ -270,9 +267,6 @@ $(eval $(call kernel,5.11.22,5.11.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,5.10.39,5.10.x,$(EXTRA),$(DEBUG)))
 $(eval $(call kernel,5.11.4,5.11.x,-rt,))
 
-else ifeq ($(ARCH),s390x)
-$(eval $(call kernel,5.11.22,5.11.x,$(EXTRA),$(DEBUG)))
-$(eval $(call kernel,5.10.39,5.10.x,$(EXTRA),$(DEBUG)))
 endif
 
 # Target for kernel config