summaryrefslogtreecommitdiff
path: root/Dockerfile.fedora
diff options
context:
space:
mode:
authorLyude Paul <lyude@redhat.com>2019-04-11 20:20:43 -0400
committerLyude Paul <lyude@redhat.com>2019-05-07 17:38:06 -0400
commit1585591650fc265fffca1a1a337527cc91a3cb64 (patch)
tree0b0d688fe2d196d19ff2031397275dcc32b65f4d /Dockerfile.fedora
parent1477a72f515c07b6ae1718a2ef9e16d4e4df28e8 (diff)
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 <daniel.vetter@ffwll.ch> Reviewed-by: Petri Latvala <petri.latvala@intel.com> Signed-off-by: Lyude Paul <lyude@redhat.com>
Diffstat (limited to 'Dockerfile.fedora')
-rw-r--r--Dockerfile.fedora48
1 files changed, 23 insertions, 25 deletions
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