Re: [PATCH] tests/vm/freebsd: Install more feature libraries in the FreeBSD VM

[Thomas Huth]

On 31/05/2023 11.52, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 31/5/23 11:04, Thomas Huth wrote:
> > The standalone freebsd VM image misses a lot of libraries compared
> > to the image that we use in the Gitlab-CI (see the file
> > .gitlab-ci.d/cirrus/freebsd-13.vars). Let's extend the list here
> > and while we're at it, re-arrange the list in alphabetical order
> > without the cumbersome grouping into categories.
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> >   tests/vm/freebsd | 76 +++++++++++++++++++++++++++++-------------------
> >   1 file changed, 46 insertions(+), 30 deletions(-)
> >
> > diff --git a/tests/vm/freebsd b/tests/vm/freebsd
> > index 11de6473f4..8143637905 100755
> > --- a/tests/vm/freebsd
> > +++ b/tests/vm/freebsd
> > @@ -32,43 +32,59 @@ class FreeBSDVM(basevm.BaseVM):
> >       csum = 
> > "a4fb3b6c7b75dd4d58fb0d75e4caf72844bffe0ca00e66459c028b198ffb3c0e"
> >       size = "20G"
> >       pkgs = [
> > -        # build tools
> > -        "git",
> > -        "pkgconf",
> > -        "bzip2",
> > -        "python39",
> > -        "ninja",
> > -
> > -        # gnu tools
> > +        "alsa-lib",
> >           "bash",
> > -        "gmake",
> > -        "gsed",
> > +        "bison",
> > +        "bzip2",
> > +        "capstone4",
> > +        "curl",
> > +        "cyrus-sasl",
> > +        "dbus",
> > +        "diffutils",
> > +        "dtc",
> > +        "flex",
> > +        "fusefs-libs3",
> >           "gettext",
> > -
> > -        # libs: crypto
> > +        "git",
> > +        "glib",
> > +        "gmake",
> >           "gnutls",
> > -
> > -        # libs: images
> > -        "jpeg-turbo",
> > -        "png",
> > -
> > -        # libs: ui
> > -        "sdl2",
> > +        "gsed",
> >           "gtk3",
> > -        "libxkbcommon",
> > -
> > -        # libs: opengl
> >           "libepoxy",
> > -        "mesa-libs",
> > -
> > -        # libs: migration
> > -        "zstd",
> > -
> > -        # libs: networking
> > +        "libffi",
> > +        "libgcrypt",
> > +        "libjpeg-turbo",
> > +        "libnfs",
> >           "libslirp",
> > -
> > -        # libs: sndio
> > +        "libspice-server",
> > +        "libssh",
> > +        "libtasn1",
> > +        "libxkbcommon",
> > +        "lzo2",
> > +        "mesa-libs",
> > +        "meson",
> > +        "ncurses",
> > +        "nettle",
> > +        "ninja",
> > +        "pixman",
> > +        "pkgconf",
> > +        "png",
> > +        "py39-pip",
> > +        "py39-sphinx",
> > +        "py39-sphinx_rtd_theme",
> > +        "py39-yaml",
> > +        "python3",
> > +        "sdl2",
> > +        "sdl2_image",
> > +        "snappy",
> >           "sndio",
> > +        "spice-protocol",
> > +        "usbredir",
> > +        "virglrenderer",
> > +        "vte3",
> > +        "xorriso",
> > +        "zstd",
> >       ]
>
> What about directly filling pkgs[] from 
> .gitlab-ci.d/cirrus/freebsd-13.vars's PKGS line? Quick & dirty example:
>
>  >>> list(filter(lambda y: y.startswith('PKGS'), 
> open('.gitlab-ci.d/cirrus/freebsd-13.vars', 
> 'r').readlines()))[0].split("'")[1].split()
> ['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']

Sure, that's a good idea, too! Could you please send this as a proper patch?

 Thomas