On Jul 12, 2022, at 4:39 AM, Daniel P. Berrangé <berra...@redhat.com<mailto:berra...@redhat.com>> wrote:
On Wed, Jun 15, 2022 at 04:51:17PM +0100, Stefan Hajnoczi wrote: From: Jagannathan Raman <jag.ra...@oracle.com<mailto:jag.ra...@oracle.com>> add the libvfio-user library as a submodule. build it as a meson subproject. libvfio-user is distributed with BSD 3-Clause license and json-c with MIT (Expat) license Signed-off-by: Elena Ufimtseva <elena.ufimts...@oracle.com<mailto:elena.ufimts...@oracle.com>> Signed-off-by: John G Johnson <john.g.john...@oracle.com<mailto:john.g.john...@oracle.com>> Signed-off-by: Jagannathan Raman <jag.ra...@oracle.com<mailto:jag.ra...@oracle.com>> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com<mailto:stefa...@redhat.com>> Message-id: c2adec87958b081d1dc8775d4aa05c897912f025.1655151679.git.jag.ra...@oracle.com<mailto:c2adec87958b081d1dc8775d4aa05c897912f025.1655151679.git.jag.ra...@oracle.com> [Changed submodule URL to QEMU's libvfio-user mirror on GitLab. The QEMU project mirrors its dependencies so that it can provide full source code even in the event that its dependencies become unavailable. Note that the mirror repo is manually updated, so please contact me to make newer libvfio-user commits available. If I become a bottleneck we can set up a cronjob. Updated scripts/meson-buildoptions.sh to match the meson_options.txt change. Failure to do so can result in scripts/meson-buildoptions.sh being modified by the build system later on and you end up with a dirty working tree. --Stefan] snip diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 4b20925bbf..10618bfa83 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -51,6 +51,7 @@ RUN dnf update -y && \ libbpf-devel \ libcacard-devel \ libcap-ng-devel \ + libcmocka-devel \ libcurl-devel \ libdrm-devel \ libepoxy-devel \ @@ -59,6 +60,7 @@ RUN dnf update -y && \ libgcrypt-devel \ libiscsi-devel \ libjpeg-devel \ + json-c-devel \ libnfs-devel \ libpmem-devel \ libpng-devel \ Per the big warning message at the top of this file, this package listing is entirely auto-generated so should not be hand editted like this. Its content is all driven by mappings in the tests/lcitool/libvirt-ci submodule, which is what should have been updated. It would have then ensured these new packages were added to all the dockerfiles, and that the changes are not losted when the dockerfile is re-generated. Thanks for pointing this out, Daniel! Will update the libvirt-ci project with this, and update QEMU once that change is pulled into libvirt-ci. Thank you! -- Jag With regards, Daniel -- |: https://berrange.com<https://berrange.com/> -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org<https://libvirt.org/> -o- https://fstop138.berrange.com<https://fstop138.berrange.com/> :| |: https://entangle-photo.org<https://entangle-photo.org/> -o- https://www.instagram.com/dberrange :|
