7 files changed, 8 insertions, 32 deletions
diff --git a/recipes/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb b/recipes/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
index 34cc1ac50d..aa6442826d 100644
--- a/recipes/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
+++ b/recipes/libusb/libusb-compat_0.0.9+0.1.0-beta2.bb
@@ -3,6 +3,7 @@ access to USB devices."
 HOMEPAGE = "http://libusb.sf.net"
 SECTION = "libs"
 LICENSE = "LGPL"
+PROVIDES = "virtual/libusb0"
 
 PE = "1"
 PR = "r0"
diff --git a/recipes/libusb/libusb-compat_0.1.0.bb b/recipes/libusb/libusb-compat_0.1.0.bb
index 48694403e5..9fcff0de39 100644
--- a/recipes/libusb/libusb-compat_0.1.0.bb
+++ b/recipes/libusb/libusb-compat_0.1.0.bb
@@ -3,6 +3,7 @@ access to USB devices."
 HOMEPAGE = "http://libusb.sf.net"
 SECTION = "libs"
 LICENSE = "LGPL"
+PROVIDES = "virtual/libusb0"
 
 PE = "1"
 PR = "r0"
diff --git a/recipes/libusb/libusb-native_0.1.10a.bb b/recipes/libusb/libusb-native_0.1.10a.bb
index a76768c3b6..a2eb061337 100644
--- a/recipes/libusb/libusb-native_0.1.10a.bb
+++ b/recipes/libusb/libusb-native_0.1.10a.bb
@@ -1,4 +1,5 @@
 require libusb_${PV}.bb
 inherit native
+PROVIDES = "virtual/libusb0-native"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libusb-0.1.10a"
diff --git a/recipes/libusb/libusb-native_0.1.12.bb b/recipes/libusb/libusb-native_0.1.12.bb
index 637ded28e4..2efe2eee89 100644
--- a/recipes/libusb/libusb-native_0.1.12.bb
+++ b/recipes/libusb/libusb-native_0.1.12.bb
@@ -1,3 +1,3 @@
 require libusb_${PV}.bb
 inherit native
-
+PROVIDES = "virtual/libusb0-native"
diff --git a/recipes/libusb/libusb_0.0.0.bb b/recipes/libusb/libusb_0.0.0.bb
deleted file mode 100644
index fe4595611d..0000000000
--- a/recipes/libusb/libusb_0.0.0.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-DESCRIPTION = "libusb is a library to provide userspace access to USB \
-devices.  This version is a metapackage that pulls in libusb-compat, \
-the replacement for libusb."
-
-# This version of libusb will never be pulled in automagically.  The
-# intention is that a distro wishing to use libusb1 and libusb-compat
-# will place the following in the appropriate conf file:
-#
-# PREFERRED_VERSION_libusb = "0.0.0"
-#
-# This essentially results in the replacement of libusb by libusb-compat,
-# and resolves the issues of some packages depending on libusb, while
-# other (newer) ones depend on libusb-compat.
-#
-# Note that using this version of libusb will break certain packages
-# that cannot work with libusb-compat (gnuradio is said to be such a
-# packages, as is dfu-util).  Unfortunately other packages (such as bluez)
-# require libusb-compat -- there's no good solution for this conflict
-# at this time.  The fundamental problem is that both libusb and
-# libusb-compat stage to the same libs (/usr/lib/libusb.a, for example),
-# so if you have built both, the last one staged wins.
-#
-# This "hack" seems to be the most flexible and least intrusive workaround.
-
-DEFAULT_PREFERENCE = "-1"
-
-DEPENDS = "libusb-compat"
diff --git a/recipes/libusb/libusb_0.1.10a.bb b/recipes/libusb/libusb_0.1.10a.bb
index 8648f96571..038a1dd090 100644
--- a/recipes/libusb/libusb_0.1.10a.bb
+++ b/recipes/libusb/libusb_0.1.10a.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "libusb is a library to provide userspace \
-access to USB devices."
+DESCRIPTION = "libusb is a library to provide userspace access to USB devices."
 SECTION = "libs"
 LICENSE = "LGPL"
+PROVIDES = "virtual/libusb0"
 PR = "r7"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
diff --git a/recipes/libusb/libusb_0.1.12.bb b/recipes/libusb/libusb_0.1.12.bb
index 3d6a213b45..ccf4a5850e 100644
--- a/recipes/libusb/libusb_0.1.12.bb
+++ b/recipes/libusb/libusb_0.1.12.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "libusb is a library to provide userspace \
-access to USB devices."
+DESCRIPTION = "libusb is a library to provide userspace access to USB devices."
 HOMEPAGE = "http://libusb.sf.net"
 SECTION = "libs"
 LICENSE = "LGPL"
+PROVIDES = "virtual/libusb0"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \