[v2,04/23] tests/docker: Install Sphinx in the Fedora image

Message ID	20190717134335.15351-5-alex.bennee@linaro.org
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:16 +0100 Message-Id: <20190717134335.15351-5-alex.bennee@linaro.org> In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 04/23] tests/docker: Install Sphinx in the Fedora image Precedence: list Cc: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Richard Henderson <richard.henderson@linaro.org>, Fam Zheng <fam@euphon.net>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	testing/next for 4.1-rc2 (win, travis, iotests) \| expand [v2,00/23] testing/next for 4.1-rc2 (win, travis, iotests) [v2,02/23] tests/docker: add test-misc for building tools & docs [v2,03/23] tests/docker: Install Sphinx in the Ubuntu images [v2,04/23] tests/docker: Install Sphinx in the Fedora image [v2,05/23] tests/docker: Install Ubuntu images noninteractively [v2,06/23] tests/migration-test: don't spam the logs when we fail [v2,07/23] tests/dockerfiles: update the win cross builds to stretch [v2,08/23] shippable: re-enable the windows cross builds [v2,09/23] tests/docker: Install Sphinx in the Debian images [v2,10/23] tests/docker: Install the NSIS tools in the MinGW capable images [v2,11/23] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images [v2,12/23] tests/docker: Install texinfo in the Fedora image [v2,13/23] buildsys: The NSIS Windows build requires the documentation installed [v2,14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed [v2,15/23] tests/docker: Let the test-mingw test generate a NSIS installer [v2,16/23] NSIS: Add missing firmware blobs [v2,17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled [v2,18/23] travis: enable travis_retry for check phase [v2,19/23] tests/docker: invoke the DEBUG shell with --noprofile/--norc [v2,20/23] tests/qemu-iotests/check: Allow tests without groups [v2,21/23] tests/qemu-iotests/group: Remove some more tests from the "auto" group [v2,22/23] tests: Run the iotests during "make check" again [v2,23/23] gitlab-ci: Remove qcow2 tests that are handled by "make check" already

Message ID

20190717134335.15351-5-alex.bennee@linaro.org

State

New

Headers

From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Date: Wed, 17 Jul 2019 14:43:16 +0100
Message-Id: <20190717134335.15351-5-alex.bennee@linaro.org>
In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org>
References: <20190717134335.15351-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH v2 04/23] tests/docker: Install Sphinx in the
	Fedora image
Precedence: list
Cc: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Richard Henderson
	<richard.henderson@linaro.org>, Fam Zheng <fam@euphon.net>, 
	=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

testing/next for 4.1-rc2 (win, travis, iotests) | expand

Commit Message

Alex Bennée July 17, 2019, 1:43 p.m. UTC

From: Philippe Mathieu-Daudé <philmd@redhat.com>

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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20190711102710.2263-1-philmd@redhat.com>
[AJB: also add /usr/libexec/python3-sphinx/ to PATH]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/docker/dockerfiles/fedora.docker | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 619d1b5656d..2350d494d9a 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -76,6 +76,7 @@  ENV PACKAGES \
     perl-Test-Harness \
     pixman-devel \
     python3 \
+    python3-sphinx \
     PyYAML \
     rdma-core-devel \
     SDL2-devel \
@@ -95,4 +96,5 @@  ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
 
 RUN dnf install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt
+ENV PATH $PATH:/usr/libexec/python3-sphinx/
 ENV FEATURES mingw clang pyyaml asan

[v2,04/23] tests/docker: Install Sphinx in the Fedora image

Commit Message

Patch