[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] tests: Add sndio to the FreeBSD CI containers / VM
From: |
Daniel P . Berrangé |
Subject: |
Re: [PATCH] tests: Add sndio to the FreeBSD CI containers / VM |
Date: |
Thu, 29 Sep 2022 09:14:01 +0100 |
User-agent: |
Mutt/2.2.7 (2022-08-07) |
On Thu, Sep 29, 2022 at 01:07:34AM -0400, Brad Smith wrote:
> tests: Add sndio to the FreeBSD CI containers / VM
>
> Signed-off-by: Brad Smith <brad@comstyle.com>
> ---
> .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +-
> .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +-
> tests/vm/freebsd | 3 +++
> 3 files changed, 5 insertions(+), 2 deletions(-)
I already mentioned offlist, but for the benefit of others following along,
I'll point out that (in common with most of our dockerfiles) the '.vars'
files are auto-generated by lcitool so should not be hand-editted. There
are docs on how to add new build pre-requisites in docs/devel/testing.rst,
under the heading "Adding new build pre-requisites". If anyone has questions
or needs assistance with lcitool I'm here to help.
>
> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars
> b/.gitlab-ci.d/cirrus/freebsd-12.vars
> index 1a5959810f..4a2b41a46c 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
> cmocka ctags curl cyrus-sasl dbus diffutils dtc 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 ncurses nettle ninja
> opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx
> py39-sphinx_rtd_theme py39-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
> cmocka ctags curl cyrus-sasl dbus diffutils dtc 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 ncurses nettle ninja
> opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx
> py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio
> spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
> PYPI_PKGS=''
> PYTHON='/usr/local/bin/python3'
> diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars
> b/.gitlab-ci.d/cirrus/freebsd-13.vars
> index 5e5aafd7e5..dc306aa858 100644
> --- a/.gitlab-ci.d/cirrus/freebsd-13.vars
> +++ b/.gitlab-ci.d/cirrus/freebsd-13.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
> cmocka ctags curl cyrus-sasl dbus diffutils dtc 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 ncurses nettle ninja
> opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx
> py39-sphinx_rtd_theme py39-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
> cmocka ctags curl cyrus-sasl dbus diffutils dtc 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 ncurses nettle ninja
> opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx
> py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio
> spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd'
> PYPI_PKGS=''
> PYTHON='/usr/local/bin/python3'
> diff --git a/tests/vm/freebsd b/tests/vm/freebsd
> index 3643fe325d..d6ff4461ba 100755
> --- a/tests/vm/freebsd
> +++ b/tests/vm/freebsd
> @@ -66,6 +66,9 @@ class FreeBSDVM(basevm.BaseVM):
>
> # libs: networking
> "libslirp",
> +
> + # libs: sndio
> + "sndio",
> ]
>
> BUILD_SCRIPT = """
These tests/vm files *do* however need hand editting, as we have not yet
converted them to use lcitool auto-generated package lists.
The actual addition of 'sndio' is of course fine, once we get the lcitool
integration wired in.
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 :|