mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH v3] libdrm: version bump 2.7.74 -> 2.7.75
@ 2017-03-16 14:06 Markus Niebel
  2017-03-16 14:19 ` Juergen Borleis
  0 siblings, 1 reply; 3+ messages in thread
From: Markus Niebel @ 2017-03-16 14:06 UTC (permalink / raw)
  To: ptxdist; +Cc: m.olbrich, Markus Niebel

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
 	--$(call ptx/endis, PTXCONF_LIBDRM_LIBKMS)-libkms \
+	--$(call ptx/endis, PTXCONF_LIBDRM_USE_UDEV)-udev \
 	$(addprefix --enable-,$(LIBDRM_BACKENDSC-y)) \
 	$(addprefix --disable-,$(LIBDRM_BACKENDSC-)) \
 	--$(call ptx/endis, PTXCONF_LIBDRM_TESTS)-install-test-programs \
-- 
1.9.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-03-16 14:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-16 14:06 [ptxdist] [PATCH v3] libdrm: version bump 2.7.74 -> 2.7.75 Markus Niebel
2017-03-16 14:19 ` Juergen Borleis
2017-03-16 14:36   ` Markus Niebel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox