[PATCH] [G/master-next] UBUNTU: SAUCE: doc: remove python3-venv dependency

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] [G/master-next] UBUNTU: SAUCE: doc: remove python3-venv dependency

Paolo Pisati-5
BugLink: https://bugs.launchpad.net/bugs/1896801

Since upstream has removed python3-venv, update our build dependencies and let
linux-doc build outside a virtualenv.

Signed-off-by: Paolo Pisati <[hidden email]>
---
 Documentation/Makefile        | 2 +-
 debian.master/control.stub.in | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 6b12dd82f712..b016656a46ec 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -78,7 +78,7 @@ quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
  $(abspath $(BUILDDIR)/$3/$4)
 
 htmldocs:
- @$(srctree)/scripts/sphinx-pre-install --version-check
+ @$(srctree)/scripts/sphinx-pre-install --version-check --no-virtualenv
  @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))
 
 linkcheckdocs:
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index c09a6a024464..5130c30a1239 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -51,7 +51,6 @@ Build-Depends-Indep:
  python3-sphinx-rtd-theme <!stage1>,
  fontconfig <!stage1>,
  python3-docutils <!stage1>,
- python3-venv <!stage1>,
  imagemagick <!stage1>,
  graphviz <!stage1>,
  dvipng <!stage1>,
--
2.25.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] [G/master-next] UBUNTU: SAUCE: doc: remove python3-venv dependency

Colin Ian King-2
On 08/10/2020 10:33, Paolo Pisati wrote:

> BugLink: https://bugs.launchpad.net/bugs/1896801
>
> Since upstream has removed python3-venv, update our build dependencies and let
> linux-doc build outside a virtualenv.
>
> Signed-off-by: Paolo Pisati <[hidden email]>
> ---
>  Documentation/Makefile        | 2 +-
>  debian.master/control.stub.in | 1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index 6b12dd82f712..b016656a46ec 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -78,7 +78,7 @@ quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
>   $(abspath $(BUILDDIR)/$3/$4)
>  
>  htmldocs:
> - @$(srctree)/scripts/sphinx-pre-install --version-check
> + @$(srctree)/scripts/sphinx-pre-install --version-check --no-virtualenv
>   @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))
>  
>  linkcheckdocs:
> diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
> index c09a6a024464..5130c30a1239 100644
> --- a/debian.master/control.stub.in
> +++ b/debian.master/control.stub.in
> @@ -51,7 +51,6 @@ Build-Depends-Indep:
>   python3-sphinx-rtd-theme <!stage1>,
>   fontconfig <!stage1>,
>   python3-docutils <!stage1>,
> - python3-venv <!stage1>,
>   imagemagick <!stage1>,
>   graphviz <!stage1>,
>   dvipng <!stage1>,
>

Makes sense. Thanks Paolo

Acked-by: Colin Ian King <[hidden email]>

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH] [G/master-next] UBUNTU: SAUCE: doc: remove python3-venv dependency

Andrea Righi
In reply to this post by Paolo Pisati-5
On Thu, Oct 08, 2020 at 11:33:20AM +0200, Paolo Pisati wrote:
> BugLink: https://bugs.launchpad.net/bugs/1896801
>
> Since upstream has removed python3-venv, update our build dependencies and let
> linux-doc build outside a virtualenv.
>
> Signed-off-by: Paolo Pisati <[hidden email]>

Looks good to me.

Acked-by: Andrea Righi <[hidden email]>

> ---
>  Documentation/Makefile        | 2 +-
>  debian.master/control.stub.in | 1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/Documentation/Makefile b/Documentation/Makefile
> index 6b12dd82f712..b016656a46ec 100644
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -78,7 +78,7 @@ quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
>   $(abspath $(BUILDDIR)/$3/$4)
>  
>  htmldocs:
> - @$(srctree)/scripts/sphinx-pre-install --version-check
> + @$(srctree)/scripts/sphinx-pre-install --version-check --no-virtualenv
>   @+$(foreach var,$(SPHINXDIRS),$(call loop_cmd,sphinx,html,$(var),,$(var)))
>  
>  linkcheckdocs:
> diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
> index c09a6a024464..5130c30a1239 100644
> --- a/debian.master/control.stub.in
> +++ b/debian.master/control.stub.in
> @@ -51,7 +51,6 @@ Build-Depends-Indep:
>   python3-sphinx-rtd-theme <!stage1>,
>   fontconfig <!stage1>,
>   python3-docutils <!stage1>,
> - python3-venv <!stage1>,
>   imagemagick <!stage1>,
>   graphviz <!stage1>,
>   dvipng <!stage1>,
> --
> 2.25.1
>
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED: [PATCH] [G/master-next] UBUNTU: SAUCE: doc: remove python3-venv dependency

Seth Forshee
In reply to this post by Paolo Pisati-5
On Thu, Oct 08, 2020 at 11:33:20AM +0200, Paolo Pisati wrote:
> BugLink: https://bugs.launchpad.net/bugs/1896801
>
> Since upstream has removed python3-venv, update our build dependencies and let
> linux-doc build outside a virtualenv.
>
> Signed-off-by: Paolo Pisati <[hidden email]>

Applied to groovy/master-next and unstable/mater, thanks!

Seth

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team