From ae9d056f3558eece873f8f02df9946df64323e36 Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Tue, 23 Feb 2021 19:43:41 +0100 Subject: [PATCH] Get rid of the config_expert config toggle. We're enabling CONFIG_EXPERT and injecting config entries for unattended builds when futex2 is enabled, which is the only usecase we want to explicitly support at this point in time. --- customization.cfg | 3 --- linux-tkg-config/prepare | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/customization.cfg b/customization.cfg index 50b9591..3cd3127 100644 --- a/customization.cfg +++ b/customization.cfg @@ -60,9 +60,6 @@ _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 5f45f80..a720759 100644 --- a/linux-tkg-config/prepare +++ b/linux-tkg-config/prepare @@ -494,7 +494,7 @@ _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 - if [ "$_futex2" = "true" ] || [ "$_config_expert" = "true" ]; then + if [ "$_futex2" = "true" ]; then sed -i -e 's/# CONFIG_EXPERT is not set/CONFIG_EXPERT=y/' ./.config echo -e "# CONFIG_DEBUG_RSEQ is not set\n # CONFIG_PC104 is not set\n