mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-23 11:00:25 +00:00
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:
parent
95f1fdd262
commit
d0d7738efa
@ -21,6 +21,7 @@ RUN apk add \
|
|||||||
mpc1-dev \
|
mpc1-dev \
|
||||||
mpfr-dev \
|
mpfr-dev \
|
||||||
ncurses-dev \
|
ncurses-dev \
|
||||||
|
patch \
|
||||||
sed \
|
sed \
|
||||||
squashfs-tools \
|
squashfs-tools \
|
||||||
tar \
|
tar \
|
||||||
@ -67,7 +68,7 @@ RUN set -e && \
|
|||||||
if [ -d /patches-${KERNEL_SERIES} ]; then \
|
if [ -d /patches-${KERNEL_SERIES} ]; then \
|
||||||
for patch in /patches-${KERNEL_SERIES}/*.patch; do \
|
for patch in /patches-${KERNEL_SERIES}/*.patch; do \
|
||||||
echo "Applying $patch"; \
|
echo "Applying $patch"; \
|
||||||
patch -p1 < "$patch"; \
|
patch -t -F0 -N -u -p1 < "$patch"; \
|
||||||
done; \
|
done; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -6,6 +6,7 @@ RUN apk add \
|
|||||||
diffutils \
|
diffutils \
|
||||||
libarchive-tools \
|
libarchive-tools \
|
||||||
ncurses-dev \
|
ncurses-dev \
|
||||||
|
patch \
|
||||||
xz
|
xz
|
||||||
|
|
||||||
ARG KERNEL_VERSIONS
|
ARG KERNEL_VERSIONS
|
||||||
@ -30,7 +31,7 @@ RUN set -e && \
|
|||||||
if [ -d /patches-${SERIES} ]; then \
|
if [ -d /patches-${SERIES} ]; then \
|
||||||
for patch in /patches-${SERIES}/*.patch; do \
|
for patch in /patches-${SERIES}/*.patch; do \
|
||||||
echo "Applying $patch" && \
|
echo "Applying $patch" && \
|
||||||
patch -p1 < "$patch"; \
|
patch -t -F0 -N -u -p1 < "$patch"; \
|
||||||
done; \
|
done; \
|
||||||
fi && \
|
fi && \
|
||||||
mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
|
mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
|
||||||
|
Loading…
Reference in New Issue
Block a user