summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2011-09-02 13:34:26 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-09-08 16:15:41 +0200
commit16d96812048609e608cf90b7bf3ff585d9bacedc (patch)
treee0908d161ff148dba47345a2a1d742057231bfaf
parentc2649e0b4978d6cb4bdfb7e22383a2c648a14a4d (diff)
downloadptxdist-16d96812048609e608cf90b7bf3ff585d9bacedc.tar.gz
ptxdist-16d96812048609e608cf90b7bf3ff585d9bacedc.tar.xz
usbutils: version bump 0.90 -> 004
The dependency has switched to libusb >= 1.0.0 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/usbutils.in14
-rw-r--r--rules/usbutils.make16
2 files changed, 23 insertions, 7 deletions
diff --git a/rules/usbutils.in b/rules/usbutils.in
index 3f573e907..f259f9c4e 100644
--- a/rules/usbutils.in
+++ b/rules/usbutils.in
@@ -1,7 +1,7 @@
## SECTION=shell_and_console
menuconfig USBUTILS
- select LIBUSB_COMPAT
+ select LIBUSB
tristate
prompt "usbutils "
help
@@ -36,4 +36,16 @@ config USBUTILS_LSUSB
comment "busybox' lsusb is selected"
depends on BUSYBOX_LSUSB
+config USBUTILS_USBHIDDUMP
+ bool
+ prompt "usbhid-dump"
+ help
+ A tool to dump USB device HID report descriptors and/or streams.
+
+config USBUTILS_USBDEVICES
+ bool
+ prompt "usbdevices"
+ help
+ Print out sysfs information about usb devices.
+
endif
diff --git a/rules/usbutils.make b/rules/usbutils.make
index 5754a81fa..24991154e 100644
--- a/rules/usbutils.make
+++ b/rules/usbutils.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_USBUTILS) += usbutils
#
# Paths and names
#
-USBUTILS_VERSION := 0.90
-USBUTILS_MD5 := cf542098627c77484c671be4fc5e7271
+USBUTILS_VERSION := 004
+USBUTILS_MD5 := fc69cde51b2094aa4bbd804c0ba97e35
USBUTILS := usbutils-$(USBUTILS_VERSION)
USBUTILS_SUFFIX := tar.bz2
USBUTILS_URL := http://www.kernel.org/pub/linux/utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX)
@@ -63,11 +63,15 @@ $(STATEDIR)/usbutils.targetinstall:
@$(call install_fixup, usbutils,DESCRIPTION,missing)
ifdef PTXCONF_USBUTILS_LSUSB
- @$(call install_copy, usbutils, 0, 0, 0755, -, \
- /usr/sbin/lsusb)
+ @$(call install_copy, usbutils, 0, 0, 0755, -, /usr/bin/lsusb)
endif
- @$(call install_copy, usbutils, 0, 0, 0644, -, \
- /usr/share/usb.ids,n)
+ifdef PTXCONF_USBUTILS_USBHIDDUMP
+ @$(call install_copy, usbutils, 0, 0, 0755, -, /usr/bin/usbhid-dump)
+endif
+ifdef PTXCONF_USBUTILS_USBDEVICES
+ @$(call install_copy, usbutils, 0, 0, 0755, -, /usr/bin/usb-devices)
+endif
+ @$(call install_copy, usbutils, 0, 0, 0644, -, /usr/share/usb.ids,n)
@$(call install_finish, usbutils)