On Tue, Jul 11, 2023 at 04:49:20PM +0200, Philippe Mathieu-Daudé wrote: > Refresh the generated files by running: > > $ make lcitool-refresh > > Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> > --- > tests/docker/dockerfiles/debian-amd64.docker | 2 - > tests/docker/dockerfiles/ubuntu2004.docker | 2 - > tests/docker/dockerfiles/ubuntu2204.docker | 2 -
I don't know why this would be removing xen/pmem from these files. If I run 'lcitool-refresh' on current git master that doesn't happen Do you have any other local changes on top ? > tests/vm/generated/freebsd.json | 77 ++++++++++++++++++++ > 4 files changed, 77 insertions(+), 6 deletions(-) > create mode 100644 tests/vm/generated/freebsd.json Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> > > diff --git a/tests/docker/dockerfiles/debian-amd64.docker > b/tests/docker/dockerfiles/debian-amd64.docker > index e39871c7bb..8f7521fdc2 100644 > --- a/tests/docker/dockerfiles/debian-amd64.docker > +++ b/tests/docker/dockerfiles/debian-amd64.docker > @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libpam0g-dev \ > libpcre2-dev \ > libpixman-1-dev \ > - libpmem-dev \ > libpng-dev \ > libpulse-dev \ > librbd-dev \ > @@ -96,7 +95,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libvdeplug-dev \ > libvirglrenderer-dev \ > libvte-2.91-dev \ > - libxen-dev \ > libzstd-dev \ > llvm \ > locales \ > diff --git a/tests/docker/dockerfiles/ubuntu2004.docker > b/tests/docker/dockerfiles/ubuntu2004.docker > index 8f864d19e6..7f60143cbb 100644 > --- a/tests/docker/dockerfiles/ubuntu2004.docker > +++ b/tests/docker/dockerfiles/ubuntu2004.docker > @@ -69,7 +69,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libpam0g-dev \ > libpcre2-dev \ > libpixman-1-dev \ > - libpmem-dev \ > libpng-dev \ > libpulse-dev \ > librbd-dev \ > @@ -94,7 +93,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libvdeplug-dev \ > libvirglrenderer-dev \ > libvte-2.91-dev \ > - libxen-dev \ > libzstd-dev \ > llvm \ > locales \ > diff --git a/tests/docker/dockerfiles/ubuntu2204.docker > b/tests/docker/dockerfiles/ubuntu2204.docker > index 1d442cdfe6..5162927016 100644 > --- a/tests/docker/dockerfiles/ubuntu2204.docker > +++ b/tests/docker/dockerfiles/ubuntu2204.docker > @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libpam0g-dev \ > libpcre2-dev \ > libpixman-1-dev \ > - libpmem-dev \ > libpng-dev \ > libpulse-dev \ > librbd-dev \ > @@ -96,7 +95,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ > libvdeplug-dev \ > libvirglrenderer-dev \ > libvte-2.91-dev \ > - libxen-dev \ > libzstd-dev \ > llvm \ > locales \ > diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.json > new file mode 100644 > index 0000000000..7c435cf23e > --- /dev/null > +++ b/tests/vm/generated/freebsd.json > @@ -0,0 +1,77 @@ > +{ > + "ccache": "/usr/local/bin/ccache", > + "cpan_pkgs": [], > + "cross_pkgs": [], > + "make": "/usr/local/bin/gmake", > + "ninja": "/usr/local/bin/ninja", > + "packaging_command": "pkg", > + "pip3": "/usr/local/bin/pip-3.8", > + "pkgs": [ > + "alsa-lib", > + "bash", > + "bison", > + "bzip2", > + "ca_root_nss", > + "capstone4", > + "ccache", > + "cmocka", > + "ctags", > + "curl", > + "cyrus-sasl", > + "dbus", > + "diffutils", > + "dtc", > + "flex", > + "fusefs-libs3", > + "gettext", > + "git", > + "glib", > + "gmake", > + "gnutls", > + "gsed", > + "gtk3", > + "json-c", > + "libepoxy", > + "libffi", > + "libgcrypt", > + "libjpeg-turbo", > + "libnfs", > + "libslirp", > + "libspice-server", > + "libssh", > + "libtasn1", > + "llvm", > + "lzo2", > + "meson", > + "mtools", > + "ncurses", > + "nettle", > + "ninja", > + "opencv", > + "pixman", > + "pkgconf", > + "png", > + "py39-numpy", > + "py39-pillow", > + "py39-pip", > + "py39-sphinx", > + "py39-sphinx_rtd_theme", > + "py39-yaml", > + "python3", > + "rpm2cpio", > + "sdl2", > + "sdl2_image", > + "snappy", > + "sndio", > + "socat", > + "spice-protocol", > + "tesseract", > + "usbredir", > + "virglrenderer", > + "vte3", > + "xorriso", > + "zstd" > + ], > + "pypi_pkgs": [], > + "python": "/usr/local/bin/python3" > +} > -- > 2.38.1 > > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|