From: Lyude Paul <lyude@redhat.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: igt-dev@lists.freedesktop.org
Subject: Re: [igt-dev] [PATCH i-g-t v2 6/8] Use pkgconfig() macros with dnf in Fedora Dockerfile
Date: Wed, 17 Apr 2019 15:15:41 -0400 [thread overview]
Message-ID: <0cf5e806db82e4d8073f34ab9d34e0b07da835bf.camel@redhat.com> (raw)
In-Reply-To: <20190417114533.GT13337@phenom.ffwll.local>
On Wed, 2019-04-17 at 13:45 +0200, Daniel Vetter wrote:
> On Tue, Apr 16, 2019 at 07:25:46PM -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>
>
> I believe the expert on this, blindly.
>
> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> btw did you push this to your personal gitlab clone to make sure it's all
> still working?
yep-everything seemed to work fine on mine
> -Daniel
>
> > ---
> > 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
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-04-17 19:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-16 23:25 [igt-dev] [PATCH i-g-t v2 0/8] Fixes from updating igt packaging in Lyude
2019-04-16 23:25 ` [igt-dev] [PATCH i-g-t v2 1/8] lib/tests: Fix test failures with meson 0.50.0 Lyude
2019-04-17 11:35 ` Daniel Vetter
2019-04-16 23:25 ` [igt-dev] [PATCH i-g-t v2 2/8] meson: Don't redefine gettid if the C library provides it Lyude
2019-04-17 11:36 ` Daniel Vetter
2019-04-16 23:25 ` [igt-dev] [PATCH i-g-t v2 3/8] lib: Stop using assert() for runtime checks Lyude
2019-04-17 11:40 ` Daniel Vetter
2019-04-16 23:25 ` [igt-dev] [PATCH i-g-t v2 4/8] meson: Add .so versioning Lyude
2019-04-17 9:16 ` Petri Latvala
2019-04-17 11:43 ` Daniel Vetter
2019-04-16 23:25 ` [igt-dev] [PATCH i-g-t v2 5/8] lib/igt_core: Just use igt_can_fail() in __igt_run_subtest() Lyude
2019-04-17 11:44 ` Daniel Vetter
2019-04-16 23:25 ` [igt-dev] [PATCH i-g-t v2 6/8] Use pkgconfig() macros with dnf in Fedora Dockerfile Lyude
2019-04-17 11:45 ` Daniel Vetter
2019-04-17 19:15 ` Lyude Paul [this message]
2019-04-16 23:25 ` [igt-dev] [PATCH i-g-t v2 7/8] Update Dockerfile.fedora to Fedora 29 Lyude
2019-04-17 11:45 ` Daniel Vetter
2019-04-16 23:25 ` [igt-dev] [PATCH i-g-t v2 8/8] Gitlab CI: Do builds with -Db_ndebug=true Lyude
2019-04-17 11:47 ` Daniel Vetter
2019-04-17 0:16 ` [igt-dev] ✓ Fi.CI.BAT: success for Fixes from updating igt packaging in Patchwork
2019-04-17 9:25 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0cf5e806db82e4d8073f34ab9d34e0b07da835bf.camel@redhat.com \
--to=lyude@redhat.com \
--cc=daniel@ffwll.ch \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox