summaryrefslogtreecommitdiff
path: root/conf/distro/include
diff options
context:
space:
mode:
authorStanislav Brabec <utx@penguin.cz>2009-06-26 19:18:12 +0000
committerutx@penguin.cz <utx@penguin.cz>2009-06-26 19:18:12 +0000
commit2fe85b7a8468403904f563aa9d5dfcfd9539826c (patch)
tree69a605bd6b2942632573c06eee0a9c9e36d3a92f /conf/distro/include
parent84efca2e2ad21d3d7cea68c0327f91aaf773eb67 (diff)
many files: Introduction of virtual/libusb0 provided by libusb or libusb-compat:
* for more see http://lists.linuxtogo.org/pipermail/openembedded-devel/2009-June/012217.html
Diffstat (limited to 'conf/distro/include')
-rw-r--r--conf/distro/include/preferred-slugos-versions.inc6
-rw-r--r--conf/distro/include/slugos.inc1
2 files changed, 1 insertions, 6 deletions
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 992235a4b9..0eae85b686 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -63,11 +63,5 @@ PREFERRED_VERSION_udev ?= "118"
##################### Stuff with special notes, and broken stuff:
-# Hack alert - selecting this version of libusb effectively selects
-# the use of libusb1 and libusb-compat in the case that something
-# still depends on libusb. This is required because otherwise
-# libusb will overwrite libusb-compat in staging.
-PREFERRED_VERSION_libusb ?= "0.0.0"
-
# boost 1.36 won't build
PREFERRED_VERSION_boost ?= "1.33.1"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index b1b89b9870..fb036c10e8 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -159,6 +159,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+"
PREFERRED_PROVIDER_avahi ?= "avahi"
PREFERRED_PROVIDER_gconf ?= "gconf"
+PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
# Include any package preferred versions and srcrevs: