On Wed, May 10, 2023 at 08:39:54AM +0200, Thomas Huth wrote: > On 09/05/2023 18.16, Michael S. Tsirkin wrote: > > On Thu, May 04, 2023 at 09:16:09PM +0530, Ani Sinha wrote: > > > 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: m...@redhat.com > > > CC: berra...@redhat.com > > > CC: alex.ben...@linaro.org > > > CC: phi...@linaro.org > > > CC: waine...@redhat.com > > > CC: bl...@redhat.com > > > CC: th...@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. > > > > > > Reviewed-by: Michael S. Tsirkin <m...@redhat.com> > > > > who's merging this? > > I guess it's either you, Alex or me ... I'll put it into my queue, but if > you plan a pull request soon, feel free to take it first. > > Thomas
yes there's a pull by end of week. sure I'll take this. -- MST
