From 6b67e77d5b8c87499c95a86814039ec44a01cefa Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Fri, 15 Jan 2021 19:56:26 +0100 Subject: [PATCH] Put CONFIG_EXPERT behind a .cfg toggle and disable by default. This should stay optional. Fixes https://github.com/Frogging-Family/linux-tkg/issues/156 --- customization.cfg | 3 +++ linux-tkg-config/prepare | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/customization.cfg b/customization.cfg index 2cfe596..ba0e4bd 100644 --- a/customization.cfg +++ b/customization.cfg @@ -60,6 +60,9 @@ _configfile="" # Disable some non-module debugging - See PKGBUILD for the list _debugdisable="false" +# Set to true to enable CONFIG_EXPERT - No need to enable it if you don't know you need it +_config_expert="false" + # LEAVE AN EMPTY VALUE TO BE PROMPTED ABOUT FOLLOWING OPTIONS AT BUILD TIME # CPU scheduler - Options are "upds" (TkG's Undead PDS), "pds", "bmq", "muqss" or "cfs" diff --git a/linux-tkg-config/prepare b/linux-tkg-config/prepare index 6525c75..705384c 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -495,7 +495,9 @@ _tkg_srcprep() { sed -i -e 's/# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set/CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4=y/' ./.config sed -i -e 's/CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo"/CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lz4"/' ./.config sed -i -e 's/# CONFIG_CMDLINE_BOOL is not set/CONFIG_CMDLINE_BOOL=y/' ./.config - sed -i -e 's/# CONFIG_EXPERT is not set/CONFIG_EXPERT=y/' ./.config + if [ "$_config_expert" = "true" ]; then + sed -i -e 's/# CONFIG_EXPERT is not set/CONFIG_EXPERT=y/' ./.config + fi echo "CONFIG_CMDLINE=\"${_custom_commandline}\"" >> ./.config echo "# CONFIG_CMDLINE_OVERRIDE is not set" >> ./.config echo "# CONFIG_X86_P6_NOP is not set" >> ./.config