From 5d72fedc63681a42f13624c26e4c40c6a1e0b539 Mon Sep 17 00:00:00 2001
From: Reinis Danne <rei4dan@gmail.com>
Date: Wed, 19 Dec 2018 11:58:06 +0200
Subject: [PATCH] Add support for merging kernel config fragment

Use merge_config.sh that comes with kernel sources since v3.4.

By default look for kernel config fragment to merge in
/etc/default/genkernel_kconfig_fragment which can be overridden by
setting KCONFIG_FRAGMENT.

If KCONFIG_FRAGMENT is an array, merge all fragments.
---
 gen_cmdline.sh       |  6 ++++++
 gen_configkernel.sh  | 14 ++++++++++++++
 gen_determineargs.sh |  7 +++++++
 genkernel.conf       |  5 +++++
 4 files changed, 32 insertions(+)

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index b11ae369..5d36bfe1 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -23,6 +23,8 @@ longusage() {
   echo "    --color         Output debug in color"
   echo "    --no-color      Do not output debug in color"
   echo "  Kernel Configuration settings"
+  echo "    --mergekconfig      Run merge_config.sh instead of oldconfig"
+  echo "    --no-mergekconfig   Do not run merge_config.sh instead of oldconfig"
   echo "    --menuconfig        Run menuconfig after oldconfig"
   echo "    --no-menuconfig     Do not run menuconfig after oldconfig"
   echo "    --nconfig       Run nconfig after oldconfig"
@@ -358,6 +360,10 @@ parse_cmdline() {
             LOGLEVEL="${CMD_LOGLEVEL}"
             print_info 2 "CMD_LOGLEVEL: ${CMD_LOGLEVEL}"
             ;;
+        --mergekconfig|--no-mergekconfig)
+            CMD_MERGE_KCONFIG=`parse_optbool "$*"`
+            print_info 2 "CMD_MERGE_KCONFIG: ${CMD_MERGE_KCONFIG}"
+            ;;
         --menuconfig)
             TERM_LINES=`stty -a | head -n 1 | cut -d\  -f5 | cut -d\; -f1`
             TERM_COLUMNS=`stty -a | head -n 1 | cut -d\  -f7 | cut -d\; -f1`
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 27ff7f3e..0428955c 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -65,6 +65,20 @@ config_kernel() {
         fi
     fi
 
+    # Support kernel config fragment merging.
+    if isTrue "${MERGE_KCONFIG}"
+    then
+        KCONFIG_FRAGMENT=${KCONFIG_FRAGMENT:-/etc/default/genkernel_kconfig_fragment}
+        local message="Error: Config fragment ${KCONFIG_FRAGMENT} not found!"
+        print_info 1 "kernel: Merging config with ${KCONFIG_FRAGMENT}"
+        [[ -f "${KCONFIG_FRAGMENT}" ]] || gen_die  "${message}"
+        KCONFIG_CONFIG="${KERNEL_OUTPUTDIR}/.config" \
+            "${KERNEL_DIR}"/scripts/kconfig/merge_config.sh \
+            "${KERNEL_OUTPUTDIR}/.config" \
+            "${KCONFIG_FRAGMENT[@]}"
+        [[ "$?" ]] || gen_die "Error: merge_config.sh failed!"
+    fi
+
     if isTrue "${OLDCONFIG}"
     then
         print_info 1 '        >> Running oldconfig...'
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 324bf11d..f2f8104f 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -97,6 +97,7 @@ determine_real_args() {
     set_config_with_override BOOL   PLYMOUTH             CMD_PLYMOUTH
     set_config_with_override BOOL   POSTCLEAR            CMD_POSTCLEAR
     set_config_with_override BOOL   MRPROPER             CMD_MRPROPER
+    set_config_with_override BOOL   MERGE_KCONFIG        CMD_MERGE_KCONFIG
     set_config_with_override BOOL   MENUCONFIG           CMD_MENUCONFIG
     set_config_with_override BOOL   NCONFIG              CMD_NCONFIG
     set_config_with_override BOOL   CLEAN                CMD_CLEAN
@@ -187,6 +188,12 @@ determine_real_args() {
         fi
     fi
 
+    # After merging config fragments, make alldefconfig is run by default
+    if isTrue ${MERGE_KCONFIG}
+    then
+        OLDCONFIG=0
+    fi
+
     # Special case:  If --no-clean is specified on the command line,
     # imply --no-mrproper.
     if [ "${CMD_CLEAN}" != '' ]
diff --git a/genkernel.conf b/genkernel.conf
index 1b60a74a..25a1f1b0 100644
--- a/genkernel.conf
+++ b/genkernel.conf
@@ -41,6 +41,11 @@ MOUNTBOOT="yes"
 # Make symlinks in BOOTDIR automatically?
 #SYMLINK="no"
 
+# Merge kernel config fragment
+#MERGE_KCONFIG="yes"
+# Kernel config fragment(s) to merge
+#KCONFIG_FRAGMENT=( "/etc/default/genkernel_kconfig_fragment" )
+
 # Save the new configuration in /etc/kernels upon
 # successfull compilation
 SAVE_CONFIG="yes"