On 1/21/22 15:34, Daniel P. Berrangé wrote: > On Fri, Jan 21, 2022 at 07:30:55AM -0700, Warner Losh wrote: >> On Fri, Jan 21, 2022 at 4:47 AM Daniel P. Berrangé <berra...@redhat.com> >> wrote: >> >>> On Fri, Jan 21, 2022 at 12:40:48PM +0100, Thomas Huth wrote: >>>> On 21/01/2022 11.36, Philippe Mathieu-Daudé wrote: >>>>> Refresh lcitool submodule and the generated files by running: >>>>> >>>>> $ make lcitool-refresh >>>>> >>>>> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> >>>>> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> >>>>> --- >>>>> .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- >>>>> .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- >>>>> tests/docker/dockerfiles/alpine.docker | 3 ++- >>>>> tests/docker/dockerfiles/centos8.docker | 3 +-- >>>>> tests/docker/dockerfiles/fedora.docker | 3 +-- >>>>> tests/docker/dockerfiles/opensuse-leap.docker | 2 +- >>>>> tests/docker/dockerfiles/ubuntu1804.docker | 2 +- >>>>> tests/docker/dockerfiles/ubuntu2004.docker | 2 +- >>>>> tests/lcitool/libvirt-ci | 2 +- >>>>> 9 files changed, 10 insertions(+), 11 deletions(-) >>>>> >>>>> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars >>> b/.gitlab-ci.d/cirrus/freebsd-12.vars >>>>> index 9c52266811f..bdcce578edf 100644 >>>>> --- a/.gitlab-ci.d/cirrus/freebsd-12.vars >>>>> +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars >>>>> @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' >>>>> NINJA='/usr/local/bin/ninja' >>>>> PACKAGING_COMMAND='pkg' >>>>> PIP3='/usr/local/bin/pip-3.8' >>>>> -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache >>> cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc gettext git >>> glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs >>> libspice-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses >>> nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy >>> py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv >>> py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract >>> texinfo usbredir virglrenderer vte3 zstd' >>>>> +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache >>> cdrkit-genisoimage ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 >>> gettext git glib gmake gnutls gsed gtk3 libepoxy libffi libgcrypt >>> libjpeg-turbo libnfs libspice-server libssh libtasn1 libxml2 llvm lttng-ust >>> lzo2 meson ncurses nettle ninja opencv p5-Test-Harness perl5 pixman pkgconf >>> png py38-numpy py38-pillow py38-pip py38-sphinx py38-sphinx_rtd_theme >>> py38-virtualenv py38-yaml python3 rpm2cpio sdl2 sdl2_image snappy >>> spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' >>>> >>>> Aren't the FreeBSD jobs currently failing due to lttng-ust not being >>>> available anymore? ... I'd somehow expected that this update might fix >>> this, >>>> too, but I still see lttng-ust in the list here? >>> >>> I had prepped an update to drop it, but @bsdimp indicated that it ought >>> to be a transient problem so I never applied it, hoping it would fix >>> itself. >>> >>> https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/211 >>> >>> It has been broken for ~2 weeks now though, and lttng-ust is not an >>> especially critical feature so we should probably just go ahead and >>> disable it regardless. >>> >> >> I agree. I got some back and forth from the FreeBSD community about whether >> or not >> it was coming back. I think we should drop the package until that back and >> forth results >> in it being available again. > > The above change to remove lttng-ust is merged in libvirt-ci.git, so > a sub-module update && make lcitool-refresh in QEMU will pull it in.
Is that an implicit way to ask me to refresh and respin this series again? I already posted a v5... It looks like a never ending story with the submodule being updated and reducing patches churn. I'll post a v6 but if v7 is required I'll ask someone else to keep refreshing QEMU side. Thanks.