From: Juergen Borleis <jbe@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: m.olbrich@pengutronix.de, Markus Niebel <niebelm@tqsc.de>,
Markus Niebel <Markus.Niebel@tq-group.com>
Subject: Re: [ptxdist] [PATCH v3] libdrm: version bump 2.7.74 -> 2.7.75
Date: Thu, 16 Mar 2017 15:19:36 +0100 [thread overview]
Message-ID: <201703161519.37305.jbe@pengutronix.de> (raw)
In-Reply-To: <1489673208-21909-1-git-send-email-niebelm@tqsc.de>
On Thursday 16 March 2017 15:06:48 Markus Niebel wrote:
> From: Markus Niebel <Markus.Niebel@tq-group.com>
>
> - drop not longer needed libudev dependency
> - make udev support optional (udev is not needed to build but
> if compiled with udev support udev is expected to handle device
> nodes)
>
> Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
> ---
> changes since v2:
> - handle as single patch, part of original series was applied
> - fix udev dependency
> - fix commit message for new version
>
> changes since v1:
>
> - cleanup leftovers from git merge conflicts
>
>
> rules/libdrm.in | 10 ++++++++--
> rules/libdrm.make | 8 ++++++--
> 2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/rules/libdrm.in b/rules/libdrm.in
> index 5e77665..385af35 100644
> --- a/rules/libdrm.in
> +++ b/rules/libdrm.in
> @@ -4,8 +4,7 @@ menuconfig LIBDRM
> tristate
> prompt "libdrm "
> select LIBC_RT
> - select UDEV
> - select UDEV_LIBUDEV
> + select UDEV if LIBDRM_USE_UDEV && RUNTIME
> select LIBPTHREAD_STUBS
> select LIBPCIACCESS if LIBDRM_INTEL
> help
> @@ -14,6 +13,13 @@ menuconfig LIBDRM
>
> if LIBDRM
>
> +config LIBDRM_USE_UDEV
> + bool
> + prompt "Enable support for udev"
> + help
> + Enable support for using udev instead of mknod. If enabled, udev is
> + expected to manage device nodes for probed modules
> +
> config LIBDRM_LIBKMS
> bool
> prompt "build libkms"
> diff --git a/rules/libdrm.make b/rules/libdrm.make
> index ec02cc7..82a35b3 100644
> --- a/rules/libdrm.make
> +++ b/rules/libdrm.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm
> #
> # Paths and names
> #
> -LIBDRM_VERSION := 2.4.74
> -LIBDRM_MD5 := b661a54514109caad3de3b520680b98e
> +LIBDRM_VERSION := 2.4.75
> +LIBDRM_MD5 := 743c16109d91a2539dfc9cc56130d695
> LIBDRM := libdrm-$(LIBDRM_VERSION)
> LIBDRM_SUFFIX := tar.gz
> LIBDRM_URL :=
> http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) @@ -61,8
> +61,12 @@ LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y)
> LIBDRM_CONF_TOOL := autoconf
> LIBDRM_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> +<<<<<<< HEAD
> --enable-udev \
> +=======
> +>>>>>>> 2436ea2... libdrm: version bump 2.7.75 -> 2.7.75
^ Looks strange... :)
jb
--
Pengutronix e.K. | Juergen Borleis |
Industrial Linux Solutions | http://www.pengutronix.de/ |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2017-03-16 14:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-16 14:06 Markus Niebel
2017-03-16 14:19 ` Juergen Borleis [this message]
2017-03-16 14:36 ` Markus Niebel
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=201703161519.37305.jbe@pengutronix.de \
--to=jbe@pengutronix.de \
--cc=Markus.Niebel@tq-group.com \
--cc=m.olbrich@pengutronix.de \
--cc=niebelm@tqsc.de \
--cc=ptxdist@pengutronix.de \
/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