mirror of https://github.com/xemu-project/xemu.git
tests/docker/dockerfiles: Update container files with "lcitool-refresh"
Run "make lcitool-refresh" after the previous changes to the lcitool files. This removes the g++ and xfslibs-dev packages from the dockerfiles (except for the fedora-win64-cross dockerfile where we keep the C++ compiler). Message-ID: <20240516084059.511463-6-thuth@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
d2f213cc06
commit
e4b6adae7a
|
@ -32,7 +32,6 @@ RUN apk update && \
|
|||
findutils \
|
||||
flex \
|
||||
fuse3-dev \
|
||||
g++ \
|
||||
gcc \
|
||||
gcovr \
|
||||
gettext \
|
||||
|
@ -110,7 +109,6 @@ RUN apk update && \
|
|||
vte3-dev \
|
||||
which \
|
||||
xen-dev \
|
||||
xfsprogs-dev \
|
||||
xorriso \
|
||||
zlib-dev \
|
||||
zlib-static \
|
||||
|
@ -119,10 +117,8 @@ RUN apk update && \
|
|||
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||
apk list --installed | sort > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
|
||||
|
||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||
|
|
|
@ -34,7 +34,6 @@ RUN dnf distro-sync -y && \
|
|||
flex \
|
||||
fuse3-devel \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
gettext \
|
||||
git \
|
||||
glib2-devel \
|
||||
|
@ -115,7 +114,6 @@ RUN dnf distro-sync -y && \
|
|||
util-linux \
|
||||
vte291-devel \
|
||||
which \
|
||||
xfsprogs-devel \
|
||||
xorriso \
|
||||
zlib-devel \
|
||||
zlib-static \
|
||||
|
@ -125,10 +123,8 @@ RUN dnf distro-sync -y && \
|
|||
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||
rpm -qa | sort > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
|
||||
|
||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||
|
|
|
@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
eatmydata apt-get dist-upgrade -y && \
|
||||
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||
eatmydata apt-get install --no-install-recommends -y \
|
||||
g++-x86-64-linux-gnu \
|
||||
gcc-x86-64-linux-gnu \
|
||||
libaio-dev:amd64 \
|
||||
libasan6:amd64 \
|
||||
|
@ -149,7 +148,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
libzstd-dev:amd64 \
|
||||
nettle-dev:amd64 \
|
||||
systemtap-sdt-dev:amd64 \
|
||||
xfslibs-dev:amd64 \
|
||||
zlib1g-dev:amd64 && \
|
||||
eatmydata apt-get autoremove -y && \
|
||||
eatmydata apt-get autoclean -y && \
|
||||
|
@ -167,9 +165,7 @@ cpu = 'x86_64'\n\
|
|||
endian = 'little'\n" > /usr/local/share/meson/cross/x86_64-linux-gnu && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-gcc
|
||||
|
||||
ENV ABI "x86_64-linux-gnu"
|
||||
|
|
|
@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
eatmydata apt-get dist-upgrade -y && \
|
||||
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||
eatmydata apt-get install --no-install-recommends -y \
|
||||
g++-aarch64-linux-gnu \
|
||||
gcc-aarch64-linux-gnu \
|
||||
libaio-dev:arm64 \
|
||||
libasan6:arm64 \
|
||||
|
@ -148,7 +147,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
libzstd-dev:arm64 \
|
||||
nettle-dev:arm64 \
|
||||
systemtap-sdt-dev:arm64 \
|
||||
xfslibs-dev:arm64 \
|
||||
zlib1g-dev:arm64 && \
|
||||
eatmydata apt-get autoremove -y && \
|
||||
eatmydata apt-get autoclean -y && \
|
||||
|
@ -166,9 +164,7 @@ cpu = 'aarch64'\n\
|
|||
endian = 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc
|
||||
|
||||
ENV ABI "aarch64-linux-gnu"
|
||||
|
|
|
@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
eatmydata apt-get dist-upgrade -y && \
|
||||
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||
eatmydata apt-get install --no-install-recommends -y \
|
||||
g++-arm-linux-gnueabi \
|
||||
gcc-arm-linux-gnueabi \
|
||||
libaio-dev:armel \
|
||||
libasan6:armel \
|
||||
|
@ -149,7 +148,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
libzstd-dev:armel \
|
||||
nettle-dev:armel \
|
||||
systemtap-sdt-dev:armel \
|
||||
xfslibs-dev:armel \
|
||||
zlib1g-dev:armel && \
|
||||
eatmydata apt-get autoremove -y && \
|
||||
eatmydata apt-get autoclean -y && \
|
||||
|
@ -167,9 +165,7 @@ cpu = 'arm'\n\
|
|||
endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc
|
||||
|
||||
ENV ABI "arm-linux-gnueabi"
|
||||
|
|
|
@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
eatmydata apt-get dist-upgrade -y && \
|
||||
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||
eatmydata apt-get install --no-install-recommends -y \
|
||||
g++-arm-linux-gnueabihf \
|
||||
gcc-arm-linux-gnueabihf \
|
||||
libaio-dev:armhf \
|
||||
libasan6:armhf \
|
||||
|
@ -148,7 +147,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
libzstd-dev:armhf \
|
||||
nettle-dev:armhf \
|
||||
systemtap-sdt-dev:armhf \
|
||||
xfslibs-dev:armhf \
|
||||
zlib1g-dev:armhf && \
|
||||
eatmydata apt-get autoremove -y && \
|
||||
eatmydata apt-get autoclean -y && \
|
||||
|
@ -166,9 +164,7 @@ cpu = 'armhf'\n\
|
|||
endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc
|
||||
|
||||
ENV ABI "arm-linux-gnueabihf"
|
||||
|
|
|
@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
eatmydata apt-get dist-upgrade -y && \
|
||||
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||
eatmydata apt-get install --no-install-recommends -y \
|
||||
g++-i686-linux-gnu \
|
||||
gcc-i686-linux-gnu \
|
||||
libaio-dev:i386 \
|
||||
libasan6:i386 \
|
||||
|
@ -149,7 +148,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
libzstd-dev:i386 \
|
||||
nettle-dev:i386 \
|
||||
systemtap-sdt-dev:i386 \
|
||||
xfslibs-dev:i386 \
|
||||
zlib1g-dev:i386 && \
|
||||
eatmydata apt-get autoremove -y && \
|
||||
eatmydata apt-get autoclean -y && \
|
||||
|
@ -167,9 +165,7 @@ cpu = 'i686'\n\
|
|||
endian = 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc
|
||||
|
||||
ENV ABI "i686-linux-gnu"
|
||||
|
|
|
@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
eatmydata apt-get dist-upgrade -y && \
|
||||
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||
eatmydata apt-get install --no-install-recommends -y \
|
||||
g++-mips64el-linux-gnuabi64 \
|
||||
gcc-mips64el-linux-gnuabi64 \
|
||||
libaio-dev:mips64el \
|
||||
libasound2-dev:mips64el \
|
||||
|
@ -147,7 +146,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
libzstd-dev:mips64el \
|
||||
nettle-dev:mips64el \
|
||||
systemtap-sdt-dev:mips64el \
|
||||
xfslibs-dev:mips64el \
|
||||
zlib1g-dev:mips64el && \
|
||||
eatmydata apt-get autoremove -y && \
|
||||
eatmydata apt-get autoclean -y && \
|
||||
|
@ -165,9 +163,7 @@ cpu = 'mips64el'\n\
|
|||
endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc
|
||||
|
||||
ENV ABI "mips64el-linux-gnuabi64"
|
||||
|
|
|
@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
eatmydata apt-get dist-upgrade -y && \
|
||||
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||
eatmydata apt-get install --no-install-recommends -y \
|
||||
g++-mipsel-linux-gnu \
|
||||
gcc-mipsel-linux-gnu \
|
||||
libaio-dev:mipsel \
|
||||
libasound2-dev:mipsel \
|
||||
|
@ -147,7 +146,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
libzstd-dev:mipsel \
|
||||
nettle-dev:mipsel \
|
||||
systemtap-sdt-dev:mipsel \
|
||||
xfslibs-dev:mipsel \
|
||||
zlib1g-dev:mipsel && \
|
||||
eatmydata apt-get autoremove -y && \
|
||||
eatmydata apt-get autoclean -y && \
|
||||
|
@ -165,9 +163,7 @@ cpu = 'mipsel'\n\
|
|||
endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc
|
||||
|
||||
ENV ABI "mipsel-linux-gnu"
|
||||
|
|
|
@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
eatmydata apt-get dist-upgrade -y && \
|
||||
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||
eatmydata apt-get install --no-install-recommends -y \
|
||||
g++-powerpc64le-linux-gnu \
|
||||
gcc-powerpc64le-linux-gnu \
|
||||
libaio-dev:ppc64el \
|
||||
libasan6:ppc64el \
|
||||
|
@ -147,7 +146,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
libzstd-dev:ppc64el \
|
||||
nettle-dev:ppc64el \
|
||||
systemtap-sdt-dev:ppc64el \
|
||||
xfslibs-dev:ppc64el \
|
||||
zlib1g-dev:ppc64el && \
|
||||
eatmydata apt-get autoremove -y && \
|
||||
eatmydata apt-get autoclean -y && \
|
||||
|
@ -165,9 +163,7 @@ cpu = 'powerpc64le'\n\
|
|||
endian = 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc
|
||||
|
||||
ENV ABI "powerpc64le-linux-gnu"
|
||||
|
|
|
@ -51,7 +51,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
eatmydata apt-get dist-upgrade -y && \
|
||||
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||
eatmydata apt-get install --no-install-recommends -y \
|
||||
g++-riscv64-linux-gnu \
|
||||
gcc-riscv64-linux-gnu \
|
||||
libc6-dev:riscv64 \
|
||||
libfdt-dev:riscv64 \
|
||||
|
@ -74,9 +73,7 @@ cpu = 'riscv64'\n\
|
|||
endian = 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/riscv64-linux-gnu-gcc
|
||||
|
||||
ENV ABI "riscv64-linux-gnu"
|
||||
|
|
|
@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
eatmydata apt-get dist-upgrade -y && \
|
||||
eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
|
||||
eatmydata apt-get install --no-install-recommends -y \
|
||||
g++-s390x-linux-gnu \
|
||||
gcc-s390x-linux-gnu \
|
||||
libaio-dev:s390x \
|
||||
libasan6:s390x \
|
||||
|
@ -146,7 +145,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
libzstd-dev:s390x \
|
||||
nettle-dev:s390x \
|
||||
systemtap-sdt-dev:s390x \
|
||||
xfslibs-dev:s390x \
|
||||
zlib1g-dev:s390x && \
|
||||
eatmydata apt-get autoremove -y && \
|
||||
eatmydata apt-get autoclean -y && \
|
||||
|
@ -164,9 +162,7 @@ cpu = 's390x'\n\
|
|||
endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc
|
||||
|
||||
ENV ABI "s390x-linux-gnu"
|
||||
|
|
|
@ -25,7 +25,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
exuberant-ctags \
|
||||
findutils \
|
||||
flex \
|
||||
g++ \
|
||||
gcc \
|
||||
gcovr \
|
||||
gettext \
|
||||
|
@ -129,7 +128,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
tar \
|
||||
tesseract-ocr \
|
||||
tesseract-ocr-eng \
|
||||
xfslibs-dev \
|
||||
xorriso \
|
||||
zlib1g-dev \
|
||||
zstd && \
|
||||
|
@ -140,10 +138,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
|
||||
|
||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# THIS FILE WAS AUTO-GENERATED
|
||||
#
|
||||
# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-38 qemu
|
||||
# $ lcitool dockerfile --layers all --cross-arch mingw64 fedora-38 qemu,qemu-win-installer
|
||||
#
|
||||
# https://gitlab.com/libvirt/libvirt-ci
|
||||
|
||||
|
|
|
@ -41,7 +41,6 @@ exec "$@"\n' > /usr/bin/nosync && \
|
|||
flex \
|
||||
fuse3-devel \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
gcovr \
|
||||
gettext \
|
||||
git \
|
||||
|
@ -130,7 +129,6 @@ exec "$@"\n' > /usr/bin/nosync && \
|
|||
vte291-devel \
|
||||
which \
|
||||
xen-devel \
|
||||
xfsprogs-devel \
|
||||
xorriso \
|
||||
zlib-devel \
|
||||
zlib-static \
|
||||
|
@ -140,10 +138,8 @@ exec "$@"\n' > /usr/bin/nosync && \
|
|||
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||
rpm -qa | sort > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
|
||||
|
||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||
|
|
|
@ -26,7 +26,6 @@ RUN zypper update -y && \
|
|||
flex \
|
||||
fuse3-devel \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
gcovr \
|
||||
gettext-runtime \
|
||||
git \
|
||||
|
@ -113,7 +112,6 @@ RUN zypper update -y && \
|
|||
vte-devel \
|
||||
which \
|
||||
xen-devel \
|
||||
xfsprogs-devel \
|
||||
xorriso \
|
||||
zlib-devel \
|
||||
zlib-devel-static \
|
||||
|
@ -122,10 +120,8 @@ RUN zypper update -y && \
|
|||
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||
rpm -qa | sort > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
|
||||
|
||||
RUN /usr/bin/pip3.11 install \
|
||||
|
|
|
@ -25,7 +25,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
exuberant-ctags \
|
||||
findutils \
|
||||
flex \
|
||||
g++ \
|
||||
gcc \
|
||||
gcovr \
|
||||
gettext \
|
||||
|
@ -129,7 +128,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
tar \
|
||||
tesseract-ocr \
|
||||
tesseract-ocr-eng \
|
||||
xfslibs-dev \
|
||||
xorriso \
|
||||
zlib1g-dev \
|
||||
zstd && \
|
||||
|
@ -140,10 +138,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
|||
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
|
||||
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
|
||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
|
||||
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
|
||||
|
||||
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
|
||||
|
|
Loading…
Reference in New Issue