From 72ed2b3a0638d7821544770f2c27cc12df873890 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 20 Aug 2017 10:46:28 +0100 Subject: [PATCH] kernel: Rename kernel_config-4.x.x to kernel_config-4.x.x-x86_64 Consistently arch suffixes for kernel config. Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 3 +-- kernel/{kernel_config-4.4.x => kernel_config-4.4.x-x86_64} | 0 kernel/{kernel_config-4.9.x => kernel_config-4.9.x-x86_64} | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename kernel/{kernel_config-4.4.x => kernel_config-4.4.x-x86_64} (100%) rename kernel/{kernel_config-4.9.x => kernel_config-4.9.x-x86_64} (100%) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index a74bb220e..aa259cc3c 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -64,13 +64,12 @@ COPY kernel_config.debug /linux/debug_config RUN case $(uname -m) in \ x86_64) \ KERNEL_DEF_CONF=/linux/arch/x86/configs/x86_64_defconfig; \ - 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 && \ + cp /linux/kernel_config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \ 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}; \ diff --git a/kernel/kernel_config-4.4.x b/kernel/kernel_config-4.4.x-x86_64 similarity index 100% rename from kernel/kernel_config-4.4.x rename to kernel/kernel_config-4.4.x-x86_64 diff --git a/kernel/kernel_config-4.9.x b/kernel/kernel_config-4.9.x-x86_64 similarity index 100% rename from kernel/kernel_config-4.9.x rename to kernel/kernel_config-4.9.x-x86_64