From 1585591650fc265fffca1a1a337527cc91a3cb64 Mon Sep 17 00:00:00 2001 From: Lyude Paul Date: Thu, 11 Apr 2019 20:20:43 -0400 Subject: Use pkgconfig() macros with dnf in Fedora Dockerfile 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. Acked-by: Daniel Vetter Reviewed-by: Petri Latvala Signed-off-by: Lyude Paul --- Dockerfile.fedora | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) (limited to 'Dockerfile.fedora') diff --git a/Dockerfile.fedora b/Dockerfile.fedora index 0795de0e..38c3efee 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 -- cgit v1.2.3