From patchwork Sat Jul 29 21:41:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Rameshbabu X-Patchwork-Id: 128180 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1265359vqg; Sat, 29 Jul 2023 17:20:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlFP/xDuZgP/t94VL4DWjsTt/ssbvureDdNK3QYSG3RwHFJmSCkROgcoJRjnAibHzik1Jzn0 X-Received: by 2002:a17:906:11e:b0:994:555a:e49f with SMTP id 30-20020a170906011e00b00994555ae49fmr4437824eje.31.1690676425689; Sat, 29 Jul 2023 17:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690676425; cv=none; d=google.com; s=arc-20160816; b=WUYV1uHwseN5mGxLG+1j9Rx68am+NA9GF3smASk5Wx5qx6bfnow65sqyCHb7AxSBvb hpWNWOFi8elI8jvTh7suZWSFVdQCoEpqJ6XczxHuyGdICcDA8TN+pN46q2XiQ93cIY66 wt0j4i9XS7DG5hOwP5kNmy4rjHNuK1nOijoo9q/4si67OMUhx0wcG+KxwbkFI6rHHmER UVlXr+ItqdBmQ/7nVbIu6umimiJedRPBDlGlFl6s+KgFMGhRtk748w0eynxyJIzZAodT xC+uqjiVHQr7qmvT2knLRtEZe0Hva06UNb1d0fxFr+eh6ehBq7KgrP05/q9iqkWMzFcT E/XQ== 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 :feedback-id:message-id:subject:cc:from:to:dkim-signature:date; bh=ayP6Lyd6vT/OxN20N2dQ1W7dWvfMQN5QQ+y6w2FEL6Q=; fh=MG7NSpG2yeqKg0Q4+r1CL/JVwj/9xsX/MTq78Gt9hz8=; b=eiyw2LnnrAO9xvfQbqmDR4PerqGjgVoYrNnXP4wPnZsfASNyOVy22AmpL4w4NVWZA0 S6vHPMMp4LsI8F9DIqfvpCvAb6sx2r/mnPQFu0WCTqj3aAhEAgz15ZRIIarGPgt9A/wK ae6FBJnLGFZkBCDYFQgrqX8sMIWj/otwzizPjIfiHqRS4oDk5Oo25Oxnu+6DABfo6hEe +mPzLAZ7BDXOhsdywzdG6YvVSrEjfm3Qf9e8loynvANzJU22pHFLdv3kYDKARQwCi5N8 6RSN5geG7F3n63EaNvSjb9Ue3NjL0BEzMqS/HTOZj8Jn494X7lzl4Tej4lASiHHg5MnN FiDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@protonmail.com header.s=protonmail3 header.b=G60o1xdP; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x13-20020a170906134d00b0099bd5bedfcbsi4746498ejb.422.2023.07.29.17.19.49; Sat, 29 Jul 2023 17:20:25 -0700 (PDT) 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=@protonmail.com header.s=protonmail3 header.b=G60o1xdP; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229618AbjG2VmC (ORCPT + 99 others); Sat, 29 Jul 2023 17:42:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229462AbjG2VmB (ORCPT ); Sat, 29 Jul 2023 17:42:01 -0400 Received: from mail-0301.mail-europe.com (mail-0301.mail-europe.com [188.165.51.139]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B54310FF for ; Sat, 29 Jul 2023 14:42:00 -0700 (PDT) Date: Sat, 29 Jul 2023 21:41:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1690666916; x=1690926116; bh=ayP6Lyd6vT/OxN20N2dQ1W7dWvfMQN5QQ+y6w2FEL6Q=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=G60o1xdPn+JjOOgIzmI861dk2YeVZJ39YNneJhBKhlRLWSzwZgCKj9wgED7B0RKMA z1OxEZW+259UrII6jmqU7DG1xbnjdpl90TFCKkOEfluj2IzBDi8W+9jCqQnezkhNYt F9TCQHKjDpkQqU/2fj/e9t2Fh9uEuRJLI4MJVy0R23N2ZTWEDrk2WxgRjlEIab9H5/ Dnv9lNP7L8wPYpKmTg3QsDLyvNHTEKw78suejQklUbY/aMi3plT824ZAdui9A8HWYl KzDVr3RzDGFY6f01jhCmtY1iYITdVZojIt0BBz/0Ls56/nD2LE1XYFfEpr8jcpamL4 RAcyE3JxhJFvA== To: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org From: Rahul Rameshbabu Cc: Rahul Rameshbabu , Masahiro Yamada Subject: [PATCH] scripts: merge_config: Add flag to prevent unsetting config option Message-ID: <20230729214138.79902-1-sergeantsagara@protonmail.com> Feedback-ID: 26003777:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham 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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772802723513160881 X-GMAIL-MSGID: 1772802723513160881 Overriding a previously defined entry for a config option with 'is not set' may be undesirable in some fragment configuration setups. Provide a flag to change the behavior, so 'is not set' is not overridden when a previous value for the same config option already exists. Cc: Masahiro Yamada Signed-off-by: Rahul Rameshbabu --- scripts/kconfig/merge_config.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 902eb429b9db..bbe235f2df70 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -30,6 +30,7 @@ usage() { echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead." echo " -s strict mode. Fail if the fragment redefines any value." echo " -Q disable warning messages for overridden options." + echo " -N not set entries in fragments will not override options." echo echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable." } @@ -42,6 +43,7 @@ OUTPUT=. STRICT=false CONFIG_PREFIX=${CONFIG_-CONFIG_} WARNOVERRIDE=echo +OVERRIDENOTSET=true while true; do case $1 in @@ -89,6 +91,11 @@ while true; do shift continue ;; + "-N") + OVERRIDENOTSET=false + shift + continue + ;; *) break ;; @@ -143,13 +150,20 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do grep -q -w $CFG $TMP_FILE || continue PREV_VAL=$(grep -w $CFG $TMP_FILE) NEW_VAL=$(grep -w $CFG $MERGE_FILE) - BUILTIN_FLAG=false - if [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then + NO_OVERRIDE_FLAG=false + if [ "$OVERRIDENOTSET" = "false" ] && [ "${NEW_VAL#\# CONFIG_* }" = "is not set" ] && + [ "$PREV_VAL" != "" ] && [ "${PREV_VAL#\# CONFIG_* }" != "is not set" ]; then + ${WARNOVERRIDE} Previous value: $PREV_VAL + ${WARNOVERRIDE} New value: $NEW_VAL + ${WARNOVERRIDE} -N passed, will not unset option + ${WARNOVERRIDE} + NO_OVERRIDE_FLAG=true + elif [ "$BUILTIN" = "true" ] && [ "${NEW_VAL#CONFIG_*=}" = "m" ] && [ "${PREV_VAL#CONFIG_*=}" = "y" ]; then ${WARNOVERRIDE} Previous value: $PREV_VAL ${WARNOVERRIDE} New value: $NEW_VAL ${WARNOVERRIDE} -y passed, will not demote y to m ${WARNOVERRIDE} - BUILTIN_FLAG=true + NO_OVERRIDE_FLAG=true elif [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then ${WARNOVERRIDE} Value of $CFG is redefined by fragment $ORIG_MERGE_FILE: ${WARNOVERRIDE} Previous value: $PREV_VAL @@ -161,7 +175,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do elif [ "$WARNREDUN" = "true" ]; then ${WARNOVERRIDE} Value of $CFG is redundant by fragment $ORIG_MERGE_FILE: fi - if [ "$BUILTIN_FLAG" = "false" ]; then + if [ "$NO_OVERRIDE_FLAG" = "false" ]; then sed -i "/$CFG[ =]/d" $TMP_FILE else sed -i "/$CFG[ =]/d" $MERGE_FILE