diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/preferred-slugos-versions.inc | 6 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index f0b8a040ea..470c31a788 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -88,6 +88,8 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.30" PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom" PREFERRED_PROVIDER_avahi = "avahi" +PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat" +PREFERRED_PROVIDER_virtual/gail ?= "gtk+" #powerpc needs additional patches to gcc ANGSTROM_GCC_VERSION_ppc405 ?= "4.1.1" 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: |