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

kernel: Adjust s390x defconfig location

Browse Source 
With 5.2.x the location moved to the configs subdirectory
to be more in line with other architectures.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer 2019-09-15 17:07:06 +01:00
parent 6649327285
commit 3b00838d6d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/Dockerfile
View File

@ -90,6 +90,7 @@ RUN mkdir -p /out/src
RUN tar cJf /out/src/linux.tar.xz /linux RUN tar cJf /out/src/linux.tar.xz /linux
# Kernel config # Kernel config
# The s390x defconfig moved with 5.2.x
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; \
@ -98,7 +99,11 @@ RUN case $(uname -m) in \
KERNEL_DEF_CONF=/linux/arch/arm64/configs/defconfig; \ KERNEL_DEF_CONF=/linux/arch/arm64/configs/defconfig; \
;; \ ;; \
s390x) \ s390x) \
KERNEL_DEF_CONF=/linux/arch/s390/defconfig; \ if [ -f /linux/arch/s390/defconfig ]; then \
KERNEL_DEF_CONF=/linux/arch/s390/defconfig; \
else \
KERNEL_DEF_CONF=/linux/arch/s390/configs/defconfig; \
fi; \
;; \ ;; \
esac && \ esac && \
cp /config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \ cp /config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \

8
kernel/Dockerfile.kconfig
View File

@ -43,7 +43,13 @@ RUN set -e && \
fi && \ fi && \
[ ! -f /config-${SERIES}-x86_64 ] || mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \ [ ! -f /config-${SERIES}-x86_64 ] || mv /config-${SERIES}-x86_64 arch/x86/configs/x86_64_defconfig && \
[ ! -f /config-${SERIES}-aarch64 ] || mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig ; \ [ ! -f /config-${SERIES}-aarch64 ] || mv /config-${SERIES}-aarch64 arch/arm64/configs/defconfig ; \
[ ! -f /config-${SERIES}-s390x ] || mv /config-${SERIES}-s390x arch/s390/defconfig; \ if [ -f /config-${SERIES}-s390x ]; then \
if [ -f /linux/arch/s390/defconfig ]; then \
mv /config-${SERIES}-s390x arch/s390/defconfig; \
else \
mv /config-${SERIES}-s390x arch/s390/configs/defconfig; \
fi; \
fi; \
done done
ENTRYPOINT ["/bin/sh"] ENTRYPOINT ["/bin/sh"]