Permalink
Browse files

libusb:

 * rename FREETZ_LIB_libusb symbol to FREETZ_LIB_libusb_0
 * fixes libusb-install pattern matches both libusb-0.1 and libusb-1.0 causing (under some circumstances) both libusb-0.1 and libusb-1.0 to be installed even though only libusb-0.1 is required
 * refs #2072


git-svn-id: file:///var/svn/freetz/trunk@10867 149334a1-2f27-0410-a3b9-fc62619ac1e6
  • Loading branch information...
1 parent a1c151f commit 9427df7490beceb25dd20824c85bfe3cc9218bc4 er13 committed Jul 21, 2013
View
@@ -17,7 +17,7 @@ choice
digitemp for 1-wire modules
config FREETZ_PACKAGE_DIGITEMP_DS2490
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
bool "digitemp for ds2490 (USB)"
config FREETZ_PACKAGE_DIGITEMP_DS9097U
View
@@ -1,6 +1,6 @@
config FREETZ_PACKAGE_FOWSR
bool "fowsr 1.0-20110904 (binary only)"
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
default n
help
fowsr is a USB Data Collector application for WH1080 compatible weather stations.
View
@@ -2,7 +2,7 @@ config FREETZ_PACKAGE_HPLIP
bool "HPLIP 3.12.6 (binary only, unstable)"
select FREETZ_PACKAGE_SANE_BACKENDS
select FREETZ_LIB_libpthread
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
default n
help
HPLIP - HP Linux Imaging and Printing
@@ -82,7 +82,7 @@ def print_class(cl, printers):
bool "HPLIP %s (binary only, unstable)"
select FREETZ_PACKAGE_SANE_BACKENDS
select FREETZ_LIB_libpthread
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
default n
help
HPLIP - HP Linux Imaging and Printing
@@ -1,6 +1,6 @@
config FREETZ_LIB_libftdi
bool "libftdi (libftdi.so)"
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
default n
help
A library (using libusb) to talk to FTDI's FT232BM/245BM, FT2232C/D and
@@ -1,4 +1,4 @@
-config FREETZ_LIB_libusb
+config FREETZ_LIB_libusb_0
bool "libusb (libusb.so)"
default n
help
@@ -1,3 +1,3 @@
-ifeq ($(strip $(FREETZ_LIB_libusb)),y)
+ifeq ($(strip $(FREETZ_LIB_libusb_0)),y)
LIBS+=libusb
endif
@@ -1 +1 @@
-[ "$EXTERNAL_FREETZ_LIB_libusb" == "y" ] && EXTERNAL_FILES+=" $FREETZ_LIBRARY_DIR/libusb-0.1.so.4.4.4"
+[ "$EXTERNAL_FREETZ_LIB_libusb_0" == "y" ] && EXTERNAL_FILES+=" $FREETZ_LIBRARY_DIR/libusb-0.1.so.4.4.4"
@@ -1,5 +1,5 @@
-config EXTERNAL_FREETZ_LIB_libusb
- depends on EXTERNAL_ENABLED && FREETZ_LIB_libusb
+config EXTERNAL_FREETZ_LIB_libusb_0
+ depends on EXTERNAL_ENABLED && FREETZ_LIB_libusb_0
bool "libusb"
default n
help
View
@@ -1,7 +1,7 @@
config FREETZ_PACKAGE_OWFS
bool "owfs 2.7p32 (binary only)"
select FREETZ_PACKAGE_FUSE
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
select FREETZ_LIB_libm
select FREETZ_LIB_libpthread
default n
@@ -6,7 +6,7 @@ config FREETZ_PACKAGE_SANE_BACKENDS
select FREETZ_PACKAGE_SANE_BACKENDS_BACKEND_dll
select FREETZ_LIB_libm
select FREETZ_LIB_libpthread
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
default n
help
SANE - Scanner support
@@ -15,7 +15,7 @@ sub write_config_in {
select FREETZ_PACKAGE_SANE_BACKENDS_BACKEND_dll
select FREETZ_LIB_libm
select FREETZ_LIB_libpthread
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
default n
help
SANE - Scanner support
@@ -3,7 +3,7 @@ menu SCANBUTTOND
config FREETZ_PACKAGE_SCANBUTTOND
bool "scanbuttond cvs (unstable)"
select FREETZ_LIB_libdl
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
select FREETZ_PACKAGE_SANE_BACKENDS_scanimage
select FREETZ_PACKAGE_SCANBUTTOND_BACKEND_meta
default n
View
@@ -1,7 +1,7 @@
config FREETZ_PACKAGE_SISPMCTL
bool "sispmctl 3.1"
depends on ! FREETZ_AVM_HAS_USB_HOST_AHCI
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
default n
help
sispmctl is an application enabling the use of the GEMBIRD
View
@@ -1,6 +1,6 @@
config FREETZ_PACKAGE_USBUTILS
bool "usbutils 0.86 (binary only)"
- select FREETZ_LIB_libusb
+ select FREETZ_LIB_libusb_0
default n
help
USB devices listing utilities

0 comments on commit 9427df7

Please sign in to comment.