Skip to contentSkip to conversation

usbutils: bump to version 007

PATCH New Gustavo Zacarias 2 participants 2 messages Jul 12, 2013 – Jul 13, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usbutils: bump to version 007

---
 package/usbutils/usbutils.mk | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
package/usbutils/usbutils.mk +11 -5
index c56702b..d809463 100644
@@ -4,13 +4,10 @@
 #
 ################################################################################
 
-USBUTILS_VERSION = 006
-USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils/
-USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.gz
+USBUTILS_VERSION = 007
+USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
 USBUTILS_DEPENDENCIES = host-pkgconf libusb
 USBUTILS_INSTALL_STAGING = YES
-# no configure in tarball
-USBUTILS_AUTORECONF = YES
 USBUTILS_LICENSE = GPLv2+
 USBUTILS_LICENSE_FILES = COPYING
 
@@ -25,6 +22,15 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 	USBUTILS_DEPENDENCIES += busybox
 endif
 
+# Nice lsusb.py script only if there's python
+ifeq ($(BR2_PACKAGE_PYTHON),)
+define USBUTILS_REMOVE_PYTHON
+	rm -f $(TARGET_DIR)/usr/bin/lsusb.py
+endef
+endif
+
+USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_PYTHON
+
 define USBUTILS_TARGET_CLEANUP
 	rm -f $(TARGET_DIR)/usr/bin/usb-devices
 	rm -f $(TARGET_DIR)/usr/sbin/update-usbids.sh
Signature · 1 line
1.8.1.5
#1 lore raw

PATCH 1/1 usbutils: bump to version 007

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/usbutils/usbutils.mk | 16 +++++++++++-----

Gustavo> 1 file changed, 11 insertions(+), 5 deletions(-)

Gustavo> diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk Gustavo> index c56702b..d809463 100644
Gustavo> --- a/package/usbutils/usbutils.mk
Gustavo> +++ b/package/usbutils/usbutils.mk
Gustavo> @@ -4,13 +4,10 @@
Gustavo> #
Gustavo> ################################################################################

Gustavo> -USBUTILS_VERSION = 006
Gustavo> -USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils/ Gustavo> -USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.gz Gustavo> +USBUTILS_VERSION = 007
Gustavo> +USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils Gustavo> USBUTILS_DEPENDENCIES = host-pkgconf libusb Gustavo> USBUTILS_INSTALL_STAGING = YES
Gustavo> -# no configure in tarball
Gustavo> -USBUTILS_AUTORECONF = YES
Gustavo> USBUTILS_LICENSE = GPLv2+
Gustavo> USBUTILS_LICENSE_FILES = COPYING

Gustavo> @@ -25,6 +22,15 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
Gustavo> USBUTILS_DEPENDENCIES += busybox
Gustavo> endif

Gustavo> +# Nice lsusb.py script only if there's python Gustavo> +ifeq ($(BR2_PACKAGE_PYTHON),)
Gustavo> +define USBUTILS_REMOVE_PYTHON
Gustavo> + rm -f $(TARGET_DIR)/usr/bin/lsusb.py
Gustavo> +endef
Gustavo> +endif
Gustavo> +
Gustavo> +USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_PYTHON

I would prefer to keep the assignment to _INSTALL_TARGET_HOOKS inside the conditional, like we do elsewhere.

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard