tests/docker: Debian & MXE fixes
cover tests/docker: Debian & MXE fixes
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: [email protected]
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(-)
Signature · 1 line
2.20.1
PATCH 1/3 tests/docker: Install Sphinx in the Debian images
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
--- 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(-)
tests/docker/dockerfiles/debian-sid.docker +1 -0
@@ -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; }
tests/docker/dockerfiles/debian-xtensa-cross.docker +2 -1
@@ -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
tests/docker/dockerfiles/debian10.docker +1 -0
@@ -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)
tests/docker/dockerfiles/debian9-mxe.docker +1 -0
@@ -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/
tests/docker/dockerfiles/debian9.docker +1 -0
@@ -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)
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images
Quoted 7 lines · Philippe Mathieu-Daudé
Since commit
5f71eac06ethe Sphinx tool is required to build the rST documentation.This fixes:
$ ./configure --enable-docs
Quoted 8 lines
ERROR: User requested feature docs
configure was not able to find it.
Install texinfo, Perl/perl-podlators and python-sphinxSigned-off-by Philippe Mathieu-Daudé <[email protected]>--- 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.
Quoted 1 line
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.
Quoted 1 line
tests/docker/dockerfiles/debian9-mxe.docker | 1 +
debian9-mxe is derived from qemu:debian9 so
Quoted 1 line
tests/docker/dockerfiles/debian9.docker | 1 +
We only really need this one.
Quoted 54 lines
5 files changed, 6 insertions(+), 1 deletion(-)tests/docker/dockerfiles/debian-sid.docker +1
-0@@ -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; }tests/docker/dockerfiles/debian-xtensa-cross.docker +2
-1@@ -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.02tests/docker/dockerfiles/debian10.docker +1
-0@@ -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)tests/docker/dockerfiles/debian9-mxe.docker +1
-0@@ -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/tests/docker/dockerfiles/debian9.docker +0
-0
tests/docker/dockerfiles/debian9.docker RUN DEBIAN_FRONTEND=noninteractive eatmydata \ · line 32
Quoted 6 lines
tests/docker/dockerfiles/debian9.docker +1
-0@@ -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
Re: [Qemu-devel] [PATCH 1/3] tests/docker: Install Sphinx in the Debian images
Quoted 13 lines · Alex Bennée
Quoted 11 lines · Philippe Mathieu-Daudé
Since commit
5f71eac06ethe Sphinx tool is required to build the rST documentation.This fixes:
$ ./configure --enable-docsERROR: User requested feature docs
configure was not able to find it.
Install texinfo, Perl/perl-podlators and python-sphinx
Quoted 7 lines
Quoted 4 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- 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.
Quoted 5 lines
Quoted 2 lines
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.
Quoted 4 lines
Quoted 2 lines
tests/docker/dockerfiles/debian9-mxe.docker | 1 +debian9-mxe is derived from qemu:debian9 so
No idea why I missed that :)
Quoted 70 lines
Quoted 2 lines
tests/docker/dockerfiles/debian9.docker | 1 +We only really need this one.
Quoted 54 lines
5 files changed, 6 insertions(+), 1 deletion(-)tests/docker/dockerfiles/debian-sid.docker +1
-0@@ -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; }tests/docker/dockerfiles/debian-xtensa-cross.docker +2
-1@@ -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.02tests/docker/dockerfiles/debian10.docker +1
-0@@ -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)tests/docker/dockerfiles/debian9-mxe.docker +1
-0@@ -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/tests/docker/dockerfiles/debian9.docker +0
-0tests/docker/dockerfiles/debian9.docker RUN DEBIAN_FRONTEND=noninteractive eatmydata \ · line 32
Quoted 6 lines
tests/docker/dockerfiles/debian9.docker +1
-0@@ -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
PATCH 2/3 tests/docker: Install the NSIS tools in the MXE images
In reply to 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--- tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++ tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++ 2 files changed, 6 insertions(+)
tests/docker/dockerfiles/debian-win32-cross.docker +3 -0
@@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <[email protected]> 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 \
tests/docker/dockerfiles/debian-win64-cross.docker +3 -0
@@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <[email protected]> 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 \
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH 2/3] tests/docker: Install the NSIS tools in the MXE images
Quoted 3 lines · Philippe Mathieu-Daudé
This fixes:
$ make installer
We should probably be exercising this via test-mingw (and making it usable for fedora/debian based mingw build)
Quoted 23 lines
(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 127Quoted 1 line
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Otherwise:
Quoted 40 lines
--- tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++ tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++ 2 files changed, 6 insertions(+)tests/docker/dockerfiles/debian-win32-cross.docker +3
-0@@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <[email protected]> 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 \tests/docker/dockerfiles/debian-win64-cross.docker +2
-0@@ -9,6 +9,8 @@ MAINTAINER Philippe Mathieu-Daudé <[email protected]> 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 \
tests/docker/dockerfiles/debian-win64-cross.docker RUN DEBIAN_FRONTEND=noninteractive eatmydata \ · line 27
Quoted 7 lines
tests/docker/dockerfiles/debian-win64-cross.docker +1
-0@@ -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
PATCH 3/3 tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images
In reply to 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 [...]
--- tests/docker/dockerfiles/debian-win32-cross.docker | 3 +++ tests/docker/dockerfiles/debian-win64-cross.docker | 3 +++ 2 files changed, 6 insertions(+)
tests/docker/dockerfiles/debian-win32-cross.docker +3 -0
@@ -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 \
tests/docker/dockerfiles/debian-win64-cross.docker +3 -0
@@ -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 \
Signature · 1 line
2.20.1