scripts: kconfig: merge_config.sh: keep temp file in the output dir
PATCH 1/1 scripts: kconfig: merge_config.sh: keep temp file in the output dir
merge_config.sh currently creates a temporary file in the current directory. Create it under $OUTPUT instead, which allows running the script against a read-only source tree.
The default behavior is unchanged: $OUTPUT is "." so the file stays in the cwd.
--- scripts/kconfig/merge_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/kconfig/merge_config.sh +1 -1
@@ -122,7 +122,7 @@ fi MERGE_LIST=$* -TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) +TMP_FILE=$(mktemp "$OUTPUT/.tmp.config.XXXXXXXXXX") echo "Using $INITFILE as base"
---
base-commit: 0e35b9b6ec0ffcc5e23cbdec09f5c622ad532b53
change-id: 20260708-merge_config_output-d90c161a923c
Best regards,
Signature · 1 line
Gustavo Luiz Duarte <[email protected]>
Quoted 8 lines · Gustavo Luiz Duarte
merge_config.shcurrently creates a temporary file in the current directory. Create it under $OUTPUT instead, which allows running the script against a read-only source tree.The default behavior is unchanged: $OUTPUT is "." so the file stays in the cwd.
Signed-off-by Gustavo Luiz Duarte <[email protected]>
Nicolas Schier
maintainerQuoted 6 lines · Gustavo Luiz Duarte
merge_config.shcurrently creates a temporary file in the current directory. Create it under $OUTPUT instead, which allows running the script against a read-only source tree.The default behavior is unchanged: $OUTPUT is "." so the file stays in the cwd.
Out of curiosity: in which situation do you need this fix?
Quoted 11 lines
Signed-off-by Gustavo Luiz Duarte <[email protected]>--- scripts/kconfig/merge_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/kconfig/merge_config.sh +0
-0
scripts/kconfig/merge_config.sh fi · line 125
Quoted 5 lines
scripts/kconfig/merge_config.sh +1
-1@@ -122,7 +122,7 @@ fi MERGE_LIST=$* -TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) +TMP_FILE=$(mktemp "$OUTPUT/.tmp.config.XXXXXXXXXX")
<bike-shedding>
While this does as written in the commit message, I'd rather expected something like
mktemp --tmpdir="$OUTPUT" .tmp.config.XXXXXXXXXX
instead.
</bike-shedding>
When I am reading the help text for merge_config.sh's '-O', I think we should adjust the default output directory as well:
-O dir to put generated output files. Consider setting $KCONFIG_CONFIG instead.
With a read-only source tree in mind, KCONFIG_CONFIG probably has to be set, otherwise we'd not need to put the temporary file somewhere else. Might it be more consistent to use $(dirname ${KBUILD_KCONFIG}) as default for OUTPUT instead of '.'?
So, once again: in which situation do you need the fix? Is it really sufficient as it is?
Nevertheless, I think it's a good idea, thanks for the patch.
Kind regards,
Nicolas
Quoted 10 lines · Nicolas Schier
Quoted 6 lines · Gustavo Luiz Duarte
merge_config.shcurrently creates a temporary file in the current directory. Create it under $OUTPUT instead, which allows running the script against a read-only source tree.The default behavior is unchanged: $OUTPUT is "." so the file stays in the cwd.
Out of curiosity: in which situation do you need this fix?
Our build runs in a container that mounts the source tree read-only and outputs the build artifacts into a separate rw mount point. We have our own (cruder) flavor of merge_config.sh and I want to use the upstream script instead.
Quoted 22 lines
Quoted 12 lines
Signed-off-by Gustavo Luiz Duarte <[email protected]>--- scripts/kconfig/merge_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/kconfig/merge_config.sh +0
-0scripts/kconfig/merge_config.sh fi · line 125
Quoted 5 lines
scripts/kconfig/merge_config.sh +1
-1@@ -122,7 +122,7 @@ fi MERGE_LIST=$* -TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX) +TMP_FILE=$(mktemp "$OUTPUT/.tmp.config.XXXXXXXXXX")<bike-shedding>
While this does as written in the commit message, I'd rather expected something like
Quoted 4 lines
mktemp --tmpdir="$OUTPUT" .tmp.config.XXXXXXXXXX
instead.
</bike-shedding>
I can send a v2 with --tmpdir=
Quoted 11 lines
When I am reading the help text for merge_config.sh's '-O', I think we should adjust the default output directory as well:
-O dir to put generated output files. Consider setting $KCONFIG_CONFIG instead.
With a read-only source tree in mind,
KCONFIG_CONFIGprobably has to be set, otherwise we'd not need to put the temporary file somewhere else. Might it be more consistent to use $(dirname ${KBUILD_KCONFIG}) as default for OUTPUT instead of '.'?
Maybe, but then, as far as I understand it, setting a custom KBUILD_KCONFIG would lead to object files (like the conf binary and other object files) being put into $(dirname ${KBUILD_KCONFIG}). Is that the intention?
Quoted 3 lines
So, once again: in which situation do you need the fix? Is it really sufficient as it is?
$KCONFIG_CONFIG is already derived from $OUTPUT, so the current patch is sufficient for our read-only source tree use-case.
Thanks for the review!
Kind regards,
Gustavo