github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2185 from arm64b/kernel-dockerfile-refactor

Browse Source 
ARM64: Adapt the kernel Dockerfile to multiarch support
This commit is contained in:
Justin Cormack 2017-07-11 15:24:54 +01:00 committed by GitHub
commit 5e7cb2b23d
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
kernel/Dockerfile
View File

@ -17,7 +17,6 @@ RUN apk add \
kmod \ kmod \
libelf-dev \ libelf-dev \
libressl-dev \ libressl-dev \
libunwind-dev \
linux-headers \ linux-headers \
ncurses-dev \ ncurses-dev \
sed \ sed \
@ -25,7 +24,11 @@ RUN apk add \
tar \ tar \
xz \ xz \
xz-dev \ xz-dev \
zlib-dev zlib-dev && \
# libunwind-dev pkg is missed from arm64 now, below statement will be removed if the pkg is available.
if [ $(uname -m) == x86_64 ]; then \
apk add libunwind-dev; \
fi
ARG KERNEL_VERSION ARG KERNEL_VERSION
ARG KERNEL_SERIES ARG KERNEL_SERIES
@ -50,13 +53,25 @@ 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
COPY kernel_config-${KERNEL_SERIES} /linux/arch/x86/configs/x86_64_defconfig # When using COPY with more than one source file, the destination must be a directory and end with a /
COPY kernel_config-${KERNEL_SERIES}* /linux/
COPY kernel_config.debug /linux/debug_config COPY kernel_config.debug /linux/debug_config
RUN if [ -n "${DEBUG}" ]; then \ RUN case $(uname -m) in \
sed -i 's/CONFIG_PANIC_ON_OOPS=y/# CONFIG_PANIC_ON_OOPS is not set/' /linux/arch/x86/configs/x86_64_defconfig; \ x86_64) \
cat /linux/debug_config >> /linux/arch/x86/configs/x86_64_defconfig; \ KERNEL_DEF_CONF=/linux/arch/x86/configs/x86_64_defconfig; \
fi cp /linux/kernel_config-${KERNEL_SERIES} ${KERNEL_DEF_CONF}; \
;; \
aarch64) \
KERNEL_DEF_CONF=/linux/arch/arm64/configs/defconfig; \
cp /linux/kernel_config-${KERNEL_SERIES}-aarch64 ${KERNEL_DEF_CONF}; \
;; \
esac && \
if [ -n "${DEBUG}" ]; then \
sed -i 's/CONFIG_PANIC_ON_OOPS=y/# CONFIG_PANIC_ON_OOPS is not set/' ${KERNEL_DEF_CONF}; \
cat /linux/debug_config >> ${KERNEL_DEF_CONF}; \
fi && \
rm /linux/kernel_config-${KERNEL_SERIES}*
# Apply local patches # Apply local patches
COPY patches-${KERNEL_SERIES} /patches COPY patches-${KERNEL_SERIES} /patches
@ -72,7 +87,14 @@ RUN mkdir /out
RUN make defconfig && \ RUN make defconfig && \
make oldconfig && \ make oldconfig && \
make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="-fno-pie" && \ make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="-fno-pie" && \
cp arch/x86_64/boot/bzImage /out/kernel && \ case $(uname -m) in \
x86_64) \
cp arch/x86_64/boot/bzImage /out/kernel; \
;; \
aarch64) \
cp arch/arm64/boot/Image.gz /out/kernel; \
;; \
esac && \
cp System.map /out && \ cp System.map /out && \
([ -n "${DEBUG}" ] && cp vmlinux /out || true) ([ -n "${DEBUG}" ] && cp vmlinux /out || true)