Fix merge_config.sh

[PATCH 0/3] Fix merge_config.sh

Posted by Daniel Gomez 4 weeks, 1 day ago

Restore empty base file support introduced by a26fe287eed1 ("kconfig:
merge_config: use an empty file as initfile") broken by the awk
refactoring in 5fa9b82cbcfc ("scripts: kconfig: merge_config.sh:
refactor from shell/sed/grep to awk"). Also fix POSIX compatibility for
non-bash /bin/sh and clean up whitespace.

Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
---
Daniel Gomez (3):
      scripts: kconfig: merge_config.sh: pass output file as awk variable
      scripts: kconfig: merge_config.sh: fix indentation
      scripts: kconfig: merge_config.sh: use POSIX test operator

 scripts/kconfig/merge_config.sh | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)
---
base-commit: 11439c4635edd669ae435eec308f4ab8a0804808
change-id: 20260310-fixes-merge-config-606c2a4ed83e

Best regards,
--  
Daniel Gomez <da.gomez@samsung.com>

Re: [PATCH 0/3] Fix merge_config.sh

Posted by Nathan Chancellor 4 weeks ago

On Tue, Mar 10, 2026 at 12:36:22PM +0100, Daniel Gomez wrote:
> Restore empty base file support introduced by a26fe287eed1 ("kconfig:
> merge_config: use an empty file as initfile") broken by the awk
> refactoring in 5fa9b82cbcfc ("scripts: kconfig: merge_config.sh:
> refactor from shell/sed/grep to awk"). Also fix POSIX compatibility for
> non-bash /bin/sh and clean up whitespace.
> 
> Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
> ---
> Daniel Gomez (3):
>       scripts: kconfig: merge_config.sh: pass output file as awk variable
>       scripts: kconfig: merge_config.sh: fix indentation

Thanks, I have tentatively applied these to kbuild-fixes-unstable,
pending further comments and reviews from folks. I will send out a
message when they are formally applied to kbuild-fixes.

>       scripts: kconfig: merge_config.sh: use POSIX test operator

Someone else submitted a patch a couple of days ago for this, it is
already in kbuild-fixes:

  https://git.kernel.org/kbuild/c/3b4a3a00de8770f3a60c1fa483921ce37415132d

Cheers,
Nathan

Re: (subset) [PATCH 0/3] Fix merge_config.sh

Posted by Nathan Chancellor 2 weeks, 3 days ago

On Tue, 10 Mar 2026 12:36:22 +0100, Daniel Gomez wrote:
> Restore empty base file support introduced by a26fe287eed1 ("kconfig:
> merge_config: use an empty file as initfile") broken by the awk
> refactoring in 5fa9b82cbcfc ("scripts: kconfig: merge_config.sh:
> refactor from shell/sed/grep to awk"). Also fix POSIX compatibility for
> non-bash /bin/sh and clean up whitespace.
> 
> 
> [...]

Applied to

  https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-fixes

Thanks!

[1/3] scripts: kconfig: merge_config.sh: pass output file as awk variable
      (no commit info)
[2/3] scripts: kconfig: merge_config.sh: fix indentation
      (no commit info)

Please look out for regression or issue reports or other follow up
comments, as they may result in the patch/series getting dropped or
reverted. Patches applied to an "unstable" branch are accepted pending
wider testing in -next and any post-commit review; they will generally
be moved to the main branch in a week if no issues are found.

Best regards,
-- 
Nathan Chancellor <nathan@kernel.org>