mirror of https://github.com/xemu-project/xemu.git
tests/docker: add zstdtools to the images
We need this to be able to run the tuxrun_baseline tests in CI which in turn helps us reduce overhead running other tests. We need to update libvirt-ci and refresh the generated files by running 'make lcitool-refresh' to get the new mapping. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20230228190653.1602033-24-alex.bennee@linaro.org>
This commit is contained in:
parent
88b19e4e1a
commit
bbe307639d
|
@ -110,6 +110,7 @@ RUN apk update && \
|
||||||
xfsprogs-dev \
|
xfsprogs-dev \
|
||||||
zlib-dev \
|
zlib-dev \
|
||||||
zlib-static \
|
zlib-static \
|
||||||
|
zstd \
|
||||||
zstd-dev && \
|
zstd-dev && \
|
||||||
apk list | sort > /packages.txt && \
|
apk list | sort > /packages.txt && \
|
||||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||||
|
|
|
@ -116,7 +116,8 @@ RUN dnf distro-sync -y && \
|
||||||
which \
|
which \
|
||||||
xfsprogs-devel \
|
xfsprogs-devel \
|
||||||
zlib-devel \
|
zlib-devel \
|
||||||
zlib-static && \
|
zlib-static \
|
||||||
|
zstd && \
|
||||||
dnf autoremove -y && \
|
dnf autoremove -y && \
|
||||||
dnf clean all -y && \
|
dnf clean all -y && \
|
||||||
rpm -qa | sort > /packages.txt && \
|
rpm -qa | sort > /packages.txt && \
|
||||||
|
|
|
@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
sparse \
|
sparse \
|
||||||
tar \
|
tar \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng && \
|
tesseract-ocr-eng \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -127,7 +127,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng \
|
tesseract-ocr-eng \
|
||||||
xfslibs-dev \
|
xfslibs-dev \
|
||||||
zlib1g-dev && \
|
zlib1g-dev \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
sparse \
|
sparse \
|
||||||
tar \
|
tar \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng && \
|
tesseract-ocr-eng \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
sparse \
|
sparse \
|
||||||
tar \
|
tar \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng && \
|
tesseract-ocr-eng \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
sparse \
|
sparse \
|
||||||
tar \
|
tar \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng && \
|
tesseract-ocr-eng \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
sparse \
|
sparse \
|
||||||
tar \
|
tar \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng && \
|
tesseract-ocr-eng \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
sparse \
|
sparse \
|
||||||
tar \
|
tar \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng && \
|
tesseract-ocr-eng \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
sparse \
|
sparse \
|
||||||
tar \
|
tar \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng && \
|
tesseract-ocr-eng \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
sparse \
|
sparse \
|
||||||
tar \
|
tar \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng && \
|
tesseract-ocr-eng \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -59,7 +59,8 @@ exec "$@"' > /usr/bin/nosync && \
|
||||||
tesseract \
|
tesseract \
|
||||||
tesseract-langpack-eng \
|
tesseract-langpack-eng \
|
||||||
util-linux \
|
util-linux \
|
||||||
which && \
|
which \
|
||||||
|
zstd && \
|
||||||
nosync dnf autoremove -y && \
|
nosync dnf autoremove -y && \
|
||||||
nosync dnf clean all -y
|
nosync dnf clean all -y
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,8 @@ exec "$@"' > /usr/bin/nosync && \
|
||||||
tesseract \
|
tesseract \
|
||||||
tesseract-langpack-eng \
|
tesseract-langpack-eng \
|
||||||
util-linux \
|
util-linux \
|
||||||
which && \
|
which \
|
||||||
|
zstd && \
|
||||||
nosync dnf autoremove -y && \
|
nosync dnf autoremove -y && \
|
||||||
nosync dnf clean all -y
|
nosync dnf clean all -y
|
||||||
|
|
||||||
|
|
|
@ -130,7 +130,8 @@ exec "$@"' > /usr/bin/nosync && \
|
||||||
xen-devel \
|
xen-devel \
|
||||||
xfsprogs-devel \
|
xfsprogs-devel \
|
||||||
zlib-devel \
|
zlib-devel \
|
||||||
zlib-static && \
|
zlib-static \
|
||||||
|
zstd && \
|
||||||
nosync dnf autoremove -y && \
|
nosync dnf autoremove -y && \
|
||||||
nosync dnf clean all -y && \
|
nosync dnf clean all -y && \
|
||||||
rpm -qa | sort > /packages.txt && \
|
rpm -qa | sort > /packages.txt && \
|
||||||
|
|
|
@ -113,7 +113,8 @@ RUN zypper update -y && \
|
||||||
xen-devel \
|
xen-devel \
|
||||||
xfsprogs-devel \
|
xfsprogs-devel \
|
||||||
zlib-devel \
|
zlib-devel \
|
||||||
zlib-devel-static && \
|
zlib-devel-static \
|
||||||
|
zstd && \
|
||||||
zypper clean --all && \
|
zypper clean --all && \
|
||||||
rpm -qa | sort > /packages.txt && \
|
rpm -qa | sort > /packages.txt && \
|
||||||
mkdir -p /usr/libexec/ccache-wrappers && \
|
mkdir -p /usr/libexec/ccache-wrappers && \
|
||||||
|
|
|
@ -126,7 +126,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng \
|
tesseract-ocr-eng \
|
||||||
xfslibs-dev \
|
xfslibs-dev \
|
||||||
zlib1g-dev && \
|
zlib1g-dev \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -127,7 +127,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
|
||||||
tesseract-ocr \
|
tesseract-ocr \
|
||||||
tesseract-ocr-eng \
|
tesseract-ocr-eng \
|
||||||
xfslibs-dev \
|
xfslibs-dev \
|
||||||
zlib1g-dev && \
|
zlib1g-dev \
|
||||||
|
zstd && \
|
||||||
eatmydata apt-get autoremove -y && \
|
eatmydata apt-get autoremove -y && \
|
||||||
eatmydata apt-get autoclean -y && \
|
eatmydata apt-get autoclean -y && \
|
||||||
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 1c3e16cae38407d0782dc94080d1104106456fa4
|
Subproject commit 232f41f160d4567b8c82dd52aa96c2bc3a5b75c1
|
|
@ -116,5 +116,6 @@ packages:
|
||||||
- which
|
- which
|
||||||
- xen
|
- xen
|
||||||
- xfsprogs
|
- xfsprogs
|
||||||
|
- zstdtools
|
||||||
- zlib
|
- zlib
|
||||||
- zlib-static
|
- zlib-static
|
||||||
|
|
Loading…
Reference in New Issue