Re: [igt-dev] [PATCH i-g-t 5/7] Use pkgconfig() macros with dnf in Fedora Dockerfile

Lyude Paul
2019-04-24T17:19:00Z

On Wed, 2019-04-17 at 12:09 +0300, Petri Latvala wrote:
> On Tue, Apr 16, 2019 at 04:10:59PM -0400, Lyude wrote:
> > From: Lyude Paul <lyude@redhat.com>
> >
> > dnf supports installing packages by their pkgconfig names using the
> > pkgconfig() RPM macro. Since these more closely match the dependencies
> > that meson uses and don't have a chance of changing in the future like
> > Fedora package name do, let's use these with dnf instead.
> >
> > Signed-off-by: Lyude Paul <lyude@redhat.com>
>
> Reviewed-by: Petri Latvala <petri.latvala@intel.com>
>
> Do you have a gitlab fork with this patch where gitlab CI can prove
> there aren't any typos?
>

Yes: https://gitlab.freedesktop.org/lyudess/igt-gpu-tools/commits/wip/fedora-docker-update
>
> > ---
> > Dockerfile.fedora | 48 +++++++++++++++++++++++------------------------
> > 1 file changed, 23 insertions(+), 25 deletions(-)
> >
> > diff --git a/Dockerfile.fedora b/Dockerfile.fedora
> > index 29520f7b..469e74b2 100644
> > --- a/Dockerfile.fedora
> > +++ b/Dockerfile.fedora
> > @@ -1,30 +1,28 @@
> > FROM fedora:28
> >
> > -RUN dnf install -y gcc \
> > - flex \
> > - meson \
> > - bison \
> > - gtk-doc \
> > - xdotool \
> > - gsl-devel \
> > - kmod-devel \
> > - glib2-devel \
> > - cairo-devel \
> > - ninja-build \
> > - procps-devel \
> > - pixman-devel \
> > - json-c-devel \
> > - libdrm-devel \
> > - libudev-devel \
> > - xmlrpc-c-devel \
> > - elfutils-devel \
> > - libunwind-devel \
> > - python-docutils \
> > - libpciaccess-devel \
> > - alsa-lib-devel \
> > - valgrind-devel \
> > - libXrandr-devel \
> > - libXv-devel
> > +RUN dnf install -y \
> > + gcc flex bison meson ninja-build xdotool \
> > + 'pkgconfig(libdrm)' \
> > + 'pkgconfig(pciaccess)' \
> > + 'pkgconfig(libkmod)' \
> > + 'pkgconfig(libprocps)' \
> > + 'pkgconfig(libunwind)' \
> > + 'pkgconfig(libdw)' \
> > + 'pkgconfig(pixman-1)' \
> > + 'pkgconfig(valgrind)' \
> > + 'pkgconfig(cairo)' \
> > + 'pkgconfig(libudev)' \
> > + 'pkgconfig(glib-2.0)' \
> > + 'pkgconfig(gsl)' \
> > + 'pkgconfig(alsa)' \
> > + 'pkgconfig(xmlrpc)' \
> > + 'pkgconfig(xmlrpc_util)' \
> > + 'pkgconfig(xmlrpc_client)' \
> > + 'pkgconfig(json-c)' \
> > + 'pkgconfig(gtk-doc)' \
> > + 'pkgconfig(xv)' \
> > + 'pkgconfig(xrandr)' \
> > + python3-docutils
> >
> > # We need peg to build overlay
> > RUN dnf install -y make
> > --
> > 2.20.1
> >
> > _______________________________________________
> > igt-dev mailing list
> > igt-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/igt-dev
--
Cheers,
Lyude Paul