qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Ani Sinha <anisinha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>,
	mst@redhat.com, berrange@redhat.com, alex.bennee@linaro.org,
	philmd@linaro.org, wainersm@redhat.com, bleal@redhat.com,
	thuth@redhat.com
Subject: [PATCH v2 0/2] tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies
Date: Thu,  4 May 2023 21:16:09 +0530	[thread overview]
Message-ID: <20230504154611.85854-1-anisinha@redhat.com> (raw)

mformat and xorriso tools are needed by biosbits avocado tests. This patchset
adds those two tools in the docker container images.
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.

Patch 1 pulls in the latest changes in lcitool in order to add mappings
for these packages in various distros.
Patch 2 updates all Dockerfiles in QEMU repository to add these two
tools. It also removed genisoimage package and updated cdrom-test to not
use genisoimage but xorrisofs.

CC: mst@redhat.com
CC: berrange@redhat.com
CC: alex.bennee@linaro.org
CC: philmd@linaro.org
CC: wainersm@redhat.com
CC: bleal@redhat.com
CC: thuth@redhat.com
TO: qemu-devel@nongnu.org

Changelog:
v2: remove genisoimage package and update Dockerfile. Also update cdrom-test.c
so that it uses xorrisofs and not genisoimage. I have tested patch #2 on both
Fedora 37 and RHEL 9.1. cdrom-test passed on both.

Ani Sinha (2):
  tests: libvirt-ci: Update to commit 'c8971e90ac' to pull in mformat
    and xorriso
  tests/lcitool: Add mtools and xorriso and remove genisoimage as
    dependencies

 .gitlab-ci.d/cirrus/freebsd-13.vars                |  2 +-
 .gitlab-ci.d/cirrus/macos-12.vars                  |  2 +-
 tests/docker/dockerfiles/alpine.docker             |  3 ++-
 tests/docker/dockerfiles/centos8.docker            |  3 ++-
 tests/docker/dockerfiles/debian-amd64-cross.docker |  3 ++-
 tests/docker/dockerfiles/debian-amd64.docker       |  3 ++-
 tests/docker/dockerfiles/debian-arm64-cross.docker |  3 ++-
 tests/docker/dockerfiles/debian-armel-cross.docker |  3 ++-
 tests/docker/dockerfiles/debian-armhf-cross.docker |  3 ++-
 .../dockerfiles/debian-mips64el-cross.docker       |  3 ++-
 .../docker/dockerfiles/debian-mipsel-cross.docker  |  3 ++-
 .../docker/dockerfiles/debian-ppc64el-cross.docker |  3 ++-
 tests/docker/dockerfiles/debian-s390x-cross.docker |  3 ++-
 tests/docker/dockerfiles/fedora-win32-cross.docker |  3 ++-
 tests/docker/dockerfiles/fedora-win64-cross.docker |  3 ++-
 tests/docker/dockerfiles/fedora.docker             |  3 ++-
 tests/docker/dockerfiles/opensuse-leap.docker      |  3 ++-
 tests/docker/dockerfiles/ubuntu2004.docker         |  3 ++-
 tests/docker/dockerfiles/ubuntu2204.docker         |  3 ++-
 tests/lcitool/libvirt-ci                           |  2 +-
 tests/lcitool/projects/qemu.yml                    |  3 ++-
 tests/qtest/cdrom-test.c                           | 14 +++++++-------
 22 files changed, 46 insertions(+), 28 deletions(-)

-- 
2.31.1



             reply	other threads:[~2023-05-04 17:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-04 15:46 Ani Sinha [this message]
2023-05-04 15:46 ` [PATCH v2 1/2] tests: libvirt-ci: Update to commit 'c8971e90ac' to pull in mformat and xorriso Ani Sinha
2023-05-04 17:17   ` Thomas Huth
2023-05-04 15:46 ` [PATCH v2 2/2] tests/lcitool: Add mtools and xorriso and remove genisoimage as dependencies Ani Sinha
2023-05-04 17:23   ` Thomas Huth
2023-05-04 16:27 ` [PATCH v2 0/2] " Ani Sinha
2023-05-09 16:16 ` Michael S. Tsirkin
2023-05-10  6:39   ` Thomas Huth
2023-05-10  6:41     ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230504154611.85854-1-anisinha@redhat.com \
    --to=anisinha@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=berrange@redhat.com \
    --cc=bleal@redhat.com \
    --cc=mst@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).