Received: by 2002:a05:6a10:9afc:0:0:0:0 with SMTP id t28csp1274542pxm; Sat, 26 Feb 2022 10:18:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZZmJgkyX/SAYhYwu3vDRkzJiLGSCyt2VOqfobKXy7+VQf3jttw/WIa0ByMiW+TdlA7OhI X-Received: by 2002:a05:6402:40c4:b0:412:d697:187 with SMTP id z4-20020a05640240c400b00412d6970187mr12468840edb.66.1645899512441; Sat, 26 Feb 2022 10:18:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645899512; cv=none; d=google.com; s=arc-20160816; b=NUmgoW9AcFlNQfyRxjGJ50l/FdT/tMeHkuuY1qXulYYRiinC0OT4Vb3SGirvgb2b3j icSBs5oQxzwUjDgBdinreIlLcoWDYqmFzDk9rZusAPEe4hyT/SHgEYH+FOo0CcY7irrO SxyFrPq6Hxn26ni3ucnIBnxpPTfkea05kzCAZ81AK5ea1NlbBFsVBXoaco4yuxSE1Sv8 u0DMv39WWARRJ7tzmjngo0vrxUUtAo7cK66BqdDY/thcBbuwvHDPMRlC4e7xcTu95Ych cdlrJ4gonzXvaEXO1JSpR0zAnaK7Y57+n9mPIXxDKNszpxcn6OqC9DF1H0poDTRZsJy5 Rjgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=w4IvZVR355kM81ZI/8mx1GapwivjUjEVqtanCtDOEho=; b=T9PNizYngv28kFMZJoglz3fk48zMGIGAEEqRgZESpUxhEv/7OsTG00QihRKxwPkSEP m6qbyVJ7J/8UyGlc3g1xJ1TeYX82+qMp4GmVVAmpOlpceE551iv0FBdqtkyAL43Aj662 e5//KU/KkcN2fFsZNIL4yN8clygfHri9EamBM8TSWMhXP1AaIQPcLnrg6Rd+qPA9H850 1y/4VpJg8L6lTOjrzIQLLKTqne8HIrSm1sM8UAXJbTQSVlUxtlwOf2mZyNpzpKllo4sl dlOQXMJTuzaqhbytOhOXO5Q2D1e63u5I2hAjQdz0EwcldNHtHRVWTlq718VEkARmYgR3 LgPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=rMTJUEW1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y6-20020a17090668c600b006cf4794049csi3327427ejr.714.2022.02.26.10.18.10; Sat, 26 Feb 2022 10:18:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=rMTJUEW1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230303AbiBZMjJ (ORCPT + 99 others); Sat, 26 Feb 2022 07:39:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230085AbiBZMjI (ORCPT ); Sat, 26 Feb 2022 07:39:08 -0500 Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F8271DD0EE; Sat, 26 Feb 2022 04:38:32 -0800 (PST) Received: from grover.. (133-32-176-37.west.xps.vectant.ne.jp [133.32.176.37]) (authenticated) by conuserg-08.nifty.com with ESMTP id 21QCc9WD001922; Sat, 26 Feb 2022 21:38:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com 21QCc9WD001922 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1645879089; bh=w4IvZVR355kM81ZI/8mx1GapwivjUjEVqtanCtDOEho=; h=From:To:Cc:Subject:Date:From; b=rMTJUEW1JOvAN2qUlp/WtYzIkLNyJqVcM4/YWzv8CktRUebdwKTnBMc3XWwohWlUg KAAtqPU/VMhdFvYI4RfVbOjS94u8Vfg3HtW8CT3DBmgCr95tVZ7IfV1cUzh+rY5Yxj j0OI+8JJOI4wAldnDpnp0pdnVSqC7/uoHbCSoG8sN2vb/D5rI2f2xPWLLAUgwQZsg/ bYuKIp00GIc5qAjHUw4aBMM6gR8/yq+TcnTL2Q/ZzlAdBr+zSsojn6AlJN0Z9FclqT Lee4z415PmXu2RzCppN7cjGu0HgBv2wHTTuQCwkeAiRDwbYfDQYiz6r4tZ7qLvhOB6 bdzKnyyPpyFWw== X-Nifty-SrcIP: [133.32.176.37] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada Subject: [PATCH] kconfig: change .config format to use =n instead of "is not set" Date: Sat, 26 Feb 2022 21:37:55 +0900 Message-Id: <20220226123755.85213-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_SOFTFAIL,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The .config file uses "# CONFIG_FOO is not set" form to represent disabled options. In the old days, it was useful because the .config was directly included from Makefiles. For example, you can use "ifdef CONFIG_FOO" in Makefiles to check if the option is enabled. Commit c955ccafc38e ("kconfig: fix .config dependencies") introduced include/config/auto.conf, which mirrors the .config, but trims down all disabled options. Since then, include/config/auto.conf defines CONFIG options during the build. The .config is used just for storing the user's configuration. I do not see a strong reason to use a particular pattern of comment for disabled options. With this commit, Kconfig will output disable options in a more natural form, "CONFIG_FOO=n". Kconfig accepts both "# CONFIG_FOO is not set" and "CONFIG_FOO=n" as a valid input. You do not need to update arch/*/configs/*_defconfig files for now. "git bisect" should be able to cross the commit in both ways without any issue. A problem may occur if you parse the .config for the "# ... is not set" patterns. I adjusted streamline_config.pl, merge_config.sh, scripts/kconfig/tests/. Signed-off-by: Masahiro Yamada --- scripts/kconfig/confdata.c | 15 +++++---------- scripts/kconfig/merge_config.sh | 19 +++++++++++-------- scripts/kconfig/streamline_config.pl | 2 +- .../tests/choice/alldef_expected_config | 6 +++--- .../tests/choice/allmod_expected_config | 4 ++-- .../tests/choice/allno_expected_config | 6 +++--- .../tests/choice/allyes_expected_config | 8 ++++---- scripts/kconfig/tests/choice/oldask1_config | 2 +- .../tests/inter_choice/expected_config | 2 +- .../kconfig/tests/new_choice_with_dep/config | 2 +- .../tests/no_write_if_dep_unmet/__init__.py | 7 +++---- .../no_write_if_dep_unmet/expected_config | 2 +- 12 files changed, 36 insertions(+), 39 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index c4340c90e172..00f93c03aa57 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -658,9 +658,7 @@ static char *escape_string_value(const char *in) return out; } -enum output_n { OUTPUT_N, OUTPUT_N_AS_UNSET, OUTPUT_N_NONE }; - -static void __print_symbol(FILE *fp, struct symbol *sym, enum output_n output_n, +static void __print_symbol(FILE *fp, struct symbol *sym, bool output_n, bool escape_string) { const char *val; @@ -672,11 +670,8 @@ static void __print_symbol(FILE *fp, struct symbol *sym, enum output_n output_n, val = sym_get_string_value(sym); if ((sym->type == S_BOOLEAN || sym->type == S_TRISTATE) && - output_n != OUTPUT_N && *val == 'n') { - if (output_n == OUTPUT_N_AS_UNSET) - fprintf(fp, "# %s%s is not set\n", CONFIG_, sym->name); + !output_n && *val == 'n') return; - } if (sym->type == S_STRING && escape_string) { escaped = escape_string_value(val); @@ -690,17 +685,17 @@ static void __print_symbol(FILE *fp, struct symbol *sym, enum output_n output_n, static void print_symbol_for_dotconfig(FILE *fp, struct symbol *sym) { - __print_symbol(fp, sym, OUTPUT_N_AS_UNSET, true); + __print_symbol(fp, sym, true, true); } static void print_symbol_for_autoconf(FILE *fp, struct symbol *sym) { - __print_symbol(fp, sym, OUTPUT_N_NONE, false); + __print_symbol(fp, sym, false, false); } void print_symbol_for_listconfig(struct symbol *sym) { - __print_symbol(stdout, sym, OUTPUT_N, true); + print_symbol_for_dotconfig(stdout, sym); } static void print_symbol_for_c(FILE *fp, struct symbol *sym) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index e5b46980c22a..aac60de3b7c7 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -110,8 +110,11 @@ if [ ! -r "$INITFILE" ]; then fi MERGE_LIST=$* -SED_CONFIG_EXP1="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p" -SED_CONFIG_EXP2="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1/p" +SED_CONFIG_EXP="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p" + +# Disabled options were previously written as "# CONFIG_... is not set", but +# now is "CONFIG_...=n". Convert the format before the merge steps. +SED_CONVERT_NOT_SET="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1=n/" TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) MERGE_FILE=$(mktemp ./.merge_tmp.config.XXXXXXXXXX) @@ -120,7 +123,7 @@ echo "Using $INITFILE as base" trap clean_up EXIT -cat $INITFILE > $TMP_FILE +sed "$SED_CONVERT_NOT_SET" $INITFILE > $TMP_FILE # Merge files, printing warnings on overridden values for ORIG_MERGE_FILE in $MERGE_LIST ; do @@ -129,8 +132,8 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do echo "The merge file '$ORIG_MERGE_FILE' does not exist. Exit." >&2 exit 1 fi - cat $ORIG_MERGE_FILE > $MERGE_FILE - CFG_LIST=$(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $MERGE_FILE) + sed "$SED_CONVERT_NOT_SET" $ORIG_MERGE_FILE > $MERGE_FILE + CFG_LIST=$(sed -n -e "$SED_CONFIG_EXP" $MERGE_FILE) for CFG in $CFG_LIST ; do grep -q -w $CFG $TMP_FILE || continue @@ -155,9 +158,9 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do echo Value of $CFG is redundant by fragment $ORIG_MERGE_FILE: fi if [ "$BUILTIN_FLAG" = "false" ]; then - sed -i "/$CFG[ =]/d" $TMP_FILE + sed -i "/$CFG=/d" $TMP_FILE else - sed -i "/$CFG[ =]/d" $MERGE_FILE + sed -i "/$CFG=/d" $MERGE_FILE fi done cat $MERGE_FILE >> $TMP_FILE @@ -191,7 +194,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET # Check all specified config values took (might have missed-dependency issues) -for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do +for CFG in $(sed -n -e "$SED_CONFIG_EXP" $TMP_FILE); do REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE) ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG" || true) diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 3387ad7508f7..0f20142764f2 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -617,7 +617,7 @@ foreach my $line (@config_file) { $_ = $line; if (/CONFIG_IKCONFIG/) { - if (/# CONFIG_IKCONFIG is not set/) { + if (/# CONFIG_IKCONFIG is not set/ || /CONFIG_IKCONFIG=n/) { # enable IKCONFIG at least as a module print "CONFIG_IKCONFIG=m\n"; # don't ask about PROC diff --git a/scripts/kconfig/tests/choice/alldef_expected_config b/scripts/kconfig/tests/choice/alldef_expected_config index 7a754bf4be94..75d98d488488 100644 --- a/scripts/kconfig/tests/choice/alldef_expected_config +++ b/scripts/kconfig/tests/choice/alldef_expected_config @@ -1,5 +1,5 @@ CONFIG_MODULES=y -# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE0=n CONFIG_BOOL_CHOICE1=y -# CONFIG_TRI_CHOICE0 is not set -# CONFIG_TRI_CHOICE1 is not set +CONFIG_TRI_CHOICE0=n +CONFIG_TRI_CHOICE1=n diff --git a/scripts/kconfig/tests/choice/allmod_expected_config b/scripts/kconfig/tests/choice/allmod_expected_config index f1f5dcdb7923..ed8ffcb18a3a 100644 --- a/scripts/kconfig/tests/choice/allmod_expected_config +++ b/scripts/kconfig/tests/choice/allmod_expected_config @@ -1,7 +1,7 @@ CONFIG_MODULES=y -# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE0=n CONFIG_BOOL_CHOICE1=y -# CONFIG_OPT_BOOL_CHOICE0 is not set +CONFIG_OPT_BOOL_CHOICE0=n CONFIG_OPT_BOOL_CHOICE1=y CONFIG_TRI_CHOICE0=m CONFIG_TRI_CHOICE1=m diff --git a/scripts/kconfig/tests/choice/allno_expected_config b/scripts/kconfig/tests/choice/allno_expected_config index b88ee7a43136..37b2749277dd 100644 --- a/scripts/kconfig/tests/choice/allno_expected_config +++ b/scripts/kconfig/tests/choice/allno_expected_config @@ -1,5 +1,5 @@ -# CONFIG_MODULES is not set -# CONFIG_BOOL_CHOICE0 is not set +CONFIG_MODULES=n +CONFIG_BOOL_CHOICE0=n CONFIG_BOOL_CHOICE1=y -# CONFIG_TRI_CHOICE0 is not set +CONFIG_TRI_CHOICE0=n CONFIG_TRI_CHOICE1=y diff --git a/scripts/kconfig/tests/choice/allyes_expected_config b/scripts/kconfig/tests/choice/allyes_expected_config index e5a062a1157c..a2b36c017ffb 100644 --- a/scripts/kconfig/tests/choice/allyes_expected_config +++ b/scripts/kconfig/tests/choice/allyes_expected_config @@ -1,9 +1,9 @@ CONFIG_MODULES=y -# CONFIG_BOOL_CHOICE0 is not set +CONFIG_BOOL_CHOICE0=n CONFIG_BOOL_CHOICE1=y -# CONFIG_OPT_BOOL_CHOICE0 is not set +CONFIG_OPT_BOOL_CHOICE0=n CONFIG_OPT_BOOL_CHOICE1=y -# CONFIG_TRI_CHOICE0 is not set +CONFIG_TRI_CHOICE0=n CONFIG_TRI_CHOICE1=y -# CONFIG_OPT_TRI_CHOICE0 is not set +CONFIG_OPT_TRI_CHOICE0=n CONFIG_OPT_TRI_CHOICE1=y diff --git a/scripts/kconfig/tests/choice/oldask1_config b/scripts/kconfig/tests/choice/oldask1_config index b67bfe3c641f..f0a4e5e9f2c1 100644 --- a/scripts/kconfig/tests/choice/oldask1_config +++ b/scripts/kconfig/tests/choice/oldask1_config @@ -1,2 +1,2 @@ -# CONFIG_MODULES is not set +CONFIG_MODULES=n CONFIG_OPT_BOOL_CHOICE0=y diff --git a/scripts/kconfig/tests/inter_choice/expected_config b/scripts/kconfig/tests/inter_choice/expected_config index 5dceefb054e3..4cf72e16f300 100644 --- a/scripts/kconfig/tests/inter_choice/expected_config +++ b/scripts/kconfig/tests/inter_choice/expected_config @@ -1,4 +1,4 @@ CONFIG_MODULES=y CONFIG_CHOICE_VAL0=y -# CONFIG_CHOIVE_VAL1 is not set +CONFIG_CHOIVE_VAL1=n CONFIG_DUMMY=y diff --git a/scripts/kconfig/tests/new_choice_with_dep/config b/scripts/kconfig/tests/new_choice_with_dep/config index 47ef95d567fd..47599c856033 100644 --- a/scripts/kconfig/tests/new_choice_with_dep/config +++ b/scripts/kconfig/tests/new_choice_with_dep/config @@ -1,3 +1,3 @@ CONFIG_CHOICE_B=y -# CONFIG_CHOICE_D is not set +CONFIG_CHOICE_D=n CONFIG_CHOICE_E=y diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py b/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py index ffd469d1f226..9ba7542d47d5 100644 --- a/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py +++ b/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py @@ -2,14 +2,13 @@ """ Do not write choice values to .config if the dependency is unmet. -"# CONFIG_... is not set" should not be written into the .config file -for symbols with unmet dependency. +=n should not be written into the .config file for symbols with unmet +dependency. This was not working correctly for choice values because choice needs a bit different symbol computation. -This checks that no unneeded "# COFIG_... is not set" is contained in -the .config file. +This checks that no unneeded =n is contained in the .config file. Related Linux commit: cb67ab2cd2b8abd9650292c986c79901e3073a59 """ diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/expected_config b/scripts/kconfig/tests/no_write_if_dep_unmet/expected_config index 473228810c35..9d057fad723c 100644 --- a/scripts/kconfig/tests/no_write_if_dep_unmet/expected_config +++ b/scripts/kconfig/tests/no_write_if_dep_unmet/expected_config @@ -2,4 +2,4 @@ # Automatically generated file; DO NOT EDIT. # Main menu # -# CONFIG_A is not set +CONFIG_A=n -- 2.32.0