| Message ID | 20210617225808.3907377-1-keescook@chromium.org |
|---|---|
| State | Accepted |
| Commit | 222a28edce38b62074a950fb243df621c602b4d3 |
| Headers | show |
| Series | docs: Makefile: Use CONFIG_SHELL not SHELL | expand |
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
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)) \
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(-)