github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

kernel: Enable building kernels without patches

Browse Source 
Copying the entire local directory into the container allows
us to check for the existence of the patch directory and
only apply the patches if the directory exists.

An alternative would have been to re-arrange the patch directory
into a sub-directory, but in terms of copying wouldn't have
made that much if a difference.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-10-22 15:59:13 +01:00
parent ddbdb0aad7
commit 5afc16f275
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
kernel/Dockerfile
View File

@ -41,11 +41,13 @@ ENV WIREGUARD_VERSION=0.0.20171017
ENV WIREGUARD_SHA256=57b79a62874d9b99659a744513d4f6f9d88cb772deaa99e485b6fed3004a35cd ENV WIREGUARD_SHA256=57b79a62874d9b99659a744513d4f6f9d88cb772deaa99e485b6fed3004a35cd
ENV WIREGUARD_URL=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${WIREGUARD_VERSION}.tar.xz ENV WIREGUARD_URL=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${WIREGUARD_VERSION}.tar.xz
# PGP keys: 589DA6B1 (greg@kroah.com) & 6092693E (autosigner@kernel.org) & 00411886 (torvalds@linux-foundation.org) # We copy the entire directory. This copies some unneeded files, but
COPY keys.asc keys.asc # allows us to check for the existence /patches-${KERNEL_SERIES} to
# build kernels without patches.
COPY / /
# Download and verify kernel # Download and verify kernel
COPY sources/ / # PGP keys: 589DA6B1 (greg@kroah.com) & 6092693E (autosigner@kernel.org) & 00411886 (torvalds@linux-foundation.org)
RUN curl -fsSLO ${KERNEL_SHA256_SUMS} && \ RUN curl -fsSLO ${KERNEL_SHA256_SUMS} && \
gpg2 -q --import keys.asc && \ gpg2 -q --import keys.asc && \
gpg2 --verify sha256sums.asc && \ gpg2 --verify sha256sums.asc && \
@ -57,17 +59,17 @@ RUN curl -fsSLO ${KERNEL_SHA256_SUMS} && \
gpg2 --verify linux-${KERNEL_VERSION}.tar.sign linux-${KERNEL_VERSION}.tar && \ gpg2 --verify linux-${KERNEL_VERSION}.tar.sign linux-${KERNEL_VERSION}.tar && \
cat linux-${KERNEL_VERSION}.tar | tar --absolute-names -x && mv /linux-${KERNEL_VERSION} /linux cat linux-${KERNEL_VERSION}.tar | tar --absolute-names -x && mv /linux-${KERNEL_VERSION} /linux
# Apply local patches # Apply local patches if present
COPY patches-${KERNEL_SERIES} /patches
WORKDIR /linux WORKDIR /linux
RUN set -e && for patch in /patches/*.patch; do \ RUN set -e && \
echo "Applying $patch"; \ if [ -d /patches-${KERNEL_SERIES} ]; then \
patch -p1 < "$patch"; \ for patch in /patches-${KERNEL_SERIES}/*.patch; do \
done echo "Applying $patch"; \
patch -p1 < "$patch"; \
done; \
fi
# Kernel config # Kernel config
COPY kernel_config* /linux/
RUN case $(uname -m) in \ RUN case $(uname -m) in \
x86_64) \ x86_64) \
KERNEL_DEF_CONF=/linux/arch/x86/configs/x86_64_defconfig; \ KERNEL_DEF_CONF=/linux/arch/x86/configs/x86_64_defconfig; \
@ -76,15 +78,14 @@ RUN case $(uname -m) in \
KERNEL_DEF_CONF=/linux/arch/arm64/configs/defconfig; \ KERNEL_DEF_CONF=/linux/arch/arm64/configs/defconfig; \
;; \ ;; \
esac && \ esac && \
cp /linux/kernel_config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \ cp /kernel_config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \
if [ -n "${EXTRA}" ]; then \ if [ -n "${EXTRA}" ]; then \
sed -i "s/CONFIG_LOCALVERSION=\"-linuxkit\"/CONFIG_LOCALVERSION=\"-linuxkit${EXTRA}\"/" ${KERNEL_DEF_CONF}; \ sed -i "s/CONFIG_LOCALVERSION=\"-linuxkit\"/CONFIG_LOCALVERSION=\"-linuxkit${EXTRA}\"/" ${KERNEL_DEF_CONF}; \
if [ "${EXTRA}" = "-dbg" ]; then \ if [ "${EXTRA}" = "-dbg" ]; then \
sed -i 's/CONFIG_PANIC_ON_OOPS=y/# CONFIG_PANIC_ON_OOPS is not set/' ${KERNEL_DEF_CONF}; \ sed -i 's/CONFIG_PANIC_ON_OOPS=y/# CONFIG_PANIC_ON_OOPS is not set/' ${KERNEL_DEF_CONF}; \
fi && \ fi && \
cat /linux/kernel_config${EXTRA} >> ${KERNEL_DEF_CONF}; \ cat /kernel_config${EXTRA} >> ${KERNEL_DEF_CONF}; \
fi && \ fi && \
rm /linux/kernel_config* && \
make defconfig && \ make defconfig && \
make oldconfig && \ make oldconfig && \
if [ -z "${EXTRA}" ]; then diff .config ${KERNEL_DEF_CONF}; fi if [ -z "${EXTRA}" ]; then diff .config ${KERNEL_DEF_CONF}; fi

13
kernel/Dockerfile.kconfig
View File

@ -10,8 +10,6 @@ RUN apk add \
ARG KERNEL_VERSIONS ARG KERNEL_VERSIONS
# There is no simple way to copy directories with wild cards as needed
# for patches-*. Copy the entire dir instead.
COPY / / COPY / /
# Unpack kernels (download if not present) # Unpack kernels (download if not present)
@ -27,10 +25,13 @@ RUN for VERSION in ${KERNEL_VERSIONS}; do \
SERIES=${VERSION%.*}.x && \ SERIES=${VERSION%.*}.x && \
echo "Patching $VERSION" && \ echo "Patching $VERSION" && \
cd /linux-${VERSION} && \ cd /linux-${VERSION} && \
set -e && for patch in /patches-${SERIES}/*.patch; do \ set -e && \
echo "Applying $patch" && \ if [ -d /patches-${KERNEL_SERIES} ]; then \
patch -p1 < "$patch"; \ for patch in /patches-${SERIES}/*.patch; do \
done && \ echo "Applying $patch" && \
patch -p1 < "$patch"; \
done; \
fi && \
mv /kernel_config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \ mv /kernel_config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
mv /kernel_config-${SERIES}-aarch64 arch/arm64/configs/defconfig; \ mv /kernel_config-${SERIES}-aarch64 arch/arm64/configs/defconfig; \
done done