X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flibusb;h=e3ac0e53df6cbc74b01ddc4e517c64bba7490b8a;hp=24ed28ac9d1a74467b624581d288e6adce6bb884;hb=d316437b8df4d6dd84904f02f87b1e0329de519b;hpb=e8d611578373c875b8d604abf74ef4aae36e717e

diff --git a/lfs/libusb b/lfs/libusb
index 24ed28ac9d..e3ac0e53df 100644
--- a/lfs/libusb
+++ b/lfs/libusb
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: libusb,v 1.4.2.2 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -32,11 +26,11 @@
 
 include Config
 
-VER        = 0.1.7
+VER        = 0.1.12
 
 THISAPP    = libusb-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_SFNET)/libusb
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4c7abee86d8715bccb43428a500d2170
+$(DL_FILE)_MD5 = caf182cbc7565dac0fd72155919672e6
 
 install : $(TARGET)
 
@@ -78,9 +72,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \
-	    --with-linux-headers=/usr/src/linux --target=$(MACHINE)
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	echo "# Set group ownership for raw USB devices" > /etc/udev/rules.d/23-usb.rules
+	echo "SUBSYSTEM==\"usb_device\", GROUP=\"usb\"" >> /etc/udev/rules.d/23-usb.rules
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)