Re: [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images

[Philippe Mathieu-Daudé]

On 7/15/19 4:24 PM, Alex Bennée wrote:
> Philippe Mathieu-Daudé <address@hidden> writes:
> 
>> 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é <address@hidden>
>> ---
>>  tests/docker/dockerfiles/debian-sid.docker          | 1 +
>>  tests/docker/dockerfiles/debian-xtensa-cross.docker | 3 ++-
> 
> These two are probably overkill - sid and xtensa are used for building
> test cases.

Fair.

> 
>>  tests/docker/dockerfiles/debian10.docker            | 1 +
> 
> Again used as a base for docker-cross targets - it can't build QEMU on
> it's own but I guess makes sense to include it here.

Yeah, we might use it as base image later.

> 
>>  tests/docker/dockerfiles/debian9-mxe.docker         | 1 +
> 
> debian9-mxe is derived from  qemu:debian9 so

No idea why I missed that :)

> 
>>  tests/docker/dockerfiles/debian9.docker             | 1 +
> 
> We only really need this one.
> 
>>  5 files changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/tests/docker/dockerfiles/debian-sid.docker 
>> b/tests/docker/dockerfiles/debian-sid.docker
>> index 676941cb32..9d65c15916 100644
>> --- a/tests/docker/dockerfiles/debian-sid.docker
>> +++ b/tests/docker/dockerfiles/debian-sid.docker
>> @@ -38,4 +38,5 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
>>          pkg-config \
>>          psmisc \
>>          python \
>> +        python3-sphinx \
>>          texinfo || { echo "Failed to build - see debian-sid.docker notes"; 
>> exit 1; }
>> diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker 
>> b/tests/docker/dockerfiles/debian-xtensa-cross.docker
>> index afd2ab9163..3022940e64 100644
>> --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker
>> +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker
>> @@ -18,7 +18,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
>>          flex \
>>          gettext \
>>          git \
>> -        python-minimal
>> +        python-minimal \
>> +        python3-sphinx
>>
>>  ENV CPU_LIST csp dc232b dc233c
>>  ENV TOOLCHAIN_RELEASE 2018.02
>> diff --git a/tests/docker/dockerfiles/debian10.docker 
>> b/tests/docker/dockerfiles/debian10.docker
>> index aeeb151b52..cf57d8218f 100644
>> --- a/tests/docker/dockerfiles/debian10.docker
>> +++ b/tests/docker/dockerfiles/debian10.docker
>> @@ -27,5 +27,6 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
>>          pkg-config \
>>          psmisc \
>>          python \
>> +        python3-sphinx \
>>          texinfo \
>>          $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ 
>>  -f2)
>> diff --git a/tests/docker/dockerfiles/debian9-mxe.docker 
>> b/tests/docker/dockerfiles/debian9-mxe.docker
>> index 5bc8a6d5c3..497c198731 100644
>> --- a/tests/docker/dockerfiles/debian9-mxe.docker
>> +++ b/tests/docker/dockerfiles/debian9-mxe.docker
>> @@ -17,6 +17,7 @@ RUN apt-get update
>>  RUN DEBIAN_FRONTEND=noninteractive eatmydata \
>>      apt-get install -y --no-install-recommends \
>>          libpython2.7-stdlib \
>> +        python3-sphinx \
>>          $(apt-get -s install -y --no-install-recommends 
>> gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\  -f2)
>>
>>  ENV PATH $PATH:/usr/lib/mxe/usr/bin/
>> diff --git a/tests/docker/dockerfiles/debian9.docker 
>> b/tests/docker/dockerfiles/debian9.docker
>> index 5f23a35404..52c589a7d6 100644
>> --- a/tests/docker/dockerfiles/debian9.docker
>> +++ b/tests/docker/dockerfiles/debian9.docker
>> @@ -27,5 +27,6 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
>>          pkg-config \
>>          psmisc \
>>          python \
>> +        python3-sphinx \
>>          texinfo \
>>          $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ 
>>  -f2)
> 
> 
> --
> Alex Bennée
>