lcitool: drop texinfo from QEMU project/dependencies

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230110132700.833690-9-marcandre.lureau@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230124180127.1881110-13-alex.bennee@linaro.org>
This commit is contained in:
Marc-André Lureau 2023-01-24 18:01:04 +00:00 committed by Alex Bennée
parent 7a6e869cb5
commit df07c72a74
21 changed files with 11 additions and 29 deletions

View File

@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja' NINJA='/usr/local/bin/ninja'
PACKAGING_COMMAND='pkg' PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8' PIP3='/usr/local/bin/pip-3.8'
PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd'
PYPI_PKGS='' PYPI_PKGS=''
PYTHON='/usr/local/bin/python3' PYTHON='/usr/local/bin/python3'

View File

@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
NINJA='/usr/local/bin/ninja' NINJA='/usr/local/bin/ninja'
PACKAGING_COMMAND='pkg' PACKAGING_COMMAND='pkg'
PIP3='/usr/local/bin/pip-3.8' PIP3='/usr/local/bin/pip-3.8'
PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd'
PYPI_PKGS='' PYPI_PKGS=''
PYTHON='/usr/local/bin/python3' PYTHON='/usr/local/bin/python3'

View File

@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
NINJA='/opt/homebrew/bin/ninja' NINJA='/opt/homebrew/bin/ninja'
PACKAGING_COMMAND='brew' PACKAGING_COMMAND='brew'
PIP3='/opt/homebrew/bin/pip3' PIP3='/opt/homebrew/bin/pip3'
PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredir vde vte3 zlib zstd' PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract usbredir vde vte3 zlib zstd'
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme'
PYTHON='/opt/homebrew/bin/python3' PYTHON='/opt/homebrew/bin/python3'

View File

@ -99,7 +99,6 @@ RUN apk update && \
spice-protocol \ spice-protocol \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
texinfo \
usbredir-dev \ usbredir-dev \
util-linux \ util-linux \
vde2-dev \ vde2-dev \

View File

@ -110,7 +110,6 @@ RUN dnf distro-sync -y && \
systemd-devel \ systemd-devel \
systemtap-sdt-devel \ systemtap-sdt-devel \
tar \ tar \
texinfo \
usbredir-devel \ usbredir-devel \
util-linux \ util-linux \
virglrenderer-devel \ virglrenderer-devel \

View File

@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \ sparse \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng && \
texinfo && \
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 && \

View File

@ -125,7 +125,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
texinfo \
xfslibs-dev \ xfslibs-dev \
zlib1g-dev && \ zlib1g-dev && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \

View File

@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \ sparse \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng && \
texinfo && \
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 && \

View File

@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \ sparse \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng && \
texinfo && \
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 && \

View File

@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \ sparse \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng && \
texinfo && \
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 && \

View File

@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \ sparse \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng && \
texinfo && \
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 && \

View File

@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \ sparse \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng && \
texinfo && \
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 && \

View File

@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \ sparse \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng && \
texinfo && \
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 && \

View File

@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
sparse \ sparse \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng && \
texinfo && \
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 && \

View File

@ -21,7 +21,6 @@ RUN apt update && \
libmpc-dev \ libmpc-dev \
libmpfr-dev \ libmpfr-dev \
rsync \ rsync \
texinfo \
wget && \ wget && \
DEBIAN_FRONTEND=noninteractive eatmydata \ DEBIAN_FRONTEND=noninteractive eatmydata \
apt build-dep -yy --arch-only gcc glibc apt build-dep -yy --arch-only gcc glibc

View File

@ -57,7 +57,6 @@ exec "$@"' > /usr/bin/nosync && \
tar \ tar \
tesseract \ tesseract \
tesseract-langpack-eng \ tesseract-langpack-eng \
texinfo \
util-linux \ util-linux \
which && \ which && \
nosync dnf autoremove -y && \ nosync dnf autoremove -y && \

View File

@ -57,7 +57,6 @@ exec "$@"' > /usr/bin/nosync && \
tar \ tar \
tesseract \ tesseract \
tesseract-langpack-eng \ tesseract-langpack-eng \
texinfo \
util-linux \ util-linux \
which && \ which && \
nosync dnf autoremove -y && \ nosync dnf autoremove -y && \

View File

@ -121,7 +121,6 @@ exec "$@"' > /usr/bin/nosync && \
tar \ tar \
tesseract \ tesseract \
tesseract-langpack-eng \ tesseract-langpack-eng \
texinfo \
usbredir-devel \ usbredir-devel \
util-linux \ util-linux \
virglrenderer-devel \ virglrenderer-devel \

View File

@ -111,7 +111,6 @@ RUN zypper update -y && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-traineddata-english \ tesseract-ocr-traineddata-english \
texinfo \
usbredir-devel \ usbredir-devel \
util-linux \ util-linux \
virglrenderer-devel \ virglrenderer-devel \

View File

@ -124,7 +124,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
tar \ tar \
tesseract-ocr \ tesseract-ocr \
tesseract-ocr-eng \ tesseract-ocr-eng \
texinfo \
xfslibs-dev \ xfslibs-dev \
zlib1g-dev && \ zlib1g-dev && \
eatmydata apt-get autoremove -y && \ eatmydata apt-get autoremove -y && \

View File

@ -109,7 +109,6 @@ packages:
- tar - tar
- tesseract - tesseract
- tesseract-eng - tesseract-eng
- texinfo
- usbredir - usbredir
- virglrenderer - virglrenderer
- vte - vte