From ea5b1b4b48a4daacaa0c8f52f25d2a34c4bcd1a8 Mon Sep 17 00:00:00 2001 From: James Beddek Date: Thu, 30 Sep 2021 07:11:07 +1300 Subject: [PATCH] prepare: allow choosing oldconfig as the .config updating tool (#315) * prepare: allow choosing oldconfig as the .config updating tool Signed-off-by: Theo Anderson * prepare: make oldconfig interactable Signed-off-by: Theo Anderson --- customization.cfg | 3 +++ linux-tkg-config/prepare | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/customization.cfg b/customization.cfg index db8ebbe..5207fc2 100644 --- a/customization.cfg +++ b/customization.cfg @@ -82,6 +82,9 @@ _dracut_options="--lz4" # One can use "kernelconfig.new" here to always use the latest edited .config file. modprobed-db needs to be used only once for its changes to be picked up. _configfile="" +# Determine whether to call "olddefconfig" (default) or "oldconfig" for manual config updating interaction. +_config_updating="olddefconfig" + # Disable some non-module debugging - See PKGBUILD for the list _debugdisable="false" diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index 285b27e..a3c8bb9 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -1309,7 +1309,7 @@ CONFIG_DEBUG_INFO_BTF_MODULES=y\r # rewrite configuration msg2 "Setting config" - make olddefconfig ${llvm_opt} >> "$_where"/prepare.log + make ${_config_updating} ${llvm_opt} |& tee -a "$_where"/prepare.log # menuconfig / nconfig if [ -z "$_menunconfig" ] && [ "$_distro" != "Void" ]; then