From d0d7738efac6127263827f60b65e22eb34264ee4 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 8 Feb 2018 11:27:04 +0000 Subject: [PATCH] kernel: Tighten patching of the kernel - Disable any fuzzing. Patches should apply cleanly - Assume unified diffs Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 3 ++- kernel/Dockerfile.kconfig | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index f0df45c78..73225e549 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -21,6 +21,7 @@ RUN apk add \ mpc1-dev \ mpfr-dev \ ncurses-dev \ + patch \ sed \ squashfs-tools \ tar \ @@ -67,7 +68,7 @@ RUN set -e && \ if [ -d /patches-${KERNEL_SERIES} ]; then \ for patch in /patches-${KERNEL_SERIES}/*.patch; do \ echo "Applying $patch"; \ - patch -p1 < "$patch"; \ + patch -t -F0 -N -u -p1 < "$patch"; \ done; \ fi diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig index 9ba3fdc46..163485b75 100644 --- a/kernel/Dockerfile.kconfig +++ b/kernel/Dockerfile.kconfig @@ -6,6 +6,7 @@ RUN apk add \ diffutils \ libarchive-tools \ ncurses-dev \ + patch \ xz ARG KERNEL_VERSIONS @@ -30,7 +31,7 @@ RUN set -e && \ if [ -d /patches-${SERIES} ]; then \ for patch in /patches-${SERIES}/*.patch; do \ echo "Applying $patch" && \ - patch -p1 < "$patch"; \ + patch -t -F0 -N -u -p1 < "$patch"; \ done; \ fi && \ mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \