From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org,
aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com,
crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com,
Luke.Craig@ll.mit.edu, cota@braap.org,
aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com,
robhenry@microsoft.com, mahmoudabdalghany@outlook.com,
"Alex Bennée" <alex.bennee@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>
Subject: [PATCH v1 09/51] tests/docker: update fedora-win[32|64]-cross with lcitool
Date: Thu, 29 Sep 2022 12:41:49 +0100 [thread overview]
Message-ID: <20220929114231.583801-10-alex.bennee@linaro.org> (raw)
In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org>
Convert another two dockerfiles to lcitool and update. I renamed the
helper because it is not Debian specific.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.../dockerfiles/fedora-win32-cross.docker | 139 ++++++++++++------
.../dockerfiles/fedora-win64-cross.docker | 137 ++++++++++++-----
tests/lcitool/refresh | 48 +++---
3 files changed, 225 insertions(+), 99 deletions(-)
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index aca37aabc4..11f153e397 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -1,46 +1,103 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --layers all --cross mingw32 fedora-35 qemu
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
FROM registry.fedoraproject.org/fedora:35
-# Please keep this list sorted alphabetically
-ENV PACKAGES \
- bc \
- bison \
- bzip2 \
- ccache \
- diffutils \
- findutils \
- flex \
- gcc \
- gettext \
- git \
- glib2-devel \
- hostname \
- make \
- meson \
- mingw32-bzip2 \
- mingw32-curl \
- mingw32-glib2 \
- mingw32-gmp \
- mingw32-gnutls \
- mingw32-gtk3 \
- mingw32-libffi \
- mingw32-libjpeg-turbo \
- mingw32-libpng \
- mingw32-libtasn1 \
- mingw32-libusbx \
- mingw32-nettle \
- mingw32-nsis \
- mingw32-pixman \
- mingw32-pkg-config \
- mingw32-SDL2 \
- msitools \
- perl \
- python3 \
- python3-PyYAML \
- tar \
- which
+RUN dnf install -y nosync && \
+ echo -e '#!/bin/sh\n\
+if test -d /usr/lib64\n\
+then\n\
+ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
+else\n\
+ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
+fi\n\
+exec "$@"' > /usr/bin/nosync && \
+ chmod +x /usr/bin/nosync && \
+ nosync dnf update -y && \
+ nosync dnf install -y \
+ bash \
+ bc \
+ bison \
+ bzip2 \
+ ca-certificates \
+ ccache \
+ ctags \
+ dbus-daemon \
+ diffutils \
+ findutils \
+ flex \
+ gcovr \
+ genisoimage \
+ git \
+ glib2-devel \
+ glibc-langpack-en \
+ hostname \
+ llvm \
+ make \
+ meson \
+ ninja-build \
+ nmap-ncat \
+ openssh-clients \
+ pcre-static \
+ perl-base \
+ python3 \
+ python3-PyYAML \
+ python3-numpy \
+ python3-opencv \
+ python3-pillow \
+ python3-pip \
+ python3-sphinx \
+ python3-sphinx_rtd_theme \
+ rpm \
+ sed \
+ sparse \
+ spice-protocol \
+ tar \
+ tesseract \
+ tesseract-langpack-eng \
+ texinfo \
+ util-linux \
+ which && \
+ nosync dnf autoremove -y && \
+ nosync dnf clean all -y
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-RUN dnf install -y $PACKAGES
-RUN rpm -q $PACKAGES | sort > /packages.txt
+RUN nosync dnf install -y \
+ mingw32-SDL2 \
+ mingw32-SDL2_image \
+ mingw32-bzip2 \
+ mingw32-curl \
+ mingw32-gcc \
+ mingw32-gcc-c++ \
+ mingw32-gettext \
+ mingw32-glib2 \
+ mingw32-gnutls \
+ mingw32-gtk3 \
+ mingw32-libgcrypt \
+ mingw32-libjpeg-turbo \
+ mingw32-libpng \
+ mingw32-libtasn1 \
+ mingw32-nettle \
+ mingw32-nsis \
+ mingw32-pixman \
+ mingw32-pkg-config && \
+ nosync dnf clean all -y && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
-# Specify the cross prefix for this image (see tests/docker/common.rc)
+ENV ABI "i686-w64-mingw32"
+ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson"
ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32-
+ENV DEF_TARGET_LIST i386-softmmu
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 3642766479..8938c28554 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -1,43 +1,102 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+# $ lcitool dockerfile --layers all --cross mingw64 fedora-35 qemu
+#
+# https://gitlab.com/libvirt/libvirt-ci
+
FROM registry.fedoraproject.org/fedora:35
-# Please keep this list sorted alphabetically
-ENV PACKAGES \
- bc \
- bison \
- bzip2 \
- ccache \
- diffutils \
- findutils \
- flex \
- gcc \
- gettext \
- git \
- glib2-devel \
- hostname \
- make \
- meson \
- mingw32-nsis \
- mingw64-bzip2 \
- mingw64-curl \
- mingw64-glib2 \
- mingw64-gmp \
- mingw64-gtk3 \
- mingw64-libffi \
- mingw64-libjpeg-turbo \
- mingw64-libpng \
- mingw64-libtasn1 \
- mingw64-libusbx \
- mingw64-pixman \
- mingw64-pkg-config \
- msitools \
- perl \
- python3 \
- python3-PyYAML \
- tar \
- which
+RUN dnf install -y nosync && \
+ echo -e '#!/bin/sh\n\
+if test -d /usr/lib64\n\
+then\n\
+ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
+else\n\
+ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
+fi\n\
+exec "$@"' > /usr/bin/nosync && \
+ chmod +x /usr/bin/nosync && \
+ nosync dnf update -y && \
+ nosync dnf install -y \
+ bash \
+ bc \
+ bison \
+ bzip2 \
+ ca-certificates \
+ ccache \
+ ctags \
+ dbus-daemon \
+ diffutils \
+ findutils \
+ flex \
+ gcovr \
+ genisoimage \
+ git \
+ glib2-devel \
+ glibc-langpack-en \
+ hostname \
+ llvm \
+ make \
+ meson \
+ ninja-build \
+ nmap-ncat \
+ openssh-clients \
+ pcre-static \
+ perl-base \
+ python3 \
+ python3-PyYAML \
+ python3-numpy \
+ python3-opencv \
+ python3-pillow \
+ python3-pip \
+ python3-sphinx \
+ python3-sphinx_rtd_theme \
+ rpm \
+ sed \
+ sparse \
+ spice-protocol \
+ tar \
+ tesseract \
+ tesseract-langpack-eng \
+ texinfo \
+ util-linux \
+ which && \
+ nosync dnf autoremove -y && \
+ nosync dnf clean all -y
+
+ENV LANG "en_US.UTF-8"
+ENV MAKE "/usr/bin/make"
+ENV NINJA "/usr/bin/ninja"
+ENV PYTHON "/usr/bin/python3"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-RUN dnf install -y $PACKAGES
-RUN rpm -q $PACKAGES | sort > /packages.txt
+RUN nosync dnf install -y \
+ mingw64-SDL2 \
+ mingw64-SDL2_image \
+ mingw64-bzip2 \
+ mingw64-curl \
+ mingw64-gcc \
+ mingw64-gcc-c++ \
+ mingw64-gettext \
+ mingw64-glib2 \
+ mingw64-gnutls \
+ mingw64-gtk3 \
+ mingw64-libgcrypt \
+ mingw64-libjpeg-turbo \
+ mingw64-libpng \
+ mingw64-libtasn1 \
+ mingw64-nettle \
+ mingw64-pixman \
+ mingw64-pkg-config && \
+ nosync dnf clean all -y && \
+ rpm -qa | sort > /packages.txt && \
+ mkdir -p /usr/libexec/ccache-wrappers && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-c++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-g++ && \
+ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
-# Specify the cross prefix for this image (see tests/docker/common.rc)
-ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- --disable-capstone
+ENV ABI "x86_64-w64-mingw32"
+ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson"
+ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32-
+ENV DEF_TARGET_LIST x86_64-softmmu
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index fc604d8a21..783497a989 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -93,7 +93,7 @@ debian11_extras = [
]
-def debian_cross_build(prefix, targets):
+def cross_build(prefix, targets):
conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix)
targets = "ENV DEF_TARGET_LIST %s\n" % (targets)
return "".join([conf, targets])
@@ -121,45 +121,55 @@ try:
#
generate_dockerfile("debian-amd64-cross", "debian-11",
cross="x86_64",
- trailer=debian_cross_build("x86_64-linux-gnu-",
- "x86_64-softmmu,"
- "x86_64-linux-user,"
- "i386-softmmu,i386-linux-user"))
+ trailer=cross_build("x86_64-linux-gnu-",
+ "x86_64-softmmu,"
+ "x86_64-linux-user,"
+ "i386-softmmu,i386-linux-user"))
generate_dockerfile("debian-arm64-cross", "debian-11",
cross="aarch64",
- trailer=debian_cross_build("aarch64-linux-gnu-",
- "aarch64-softmmu,aarch64-linux-user"))
+ trailer=cross_build("aarch64-linux-gnu-",
+ "aarch64-softmmu,aarch64-linux-user"))
generate_dockerfile("debian-armel-cross", "debian-11",
cross="armv6l",
- trailer=debian_cross_build("arm-linux-gnueabi-",
- "arm-softmmu,arm-linux-user,armeb-linux-user"))
+ trailer=cross_build("arm-linux-gnueabi-",
+ "arm-softmmu,arm-linux-user,armeb-linux-user"))
generate_dockerfile("debian-armhf-cross", "debian-11",
cross="armv7l",
- trailer=debian_cross_build("arm-linux-gnueabihf-",
- "arm-softmmu,arm-linux-user"))
+ trailer=cross_build("arm-linux-gnueabihf-",
+ "arm-softmmu,arm-linux-user"))
generate_dockerfile("debian-mips64el-cross", "debian-11",
cross="mips64el",
- trailer=debian_cross_build("mips64el-linux-gnuabi64-",
- "mips64el-softmmu,mips64el-linux-user"))
+ trailer=cross_build("mips64el-linux-gnuabi64-",
+ "mips64el-softmmu,mips64el-linux-user"))
generate_dockerfile("debian-mipsel-cross", "debian-11",
cross="mipsel",
- trailer=debian_cross_build("mipsel-linux-gnu-",
- "mipsel-softmmu,mipsel-linux-user"))
+ trailer=cross_build("mipsel-linux-gnu-",
+ "mipsel-softmmu,mipsel-linux-user"))
generate_dockerfile("debian-ppc64el-cross", "debian-11",
cross="ppc64le",
- trailer=debian_cross_build("powerpc64le-linux-gnu-",
- "ppc64-softmmu,ppc64-linux-user"))
+ trailer=cross_build("powerpc64le-linux-gnu-",
+ "ppc64-softmmu,ppc64-linux-user"))
generate_dockerfile("debian-s390x-cross", "debian-11",
cross="s390x",
- trailer=debian_cross_build("s390x-linux-gnu-",
- "s390x-softmmu,s390x-linux-user"))
+ trailer=cross_build("s390x-linux-gnu-",
+ "s390x-softmmu,s390x-linux-user"))
+
+ generate_dockerfile("fedora-win32-cross", "fedora-35",
+ cross="mingw32",
+ trailer=cross_build("i686-w64-mingw32-",
+ "i386-softmmu"))
+
+ generate_dockerfile("fedora-win64-cross", "fedora-35",
+ cross="mingw64",
+ trailer=cross_build("x86_64-w64-mingw32-",
+ "x86_64-softmmu"))
#
# Cirrus packages lists for GitLab
--
2.34.1
next prev parent reply other threads:[~2022-09-29 12:44 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 11:41 [PATCH v1 00/51] maintainer pre-PR (testing, plugins, gitdm, semihosting) Alex Bennée
2022-09-29 11:41 ` [PATCH v1 01/51] scripts/ci/setup: ninja missing from build-environment Alex Bennée
2022-09-29 11:41 ` [PATCH v1 02/51] scripts/ci/setup: Fix libxen requirements Alex Bennée
2022-09-29 11:41 ` [PATCH v1 03/51] scripts/ci/setup: spice-server only on x86 aarch64 Alex Bennée
2022-09-29 11:41 ` [PATCH v1 04/51] tests/docker: run script use realpath instead of readlink Alex Bennée
2022-09-29 11:41 ` [PATCH v1 05/51] configure: move detected gdb to TCG's config-host.mak Alex Bennée
2022-09-29 11:41 ` [PATCH v1 06/51] target/hexagon: add flex/bison/glib2 to qemu.yml Alex Bennée
2022-09-29 11:41 ` [PATCH v1 07/51] target/hexagon: regenerate docker/cirrus files Alex Bennée
2022-09-29 11:41 ` [PATCH v1 08/51] target/hexagon: manually add flex/bison/glib2 to remaining containers Alex Bennée
2022-09-29 11:41 ` Alex Bennée [this message]
2022-09-29 11:41 ` [PATCH v1 10/51] tests/docker: move alpine from edge to tagged release Alex Bennée
2022-09-29 11:41 ` [PATCH v1 11/51] tests/qtest: bump up QOS_PATH_MAX_ELEMENT_SIZE Alex Bennée
2022-09-29 11:41 ` [PATCH v1 12/51] configure: do not invoke as/ld directly for pc-bios/optionrom Alex Bennée
2022-09-29 11:41 ` [PATCH v1 13/51] pc-bios/optionrom: detect CC options just once Alex Bennée
2022-09-29 11:41 ` [PATCH v1 14/51] pc-bios/s390-ccw: " Alex Bennée
2022-09-29 11:41 ` [PATCH v1 15/51] vof: add distclean target Alex Bennée
2022-09-29 14:36 ` BALATON Zoltan
2022-09-29 16:25 ` Alex Bennée
2022-09-29 16:45 ` Alex Bennée
2022-09-29 11:41 ` [PATCH v1 16/51] build: add recursive distclean rules Alex Bennée
2022-09-29 11:41 ` [PATCH v1 17/51] configure: return status code from probe_target_compiler Alex Bennée
2022-09-29 11:41 ` [PATCH v1 18/51] configure: store container engine in config-host.mak Alex Bennée
2022-09-29 11:41 ` [PATCH v1 19/51] tests: simplify Makefile invocation for tests/tcg Alex Bennée
2022-09-29 11:42 ` [PATCH v1 20/51] tests/tcg: remove -f from Makefile invocation Alex Bennée
2022-09-29 11:42 ` [PATCH v1 21/51] tests/tcg: add distclean rule Alex Bennée
2022-09-29 11:42 ` [PATCH v1 22/51] tests/tcg: unify ppc64 and ppc64le Makefiles Alex Bennée
2022-09-29 11:42 ` [PATCH v1 23/51] tests/tcg: clean up calls to run-test Alex Bennée
2022-09-29 11:42 ` [PATCH v1 24/51] tests/tcg: move compiler tests to Makefiles Alex Bennée
2022-09-29 11:42 ` [PATCH v1 25/51] configure: move tests/tcg/Makefile.prereqs to root build directory Alex Bennée
2022-09-29 11:42 ` [PATCH v1 26/51] configure: unify creation of cross-compilation Makefiles Alex Bennée
2022-09-29 11:42 ` [PATCH v1 27/51] configure: cleanup creation of tests/tcg target config Alex Bennée
2022-09-29 11:42 ` [PATCH v1 28/51] configure: build ROMs with container-based cross compilers Alex Bennée
2022-09-29 11:42 ` [PATCH v1 29/51] pc-bios/optionrom: Adopt meson style Make output Alex Bennée
2022-09-29 11:42 ` [PATCH v1 30/51] pc-bios/s390-ccw: " Alex Bennée
2022-09-29 11:42 ` [PATCH v1 31/51] pc-bios/vof: " Alex Bennée
2022-09-29 11:42 ` [PATCH v1 32/51] monitor: expose monitor_puts to rest of code Alex Bennée
2022-09-29 11:42 ` [PATCH v1 33/51] disas: generalise plugin_printf and use for monitor_disas Alex Bennée
2022-09-29 11:42 ` [PATCH v1 34/51] disas: use result of ->read_memory_func Alex Bennée
2022-09-29 11:42 ` [PATCH v1 35/51] plugins: extend execlog to filter matches Alex Bennée
2022-09-29 11:42 ` [PATCH v1 36/51] plugins: Assert mmu_idx in range before use in qemu_plugin_get_hwaddr Alex Bennée
2022-09-29 11:42 ` [PATCH v1 37/51] docs/devel: clean-up qemu invocations in tcg-plugins Alex Bennée
2022-09-29 11:42 ` [PATCH v1 38/51] docs/devel: move API to end of tcg-plugins.rst Alex Bennée
2022-09-29 11:42 ` [PATCH v1 39/51] contrib/plugins: reset skip when matching in execlog Alex Bennée
2022-09-29 11:42 ` [PATCH v1 40/51] docs/devel: document the test plugins Alex Bennée
2022-09-29 11:42 ` [PATCH v1 41/51] semihosting: update link to spec Alex Bennée
2022-09-29 11:42 ` [PATCH v1 42/51] gdbstub: move into its own sub directory Alex Bennée
2022-09-29 11:42 ` [PATCH v1 43/51] gdbstub: move sstep flags probing into AccelClass Alex Bennée
2022-09-29 11:42 ` [PATCH v1 44/51] gdbstub: move breakpoint logic to accel ops Alex Bennée
2022-09-29 11:42 ` [PATCH v1 45/51] gdbstub: move guest debug support check to ops Alex Bennée
2022-09-29 11:42 ` [PATCH v1 46/51] accel/kvm: move kvm_update_guest_debug to inline stub Alex Bennée
2022-09-29 11:42 ` [PATCH v1 47/51] contrib/gitdm: add mapping for Loongson Technology Alex Bennée
2022-09-29 11:42 ` [PATCH v1 48/51] contrib/gitdm: add Paul to individual contributors Alex Bennée
2022-09-29 11:42 ` [PATCH v1 49/51] contrib/gitdm: add WANG Xuerui to individual contributers Alex Bennée
2022-09-29 11:42 ` [PATCH v1 50/51] contrib/gitdm: add ISCAS to the academics group Alex Bennée
2022-09-29 11:42 ` [PATCH v1 51/51] contrib/gitdm: add China Telecom to the domain map Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220929114231.583801-10-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=Luke.Craig@ll.mit.edu \
--cc=aaron@os.amperecomputing.com \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=cota@braap.org \
--cc=crosa@redhat.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=kuhn.chenqun@huawei.com \
--cc=ma.mandourr@gmail.com \
--cc=mahmoudabdalghany@outlook.com \
--cc=minyihh@uci.edu \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=robhenry@microsoft.com \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).