> On 04-May-2023, at 3:43 PM, Thomas Huth <th...@redhat.com> wrote:
>
> On 04/05/2023 11.35, Daniel P. Berrangé wrote:
>> On Thu, May 04, 2023 at 02:19:21PM +0530, Ani Sinha wrote:
>>>
>>>
>>>> On 04-May-2023, at 1:32 PM, Daniel P. Berrangé <berra...@redhat.com> wrote:
>>>>
>>>> On Thu, May 04, 2023 at 08:35:53AM +0200, Thomas Huth wrote:
>>>>> On 03/05/2023 16.55, Ani Sinha wrote:
>>>>>> mformat and xorriso tools are needed by biosbits avocado tests. This
>>>>>> patchset
>>>>>> adds those two tools in the docker container images.
>>>>>
>>>>> tests/qtest/cdrom-test.c already uses genisoimage to create ISO images,
>>>>> and
>>>>> the containers already have that tool installed. Could you maybe switch
>>>>> the
>>>>> biosbits test to use that tool? Or the other way round? ... at least
>>>>> having
>>>>> two tools to create ISO images in our containers sounds IMHO excessive.
>>>>
>>>> It looks like this series wasn't tested, because it doesn't even install
>>>> the alpine image:
>>>>
>>>> ERROR: unable to select packages:
>>>> cdrkit-1.1.11-r3:
>>>> conflicts: xorriso-1.5.4-r2[cmd:mkisofs=1.1.11-r3]
>>>> satisfies: world[cdrkit]
>>>> xorriso-1.5.4-r2:
>>>> conflicts: cdrkit-1.1.11-r3[cmd:mkisofs=1.5.4-r2]
>>>> satisfies: world[xorriso]
>>>>
>>>>
>>>> We definitely need to have either biosbits or cdrom-test.c changed to
>>>> use the same tool.
>>>
>>> Wait, it seems xorriso package also provides geninsoimage?
>>>
>>> xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
>>> Repo : @System
>>> Matched from:
>>> Filename : /usr/bin/genisoimage
>>>
>>> xorriso-1.5.4-4.el9.x86_64 : ISO-9660 and Rock Ridge image manipulation tool
>>> Repo : rhel-9-for-x86_64-appstream-rpms
>>> Matched from:
>>> Filename : /usr/bin/genisoimage
>>>
>>> $ rpm -ql xorriso-1.5.4-4.el9.x86_64 | grep bin
>>> /usr/bin/cdrecord
>>> /usr/bin/genisoimage
>>> /usr/bin/mkisofs
>>> /usr/bin/osirrox
>>> /usr/bin/wodim
>>> /usr/bin/xorrecord
>>> /usr/bin/xorriso
>>> /usr/bin/xorriso-dd-target
>>> /usr/bin/xorrisofs
>> That is not the case in Fedora. xorriso does not provide any
>> genisoimage binary, that's provided by a 'genisoimage' RPM
>> which was created from cdrkit src RPM.
>> Alpine likewise has no 'genisoimage' binary provided by
>> xorriso.
>> For even more fun, xorriso is now a sub-RPM of the libisoburn
>> source RPM
>> If we could make cdrom-test use 'mkisofs' binary then we could
>> likely use the xorriso package on all platforms IIUC.
>
> I assume it shoul be pretty easy to replace it in crom-test.c ... genisofs is
> a successor of the old mkisofs, so the commandd line parameter should be very
> similar or even the same.
In my RHEL 9 box, funny that cdrom-test is actually using xorriso even today
since genisoimage is eventually a symlink to xorriso and it works just fine :
$ QTEST_QEMU_BINARY=./qemu-system-x86_64 ./tests/qtest/cdrom-test
# random seed: R02S8027650089f37c7be48a579c1b3bdeaa
xorriso 1.5.4 : RockRidge filesystem manipulator, libburnia project.
xorriso 1.5.4
ISO 9660 Rock Ridge filesystem manipulator and CD/DVD/BD burn program
Copyright (C) 2019, Thomas Schmitt <scdbac...@gmx.net>, libburnia project.
xorriso version : 1.5.4
Version timestamp : 2021.01.30.150001
Build timestamp : -none-given-
libisofs in use : 1.5.4 (min. 1.5.4)
libburn in use : 1.5.4 (min. 1.5.4)
libburn OS adapter: internal GNU/Linux SG_IO adapter sg-linux
libisoburn in use : 1.5.4 (min. 1.5.4)
Provided under GNU GPL version 3 or later, due to libreadline license.
There is NO WARRANTY, to the extent permitted by law.
xorriso 1.5.4 : RockRidge filesystem manipulator, libburnia project.
> Ani, could you add a patch to your series to replace it there?
Just sent the updated patch. Yes replacing genisoimage with xorrisfs is good
enough. Exact same arguments work just fine.
