mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Daniel Gomez <da.gomez@kernel.org>
To: Nathan Chancellor <nathan@kernel.org>,
	Nicolas Schier <nsc@kernel.org>,
	 Anders Roxell <anders.roxell@linaro.org>,
	 Mikko Rapeli <mikko.rapeli@linaro.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	 Daniel Gomez <da.gomez@samsung.com>
Subject: [PATCH 3/3] scripts: kconfig: merge_config.sh: use POSIX test operator
Date: Tue, 10 Mar 2026 12:36:25 +0100	[thread overview]
Message-ID: <20260310-fixes-merge-config-v1-3-beaeeaded6bd@samsung.com> (raw)
In-Reply-To: <20260310-fixes-merge-config-v1-0-beaeeaded6bd@samsung.com>

From: Daniel Gomez <da.gomez@samsung.com>

The script uses #!/bin/sh but == for string comparison, which is a bash
extension. This causes an error on systems where /bin/sh is not bash:

    ./scripts/kconfig/merge_config.sh: 380: [: false: unexpected operator

Use = instead, as used in the rest of the script.

Fixes: dfc97e1c5da5b ("scripts: kconfig: merge_config.sh: use awk in checks too")

Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
---
 scripts/kconfig/merge_config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 95f090b88e8d..f08e0863b712 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -377,7 +377,7 @@ END {
 	STRICT_MODE_VIOLATED=true
 fi
 
-if [ "$STRICT" == "true" ] && [ "$STRICT_MODE_VIOLATED" == "true" ]; then
+if [ "$STRICT" = "true" ] && [ "$STRICT_MODE_VIOLATED" = "true" ]; then
 	echo "Requested and effective config differ"
 	exit 1
 fi

-- 
2.53.0


  parent reply	other threads:[~2026-03-10 11:37 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-10 11:36 [PATCH 0/3] Fix merge_config.sh Daniel Gomez
2026-03-10 11:36 ` [PATCH 1/3] scripts: kconfig: merge_config.sh: pass output file as awk variable Daniel Gomez
2026-03-10 11:36 ` [PATCH 2/3] scripts: kconfig: merge_config.sh: fix indentation Daniel Gomez
2026-03-10 11:36 ` Daniel Gomez [this message]
2026-03-11  7:50 ` [PATCH 0/3] Fix merge_config.sh Nathan Chancellor
2026-03-23  0:58 ` (subset) " Nathan Chancellor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260310-fixes-merge-config-v1-3-beaeeaded6bd@samsung.com \
    --to=da.gomez@kernel.org \
    --cc=anders.roxell@linaro.org \
    --cc=da.gomez@samsung.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mikko.rapeli@linaro.org \
    --cc=nathan@kernel.org \
    --cc=nsc@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®