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

Paolo Pisati paolo.pisati at canonical.com
Thu Oct 8 09:33:20 UTC 2020


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 <paolo.pisati at canonical.com>
---
 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




More information about the kernel-team mailing list