da9000784c
Bios bits avocado tests need mformat (provided by the mtools package) and xorriso tools in order to run within gitlab CI containers. Add those dependencies within the Dockerfiles so that containers can be built with those tools present and bios bits avocado tests can be run there. xorriso package conflicts with genisoimage package on some distributions. Therefore, it is not possible to have both the packages at the same time in the container image uniformly for all distribution flavors. Further, on some distributions like RHEL, both xorriso and genisoimage packages provide /usr/bin/genisoimage and on some other distributions like Fedora, only genisoimage package provides the same utility. Therefore, this change removes the dependency on geninsoimage for building container images altogether keeping only xorriso package. At the same time, cdrom-test.c is updated to use and check for existence of only xorrisofs. Signed-off-by: Ani Sinha <anisinha@redhat.com> Message-Id: <20230504154611.85854-3-anisinha@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
17 lines
800 B
Plaintext
17 lines
800 B
Plaintext
# THIS FILE WAS AUTO-GENERATED
|
|
#
|
|
# $ lcitool variables macos-12 qemu
|
|
#
|
|
# https://gitlab.com/libvirt/libvirt-ci
|
|
|
|
CCACHE='/opt/homebrew/bin/ccache'
|
|
CPAN_PKGS=''
|
|
CROSS_PKGS=''
|
|
MAKE='/opt/homebrew/bin/gmake'
|
|
NINJA='/opt/homebrew/bin/ninja'
|
|
PACKAGING_COMMAND='brew'
|
|
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 mtools ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract usbredir vde vte3 xorriso zlib zstd'
|
|
PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme'
|
|
PYTHON='/opt/homebrew/bin/python3'
|