kernel: Tighten patching of the kernel

- Disable any fuzzing. Patches should apply cleanly
- Assume unified diffs

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2018-02-08 11:27:04 +00:00
parent 95f1fdd262
commit d0d7738efa
2 changed files with 4 additions and 2 deletions

View File

@ -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

View File

@ -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 && \