From: Masahiro Yamada <masahiroy@kernel.org>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Noa Sakurajin <noasakurajin@web.de>,
"open list:DOCUMENTATION" <linux-doc@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Michal Marek <michal.lkml@markovi.net>
Subject: Re: [PATCH] Updates Documentation/Makefile to use Python3 as fallback
Date: Mon, 1 Feb 2021 10:06:40 +0900 [thread overview]
Message-ID: <CAK7LNAQDxF-HSWQ7FuCkdL4Wy_+iw9D5DJma1Mwixb3t3301+A@mail.gmail.com> (raw)
In-Reply-To: <87y2gbwa8i.fsf@meer.lwn.net>
On Sat, Jan 30, 2021 at 9:15 AM Jonathan Corbet <corbet@lwn.net> wrote:
>
> Noa Sakurajin <noasakurajin@web.de> writes:
>
> [CC += kbuild maintainers]
>
> > Before the command python was needed for the documentation to build.
> > This patch checks if python is available and uses python3 as
> > fallback.
> >
> > This is needed because a lot of distribution (at least Ubuntu)
> > only provide python3 and not python. scripts/sphinx-pre-install
> > checks for python3 first and does not check if python exists
> > which causes it to report that everything is installed even
> > if the documentation build failed.
> >
> > Signed-off-by: Noa Sakurajin <noasakurajin@web.de>
> > ---
> > Documentation/Makefile | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/Documentation/Makefile b/Documentation/Makefile
> > index 61a7310b49e0..8a4a7df3b74a 100644
> > --- a/Documentation/Makefile
> > +++ b/Documentation/Makefile
> > @@ -75,7 +75,8 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
> > cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/userspace-api/media $2 && \
> > PYTHONDONTWRITEBYTECODE=1 \
> > BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \
> > - $(PYTHON) $(srctree)/scripts/jobserver-exec \
> > + PY=$(shell command -v $(PYTHON) 2> /dev/null) \
> > + $${PY:-"$(PYTHON3)"} $(srctree)/scripts/jobserver-exec \
>
> So I see what you're trying to do, and we definitely want this to work.
> I susped this isn't the right fix, though; it could leave us open to
> similar issues elsewhere in the tree.
>
> Personally, I think that $(PYTHON) should get a working Python if it's
> installed, so I would suggest fixing the top-level Makefile to set it
> correctly. Masahiro, thoughts on that?
>
> Alternatively, we could just say $(PYTHON3) and explicitly leave Python2
> behind; that needs to happen in the not-too-distant future regardless
> but we haven't decided to actually do it yet.
We are already doing this in linux-next.
I will apply this.
https://lore.kernel.org/patchwork/patch/1373422/
> Thanks,
>
> jon
--
Best Regards
Masahiro Yamada
prev parent reply other threads:[~2021-02-01 1:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210129113544.25946-1-noasakurajin@web.de>
2021-01-30 0:15 ` [PATCH] Updates Documentation/Makefile to use Python3 as fallback Jonathan Corbet
2021-02-01 1:06 ` Masahiro Yamada [this message]
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=CAK7LNAQDxF-HSWQ7FuCkdL4Wy_+iw9D5DJma1Mwixb3t3301+A@mail.gmail.com \
--to=masahiroy@kernel.org \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--cc=noasakurajin@web.de \
/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;
as well as URLs for NNTP newsgroup(s).