Patchwork libusb1: disable floating dependency on udev

login
register
mail settings
Submitter Saul Wold
Date May 16, 2014, 8:50 p.m.
Message ID <1400273445-15060-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/72309/
State New
Headers show

Comments

Saul Wold - May 16, 2014, 8:50 p.m.
libusb added support for udev, but this causes a circular dependecny between
udev and libusb, so hardcode the disable here.

Also remove the patch that is no longer used.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../libusb/libusb1/obsolete_automake_macros.patch         | 15 ---------------
 meta/recipes-support/libusb/libusb1_1.0.18.bb             |  4 +++-
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch

Patch

diff --git a/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch b/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch
deleted file mode 100644
index b1dd66c..0000000
--- a/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@ 
-Upstream-Status: Submitted [https://libusb.org/ticket/159]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd libusb-1.0.9/configure.ac libusb-1.0.9/configure.ac
---- libusb-1.0.9/configure.ac	2012-04-20 09:44:27.000000000 +0300
-+++ libusb-1.0.9/configure.ac	2013-01-02 16:36:44.152121483 +0200
-@@ -31,7 +31,7 @@
-
- AC_CONFIG_SRCDIR([libusb/core.c])
- AC_CONFIG_MACRO_DIR([m4])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
- AC_PREREQ([2.50])
diff --git a/meta/recipes-support/libusb/libusb1_1.0.18.bb b/meta/recipes-support/libusb/libusb1_1.0.18.bb
index c64f1db..395145a 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.18.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.18.bb
@@ -18,7 +18,9 @@  S = "${WORKDIR}/libusb-${PV}"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--libdir=${base_libdir}"
+# Don't configure udev by default since it will cause a circular
+# dependecy with udev package, which depends on libusb
+EXTRA_OECONF = "--libdir=${base_libdir} --disable-udev"
 
 do_install_append() {
 	install -d ${D}${libdir}