summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-05-16 13:50:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-20 12:23:10 +0100
commitb664c8618753c53f23683f7673793de20f0ee072 (patch)
tree4fed06314719f0aac4efcff53b70c69c5a780a75
parent0e2777fc3da1f59a227264068e5030c57e5ff33a (diff)
downloadpoky-b664c8618753c53f23683f7673793de20f0ee072.tar.gz
libusb1: disable floating dependency on udev
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. (From OE-Core rev: 5c0f8111f9ec5a2c3b2826946af5132aaa13a9b9) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-support/libusb/libusb1_1.0.18.bb4
2 files changed, 3 insertions, 16 deletions
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 b1dd66c969..0000000000
--- a/meta/recipes-support/libusb/libusb1/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Submitted [https://libusb.org/ticket/159]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd libusb-1.0.9/configure.ac libusb-1.0.9/configure.ac
5--- libusb-1.0.9/configure.ac 2012-04-20 09:44:27.000000000 +0300
6+++ libusb-1.0.9/configure.ac 2013-01-02 16:36:44.152121483 +0200
7@@ -31,7 +31,7 @@
8
9 AC_CONFIG_SRCDIR([libusb/core.c])
10 AC_CONFIG_MACRO_DIR([m4])
11-AM_CONFIG_HEADER([config.h])
12+AC_CONFIG_HEADERS([config.h])
13 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
14
15 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 c64f1dba21..395145af10 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}"
18 18
19inherit autotools pkgconfig 19inherit autotools pkgconfig
20 20
21EXTRA_OECONF = "--libdir=${base_libdir}" 21# Don't configure udev by default since it will cause a circular
22# dependecy with udev package, which depends on libusb
23EXTRA_OECONF = "--libdir=${base_libdir} --disable-udev"
22 24
23do_install_append() { 25do_install_append() {
24 install -d ${D}${libdir} 26 install -d ${D}${libdir}