From 810922e465354f04de171e9bd0d763d08eee0685 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com>
Date: Tue, 16 Aug 2016 15:45:59 -0700
Subject: [PATCH] menuconfig: Handle shared architecture configuration

Handling configuration changes across multiple architectures is difficult.
Let's just generate a diff in the config and then apply that to the arch or
common config manually.
---
 kernel_menuconfig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel_menuconfig b/kernel_menuconfig
index 9944a3a92b..dfee89ef45 100755
--- a/kernel_menuconfig
+++ b/kernel_menuconfig
@@ -74,10 +74,12 @@ OVERLAY=$(portageq get_repo_path / "${FLAGS_overlay}")
 FILESDIR="${OVERLAY}/${FLAGS_package}/files"
 DEFCONFIG_NAME="${ARCH}_defconfig-${KERNEL_MAJOR}.${KERNEL_MINOR}"
 DEFCONFIG_PATH="${FILESDIR}/${DEFCONFIG_NAME}"
+COMMONCONFIG_NAME="commonconfig-${KERNEL_MAJOR}.${KERNEL_MINOR}"
+COMMONCONFIG_PATH="${FILESDIR}/${COMMONCONFIG_NAME}"
 
-cp "${DEFCONFIG_PATH}" "${KERNEL_BUILD}/build/.config"
+cat "${DEFCONFIG_PATH}" "${COMMONCONFIG_PATH}" > "${KERNEL_BUILD}/build/.config"
 kmake olddefconfig
+cp "${KERNEL_BUILD}/build/.config" "${KERNEL_BUILD}/build/.config.bak"
 kmake menuconfig
 kmake savedefconfig
-cp "${KERNEL_BUILD}/build/defconfig" "${DEFCONFIG_PATH}"
-git -C "${OVERLAY}" --no-pager diff "${FLAGS_package}"
+diff -u "${KERNEL_BUILD}/build/.config.bak" "${KERNEL_BUILD}/build/.config" || true