* [PATCH] docs: Makefile: Use CONFIG_SHELL not SHELL
@ 2021-06-17 22:58 Kees Cook
2021-06-18 17:26 ` Jonathan Corbet
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2021-06-17 22:58 UTC (permalink / raw)
To: Jonathan Corbet; +Cc: Kees Cook, stable, linux-kernel, linux-doc
Fix think-o about which variable to find the Kbuild-configured shell.
This has accidentally worked due to most shells setting $SHELL by
default.
Fixes: 51e46c7a4007 ("docs, parallelism: Rearrange how jobserver reservations are made")
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
---
Documentation/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 9c42dde97671..c3feb657b654 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -76,7 +76,7 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
PYTHONDONTWRITEBYTECODE=1 \
BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \
$(PYTHON3) $(srctree)/scripts/jobserver-exec \
- $(SHELL) $(srctree)/Documentation/sphinx/parallel-wrapper.sh \
+ $(CONFIG_SHELL) $(srctree)/Documentation/sphinx/parallel-wrapper.sh \
$(SPHINXBUILD) \
-b $2 \
-c $(abspath $(srctree)/$(src)) \
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] docs: Makefile: Use CONFIG_SHELL not SHELL
2021-06-17 22:58 [PATCH] docs: Makefile: Use CONFIG_SHELL not SHELL Kees Cook
@ 2021-06-18 17:26 ` Jonathan Corbet
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Corbet @ 2021-06-18 17:26 UTC (permalink / raw)
To: Kees Cook; +Cc: Kees Cook, stable, linux-kernel, linux-doc
Kees Cook <keescook@chromium.org> writes:
> Fix think-o about which variable to find the Kbuild-configured shell.
> This has accidentally worked due to most shells setting $SHELL by
> default.
>
> Fixes: 51e46c7a4007 ("docs, parallelism: Rearrange how jobserver reservations are made")
> Cc: stable@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> Documentation/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index 9c42dde97671..c3feb657b654 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -76,7 +76,7 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
> PYTHONDONTWRITEBYTECODE=1 \
> BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \
> $(PYTHON3) $(srctree)/scripts/jobserver-exec \
> - $(SHELL) $(srctree)/Documentation/sphinx/parallel-wrapper.sh \
> + $(CONFIG_SHELL) $(srctree)/Documentation/sphinx/parallel-wrapper.sh \
> $(SPHINXBUILD) \
> -b $2 \
> -c $(abspath $(srctree)/$(src)) \
Applied, thanks.
jon
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-18 17:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-17 22:58 [PATCH] docs: Makefile: Use CONFIG_SHELL not SHELL Kees Cook
2021-06-18 17:26 ` Jonathan Corbet
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®