5 files changed, 32 insertions, 44 deletions
diff --git a/scripts/package-build/linux-kernel/build-kernel.sh b/scripts/package-build/linux-kernel/build-kernel.sh
index 0e11266c..cae3d8db 100755
--- a/scripts/package-build/linux-kernel/build-kernel.sh
+++ b/scripts/package-build/linux-kernel/build-kernel.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 CWD=$(pwd)
 KERNEL_SRC=linux
-ARCH=$(dpkg --print-architecture)
 
 set -e
 
@@ -18,9 +17,6 @@ if [ -d .git ]; then
     git clean --force -d -x
 fi
 
-echo "I: Copy Kernel config (x86_64_vyos_defconfig) to Kernel Source"
-cp -rv ${CWD}/arch/ .
-
 if [ -d /usr/lib/ccache/ ]; then
     export PATH=/usr/lib/ccache:$PATH
 fi
@@ -28,13 +24,24 @@ fi
 KERNEL_VERSION=$(make kernelversion)
 KERNEL_SUFFIX=-$(awk -F "= " '/kernel_flavor/ {print $2}' ../../../../data/defaults.toml | tr -d \")
 
+echo "I: Generate Kernel config"
+ARCH=$(dpkg --print-architecture)
 if [ "${ARCH}" = "arm64" ]; then
     KERNEL_CONFIG=arch/arm64/configs/vyos_defconfig
-else
+    cp ${CWD}/config/arm64/vyos_defconfig ${KERNEL_CONFIG}
+elif [ "${ARCH}" = "amd64" ]; then
     KERNEL_CONFIG=arch/x86/configs/vyos_defconfig
+    cp ${CWD}/config/x86/vyos_defconfig ${KERNEL_CONFIG}
+else
+    echo "E: unsupported architecture"
+    exit 1
 fi
 
-echo "KERNEL_CONFIG: ${KERNEL_CONFIG}"
+for KRN_CONF_SNIPPET in $(ls ${CWD}/config/*.config)
+do
+    echo "I: adding configuration snippet ${KRN_CONF_SNIPPET}"
+    cat ${KRN_CONF_SNIPPET} >> ${KERNEL_CONFIG}
+done
 
 # VyOS requires some small Kernel Patches - apply them here
 # It's easier to habe them here and make use of the upstream
diff --git a/scripts/package-build/linux-kernel/config/00-executable-file-formats.config b/scripts/package-build/linux-kernel/config/00-executable-file-formats.config
new file mode 100644
index 00000000..f14d5be1
--- /dev/null
+++ b/scripts/package-build/linux-kernel/config/00-executable-file-formats.config
@@ -0,0 +1,15 @@
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ARCH_BINFMT_ELF_STATE=y
+CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
+CONFIG_ARCH_HAVE_ELF_PROT=y
+CONFIG_ARCH_USE_GNU_PROPERTY=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
diff --git a/scripts/package-build/linux-kernel/config/01-swap.config b/scripts/package-build/linux-kernel/config/01-swap.config
new file mode 100644
index 00000000..cde3a011
--- /dev/null
+++ b/scripts/package-build/linux-kernel/config/01-swap.config
@@ -0,0 +1,4 @@
+#
+# Memory Management options
+#
+# CONFIG_SWAP is not set
diff --git a/scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig
index a15d1729..59e2fa59 100644
--- a/scripts/package-build/linux-kernel/arch/arm64/configs/vyos_defconfig
+++ b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig
@@ -909,27 +909,6 @@ CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
 CONFIG_FREEZER=y
 
 #
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_STATE=y
-CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y
-CONFIG_ARCH_HAVE_ELF_PROT=y
-CONFIG_ARCH_USE_GNU_PROPERTY=y
-CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-# CONFIG_SWAP is not set
-
-#
 # SLAB allocator options
 #
 # CONFIG_SLAB_DEPRECATED is not set
diff --git a/scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig
index a3d4cae9..261eb499 100644
--- a/scripts/package-build/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig
@@ -946,23 +946,6 @@ CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
 CONFIG_FREEZER=y
 
 #
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-CONFIG_COMPAT_BINFMT_ELF=y
-CONFIG_ELFCORE=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-# end of Executable file formats
-
-#
-# Memory Management options
-#
-# CONFIG_SWAP is not set
-
-#
 # SLAB allocator options
 #
 # CONFIG_SLAB_DEPRECATED is not set