tests/docker: Install Sphinx in the Ubuntu images

[Qemu-devel] [PATCH-for-4.1] tests/docker: Install Sphinx in the Ubuntu images

Philippe Mathieu-Daudé posted 1 patch 4 years, 9 months ago

Download mbox

Test FreeBSD passed

Test docker-clang@ubuntu failed

Test asan passed

Test docker-mingw@fedora passed

Test s390x passed

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190711120609.12773-1-philmd@redhat.com

Maintainers: "Philippe Mathieu-Daudé" <philmd@redhat.com>, Fam Zheng <fam@euphon.net>, "Alex Bennée" <alex.bennee@linaro.org>

tests/docker/dockerfiles/ubuntu.docker     | 1 +
tests/docker/dockerfiles/ubuntu1804.docker | 1 +
2 files changed, 2 insertions(+)

Expand all Fold all

[Qemu-devel] [PATCH-for-4.1] tests/docker: Install Sphinx in the Ubuntu images

Posted by Philippe Mathieu-Daudé 4 years, 9 months ago

Since commit 5f71eac06e the Sphinx tool is required
to build the rST documentation.

This fixes:

 $ ./configure --enable-docs

 ERROR: User requested feature docs
        configure was not able to find it.
        Install texinfo, Perl/perl-podlators and python-sphinx

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/docker/dockerfiles/ubuntu.docker     | 1 +
 tests/docker/dockerfiles/ubuntu1804.docker | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
index d3b72209c8..2500ec84b6 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -61,6 +61,7 @@ ENV PACKAGES flex bison \
     libxen-dev \
     make \
     python-yaml \
+    python3-sphinx \
     sparse \
     texinfo \
     xfslibs-dev
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 9d80b11500..0bb8088658 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -48,6 +48,7 @@ ENV PACKAGES flex bison \
     libxen-dev \
     make \
     python-yaml \
+    python3-sphinx \
     sparse \
     texinfo \
     xfslibs-dev
-- 
2.20.1

Re: [Qemu-devel] [PATCH-for-4.1] tests/docker: Install Sphinx in the Ubuntu images

Posted by Stefano Garzarella 4 years, 9 months ago

On Thu, Jul 11, 2019 at 02:06:09PM +0200, Philippe Mathieu-Daudé wrote:
> Since commit 5f71eac06e the Sphinx tool is required
> to build the rST documentation.
> 
> This fixes:
> 
>  $ ./configure --enable-docs
> 
>  ERROR: User requested feature docs
>         configure was not able to find it.
>         Install texinfo, Perl/perl-podlators and python-sphinx
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  tests/docker/dockerfiles/ubuntu.docker     | 1 +
>  tests/docker/dockerfiles/ubuntu1804.docker | 1 +
>  2 files changed, 2 insertions(+)

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>