mirror of https://github.com/proxmox/mirror_qemu
tests/docker: update fedora-win[32|64]-cross with lcitool
Convert another two dockerfiles to lcitool and update. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Acked-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220929114231.583801-10-alex.bennee@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20221028095659.48734-4-philmd@linaro.org>master
parent
6532426aa0
commit
9e243b7669
|
@ -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
|
FROM registry.fedoraproject.org/fedora:35
|
||||||
|
|
||||||
# Please keep this list sorted alphabetically
|
RUN dnf install -y nosync && \
|
||||||
ENV PACKAGES \
|
echo -e '#!/bin/sh\n\
|
||||||
bc \
|
if test -d /usr/lib64\n\
|
||||||
bison \
|
then\n\
|
||||||
bzip2 \
|
export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
|
||||||
ccache \
|
else\n\
|
||||||
diffutils \
|
export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
|
||||||
findutils \
|
fi\n\
|
||||||
flex \
|
exec "$@"' > /usr/bin/nosync && \
|
||||||
gcc \
|
chmod +x /usr/bin/nosync && \
|
||||||
gettext \
|
nosync dnf update -y && \
|
||||||
git \
|
nosync dnf install -y \
|
||||||
glib2-devel \
|
bash \
|
||||||
hostname \
|
bc \
|
||||||
make \
|
bison \
|
||||||
meson \
|
bzip2 \
|
||||||
mingw32-bzip2 \
|
ca-certificates \
|
||||||
mingw32-curl \
|
ccache \
|
||||||
mingw32-glib2 \
|
ctags \
|
||||||
mingw32-gmp \
|
dbus-daemon \
|
||||||
mingw32-gnutls \
|
diffutils \
|
||||||
mingw32-gtk3 \
|
findutils \
|
||||||
mingw32-libffi \
|
flex \
|
||||||
mingw32-libjpeg-turbo \
|
gcovr \
|
||||||
mingw32-libpng \
|
genisoimage \
|
||||||
mingw32-libtasn1 \
|
git \
|
||||||
mingw32-libusbx \
|
glib2-devel \
|
||||||
mingw32-nettle \
|
glibc-langpack-en \
|
||||||
mingw32-nsis \
|
hostname \
|
||||||
mingw32-pixman \
|
llvm \
|
||||||
mingw32-pkg-config \
|
make \
|
||||||
mingw32-SDL2 \
|
meson \
|
||||||
msitools \
|
ninja-build \
|
||||||
perl \
|
nmap-ncat \
|
||||||
python3 \
|
openssh-clients \
|
||||||
python3-PyYAML \
|
pcre-static \
|
||||||
tar \
|
perl-base \
|
||||||
which
|
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
|
||||||
|
|
||||||
RUN dnf install -y $PACKAGES
|
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||||
RUN rpm -q $PACKAGES | sort > /packages.txt
|
ENV LANG "en_US.UTF-8"
|
||||||
|
ENV MAKE "/usr/bin/make"
|
||||||
|
ENV NINJA "/usr/bin/ninja"
|
||||||
|
ENV PYTHON "/usr/bin/python3"
|
||||||
|
|
||||||
# Specify the cross prefix for this image (see tests/docker/common.rc)
|
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
|
||||||
|
|
||||||
|
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 QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32-
|
||||||
|
ENV DEF_TARGET_LIST i386-softmmu
|
||||||
|
|
|
@ -1,43 +1,103 @@
|
||||||
|
# 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
|
FROM registry.fedoraproject.org/fedora:35
|
||||||
|
|
||||||
# Please keep this list sorted alphabetically
|
RUN dnf install -y nosync && \
|
||||||
ENV PACKAGES \
|
echo -e '#!/bin/sh\n\
|
||||||
bc \
|
if test -d /usr/lib64\n\
|
||||||
bison \
|
then\n\
|
||||||
bzip2 \
|
export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
|
||||||
ccache \
|
else\n\
|
||||||
diffutils \
|
export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
|
||||||
findutils \
|
fi\n\
|
||||||
flex \
|
exec "$@"' > /usr/bin/nosync && \
|
||||||
gcc \
|
chmod +x /usr/bin/nosync && \
|
||||||
gettext \
|
nosync dnf update -y && \
|
||||||
git \
|
nosync dnf install -y \
|
||||||
glib2-devel \
|
bash \
|
||||||
hostname \
|
bc \
|
||||||
make \
|
bison \
|
||||||
meson \
|
bzip2 \
|
||||||
mingw32-nsis \
|
ca-certificates \
|
||||||
mingw64-bzip2 \
|
ccache \
|
||||||
mingw64-curl \
|
ctags \
|
||||||
mingw64-glib2 \
|
dbus-daemon \
|
||||||
mingw64-gmp \
|
diffutils \
|
||||||
mingw64-gtk3 \
|
findutils \
|
||||||
mingw64-libffi \
|
flex \
|
||||||
mingw64-libjpeg-turbo \
|
gcovr \
|
||||||
mingw64-libpng \
|
genisoimage \
|
||||||
mingw64-libtasn1 \
|
git \
|
||||||
mingw64-libusbx \
|
glib2-devel \
|
||||||
mingw64-pixman \
|
glibc-langpack-en \
|
||||||
mingw64-pkg-config \
|
hostname \
|
||||||
msitools \
|
llvm \
|
||||||
perl \
|
make \
|
||||||
python3 \
|
meson \
|
||||||
python3-PyYAML \
|
ninja-build \
|
||||||
tar \
|
nmap-ncat \
|
||||||
which
|
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
|
||||||
|
|
||||||
RUN dnf install -y $PACKAGES
|
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||||
RUN rpm -q $PACKAGES | sort > /packages.txt
|
ENV LANG "en_US.UTF-8"
|
||||||
|
ENV MAKE "/usr/bin/make"
|
||||||
|
ENV NINJA "/usr/bin/ninja"
|
||||||
|
ENV PYTHON "/usr/bin/python3"
|
||||||
|
|
||||||
# Specify the cross prefix for this image (see tests/docker/common.rc)
|
RUN nosync dnf install -y \
|
||||||
ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- --disable-capstone
|
mingw32-nsis \
|
||||||
|
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
|
||||||
|
|
||||||
|
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
|
||||||
|
|
|
@ -161,6 +161,16 @@ try:
|
||||||
trailer=cross_build("s390x-linux-gnu-",
|
trailer=cross_build("s390x-linux-gnu-",
|
||||||
"s390x-softmmu,s390x-linux-user"))
|
"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
|
# Cirrus packages lists for GitLab
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue