* [Qemu-devel] [PATCH 0/3] tests/docker: Debian & MXE fixes
@ 2019-07-13 16:35 Philippe Mathieu-Daudé
2019-07-13 16:35 ` [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-07-13 16:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Stefan Weil, Alex Bennée, Philippe Mathieu-Daudé
Few more patches to be able to MXE-build the NSIS installers,
however it is still failing due to:
https://bugs.launchpad.net/bugs/1836453
Based-on: 20190712111849.9006-1-alex.bennee@linaro.org
https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg03014.html
Philippe Mathieu-Daudé (3):
tests/docker: Install Sphinx in the Debian images
tests/docker: Install the NSIS tools in the MXE images
tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images
tests/docker/dockerfiles/debian-sid.docker | 1 +
tests/docker/dockerfiles/debian-win32-cross.docker | 6 ++++++
tests/docker/dockerfiles/debian-win64-cross.docker | 6 ++++++
tests/docker/dockerfiles/debian-xtensa-cross.docker | 3 ++-
tests/docker/dockerfiles/debian10.docker | 1 +
tests/docker/dockerfiles/debian9-mxe.docker | 1 +
tests/docker/dockerfiles/debian9.docker | 1 +
7 files changed, 18 insertions(+), 1 deletion(-)
--
2.20.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images
2019-07-13 16:35 [Qemu-devel] [PATCH 0/3] tests/docker: Debian & MXE fixes Philippe Mathieu-Daudé
@ 2019-07-13 16:35 ` Philippe Mathieu-Daudé
2019-07-15 14:24 ` Alex Bennée
2019-07-13 16:35 ` [Qemu-devel] [PATCH 2/3] tests/docker: Install the NSIS tools in the MXE images Philippe Mathieu-Daudé
2019-07-13 16:35 ` [Qemu-devel] [PATCH 3/3] tests/docker: Set the correct cross-PKG_CONFIG_PATH " Philippe Mathieu-Daudé
2 siblings, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-07-13 16:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Stefan Weil, Alex Bennée, Philippe Mathieu-Daudé
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/debian-sid.docker | 1 +
tests/docker/dockerfiles/debian-xtensa-cross.docker | 3 ++-
tests/docker/dockerfiles/debian10.docker | 1 +
tests/docker/dockerfiles/debian9-mxe.docker | 1 +
tests/docker/dockerfiles/debian9.docker | 1 +
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)
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 2/3] tests/docker: Install the NSIS tools in the MXE images
2019-07-13 16:35 [Qemu-devel] [PATCH 0/3] tests/docker: Debian & MXE fixes Philippe Mathieu-Daudé
2019-07-13 16:35 ` [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images Philippe Mathieu-Daudé
@ 2019-07-13 16:35 ` Philippe Mathieu-Daudé
2019-07-15 14:26 ` Alex Bennée
2019-07-13 16:35 ` [Qemu-devel] [PATCH 3/3] tests/docker: Set the correct cross-PKG_CONFIG_PATH " Philippe Mathieu-Daudé
2 siblings, 1 reply; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-07-13 16:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Stefan Weil, Alex Bennée, Philippe Mathieu-Daudé
This fixes:
$ make installer
(cd /tmp/qemu-nsis; \
for i in qemu-system-*.exe; do \
arch=${i%.exe}; \
arch=${arch#qemu-system-}; \
echo Section \"$arch\" Section_$arch; \
echo SetOutPath \"\$INSTDIR\"; \
echo File \"\${BINDIR}\\$i\"; \
echo SectionEnd; \
done \
) >/tmp/qemu-nsis/system-emulations.nsh
makensis -V2 -NOCD \
-DCONFIG_DOCUMENTATION="y" \
\
-DBINDIR="/tmp/qemu-nsis" \
\
-DSRCDIR="/home/phil/source/qemu" \
-DOUTFILE="qemu-setup-4.0.90.exe" \
-DDISPLAYVERSION="4.0.90" \
/home/phil/source/qemu/qemu.nsi
/bin/sh: 1: makensis: not found
Makefile:1077: recipe for target 'qemu-setup-4.0.90.exe' failed
make: *** [qemu-setup-4.0.90.exe] Error 127
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++
tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++
2 files changed, 6 insertions(+)
diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker
index c787e43245..77f5cc45e9 100644
--- a/tests/docker/dockerfiles/debian-win32-cross.docker
+++ b/tests/docker/dockerfiles/debian-win32-cross.docker
@@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
ENV TARGET i686
+ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
+
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
mxe-$TARGET-w64-mingw32.shared-bzip2 \
@@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
mxe-$TARGET-w64-mingw32.shared-lzo \
mxe-$TARGET-w64-mingw32.shared-nettle \
mxe-$TARGET-w64-mingw32.shared-ncurses \
+ mxe-$TARGET-w64-mingw32.shared-nsis \
mxe-$TARGET-w64-mingw32.shared-pixman \
mxe-$TARGET-w64-mingw32.shared-pkgconf \
mxe-$TARGET-w64-mingw32.shared-pthreads \
diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker
index a7068ed6ac..3908c5abc4 100644
--- a/tests/docker/dockerfiles/debian-win64-cross.docker
+++ b/tests/docker/dockerfiles/debian-win64-cross.docker
@@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
ENV TARGET x86-64
+ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
+
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
mxe-$TARGET-w64-mingw32.shared-bzip2 \
@@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
mxe-$TARGET-w64-mingw32.shared-lzo \
mxe-$TARGET-w64-mingw32.shared-nettle \
mxe-$TARGET-w64-mingw32.shared-ncurses \
+ mxe-$TARGET-w64-mingw32.shared-nsis \
mxe-$TARGET-w64-mingw32.shared-pixman \
mxe-$TARGET-w64-mingw32.shared-pkgconf \
mxe-$TARGET-w64-mingw32.shared-pthreads \
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Qemu-devel] [PATCH 3/3] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images
2019-07-13 16:35 [Qemu-devel] [PATCH 0/3] tests/docker: Debian & MXE fixes Philippe Mathieu-Daudé
2019-07-13 16:35 ` [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images Philippe Mathieu-Daudé
2019-07-13 16:35 ` [Qemu-devel] [PATCH 2/3] tests/docker: Install the NSIS tools in the MXE images Philippe Mathieu-Daudé
@ 2019-07-13 16:35 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-07-13 16:35 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Stefan Weil, Alex Bennée, Philippe Mathieu-Daudé
This silents a bunch of warnings while compiling the Slirp objects:
$ make
[...]
CC slirp/src/tftp.o
Package glib-2.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `glib-2.0.pc'
to the PKG_CONFIG_PATH environment variable
No package 'glib-2.0' found
CC slirp/src/udp6.o
Package glib-2.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `glib-2.0.pc'
to the PKG_CONFIG_PATH environment variable
No package 'glib-2.0' found
[...]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++
tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++
2 files changed, 6 insertions(+)
diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker
index 77f5cc45e9..dc74ce7e0e 100644
--- a/tests/docker/dockerfiles/debian-win32-cross.docker
+++ b/tests/docker/dockerfiles/debian-win32-cross.docker
@@ -11,6 +11,9 @@ ENV TARGET i686
ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
+ENV PKG_CONFIG_PATH \
+ $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig
+
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
mxe-$TARGET-w64-mingw32.shared-bzip2 \
diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker
index 3908c5abc4..df7bfce7ea 100644
--- a/tests/docker/dockerfiles/debian-win64-cross.docker
+++ b/tests/docker/dockerfiles/debian-win64-cross.docker
@@ -11,6 +11,9 @@ ENV TARGET x86-64
ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
+ENV PKG_CONFIG_PATH \
+ $PKG_CONFIG_PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/lib/pkgconfig
+
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
mxe-$TARGET-w64-mingw32.shared-bzip2 \
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images
2019-07-13 16:35 ` [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images Philippe Mathieu-Daudé
@ 2019-07-15 14:24 ` Alex Bennée
2019-07-15 17:23 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 7+ messages in thread
From: Alex Bennée @ 2019-07-15 14:24 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Fam Zheng, Stefan Weil, qemu-devel
Philippe Mathieu-Daudé <philmd@redhat.com> 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é <philmd@redhat.com>
> ---
> 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.
> 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.
> tests/docker/dockerfiles/debian9-mxe.docker | 1 +
debian9-mxe is derived from qemu:debian9 so
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 2/3] tests/docker: Install the NSIS tools in the MXE images
2019-07-13 16:35 ` [Qemu-devel] [PATCH 2/3] tests/docker: Install the NSIS tools in the MXE images Philippe Mathieu-Daudé
@ 2019-07-15 14:26 ` Alex Bennée
0 siblings, 0 replies; 7+ messages in thread
From: Alex Bennée @ 2019-07-15 14:26 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Fam Zheng, Stefan Weil, qemu-devel
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> This fixes:
>
> $ make installer
We should probably be exercising this via test-mingw (and making it
usable for fedora/debian based mingw build)
> (cd /tmp/qemu-nsis; \
> for i in qemu-system-*.exe; do \
> arch=${i%.exe}; \
> arch=${arch#qemu-system-}; \
> echo Section \"$arch\" Section_$arch; \
> echo SetOutPath \"\$INSTDIR\"; \
> echo File \"\${BINDIR}\\$i\"; \
> echo SectionEnd; \
> done \
> ) >/tmp/qemu-nsis/system-emulations.nsh
> makensis -V2 -NOCD \
> -DCONFIG_DOCUMENTATION="y" \
> \
> -DBINDIR="/tmp/qemu-nsis" \
> \
> -DSRCDIR="/home/phil/source/qemu" \
> -DOUTFILE="qemu-setup-4.0.90.exe" \
> -DDISPLAYVERSION="4.0.90" \
> /home/phil/source/qemu/qemu.nsi
> /bin/sh: 1: makensis: not found
> Makefile:1077: recipe for target 'qemu-setup-4.0.90.exe' failed
> make: *** [qemu-setup-4.0.90.exe] Error 127
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Otherwise:
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++
> tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++
> 2 files changed, 6 insertions(+)
>
> diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker
> index c787e43245..77f5cc45e9 100644
> --- a/tests/docker/dockerfiles/debian-win32-cross.docker
> +++ b/tests/docker/dockerfiles/debian-win32-cross.docker
> @@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> ENV TARGET i686
>
> +ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
> +
> RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> apt-get install -y --no-install-recommends \
> mxe-$TARGET-w64-mingw32.shared-bzip2 \
> @@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> mxe-$TARGET-w64-mingw32.shared-lzo \
> mxe-$TARGET-w64-mingw32.shared-nettle \
> mxe-$TARGET-w64-mingw32.shared-ncurses \
> + mxe-$TARGET-w64-mingw32.shared-nsis \
> mxe-$TARGET-w64-mingw32.shared-pixman \
> mxe-$TARGET-w64-mingw32.shared-pkgconf \
> mxe-$TARGET-w64-mingw32.shared-pthreads \
> diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker
> index a7068ed6ac..3908c5abc4 100644
> --- a/tests/docker/dockerfiles/debian-win64-cross.docker
> +++ b/tests/docker/dockerfiles/debian-win64-cross.docker
> @@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> ENV TARGET x86-64
>
> +ENV PATH $PATH:/usr/lib/mxe/usr/$TARGET-w64-mingw32.shared/bin
> +
> RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> apt-get install -y --no-install-recommends \
> mxe-$TARGET-w64-mingw32.shared-bzip2 \
> @@ -19,6 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> mxe-$TARGET-w64-mingw32.shared-lzo \
> mxe-$TARGET-w64-mingw32.shared-nettle \
> mxe-$TARGET-w64-mingw32.shared-ncurses \
> + mxe-$TARGET-w64-mingw32.shared-nsis \
> mxe-$TARGET-w64-mingw32.shared-pixman \
> mxe-$TARGET-w64-mingw32.shared-pkgconf \
> mxe-$TARGET-w64-mingw32.shared-pthreads \
--
Alex Bennée
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images
2019-07-15 14:24 ` Alex Bennée
@ 2019-07-15 17:23 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-07-15 17:23 UTC (permalink / raw)
To: Alex Bennée; +Cc: Fam Zheng, Stefan Weil, qemu-devel
On 7/15/19 4:24 PM, Alex Bennée wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> 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é <philmd@redhat.com>
>> ---
>> 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
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-07-15 17:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-13 16:35 [Qemu-devel] [PATCH 0/3] tests/docker: Debian & MXE fixes Philippe Mathieu-Daudé
2019-07-13 16:35 ` [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images Philippe Mathieu-Daudé
2019-07-15 14:24 ` Alex Bennée
2019-07-15 17:23 ` Philippe Mathieu-Daudé
2019-07-13 16:35 ` [Qemu-devel] [PATCH 2/3] tests/docker: Install the NSIS tools in the MXE images Philippe Mathieu-Daudé
2019-07-15 14:26 ` Alex Bennée
2019-07-13 16:35 ` [Qemu-devel] [PATCH 3/3] tests/docker: Set the correct cross-PKG_CONFIG_PATH " Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).