libusb: Update to 1.0.19

libusbx: removed, moved to 'libusb-compat 0.1.5'
updated: make.sh

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/libusb b/config/rootfiles/common/libusb
index 61c2f2a63999072a9459035a870f7e2b86654d64..5be9bdf9fdfb54e2f8328dab0a6f12f44cd6cc4b 100644 (file)
--- a/config/rootfiles/common/libusb
+++ b/config/rootfiles/common/libusb
@@ -1,15 +1,16 @@
 etc/udev/rules.d/23-usb.rules
 #usr/bin/libusb-config
 etc/udev/rules.d/23-usb.rules
 #usr/bin/libusb-config

+#usr/include/libusb-1.0
+#usr/include/libusb-1.0/libusb.h

 #usr/include/usb.h
 #usr/include/usb.h

-#usr/include/usbpp.h
-usr/lib/libusb-0.1.so.4
-usr/lib/libusb-0.1.so.4.4.4
-#usr/lib/libusb.a
+#usr/lib/libusb-0.1.so.4
+#usr/lib/libusb-0.1.so.4.4.4
+#usr/lib/libusb-1.0.a
+#usr/lib/libusb-1.0.la
+#usr/lib/libusb-1.0.so
+usr/lib/libusb-1.0.so.0
+usr/lib/libusb-1.0.so.0.1.0

 #usr/lib/libusb.la
 #usr/lib/libusb.la

-usr/lib/libusb.so
-usr/lib/libusbpp-0.1.so.4
-usr/lib/libusbpp-0.1.so.4.4.4
-#usr/lib/libusbpp.a
-#usr/lib/libusbpp.la
-usr/lib/libusbpp.so
+#usr/lib/libusb.so
+#usr/lib/pkgconfig/libusb-1.0.pc

 #usr/lib/pkgconfig/libusb.pc
 #usr/lib/pkgconfig/libusb.pc

diff --git a/config/rootfiles/common/libusb-compat b/config/rootfiles/common/libusb-compat
new file mode 100644 (file)
index 0000000..ca3007e
--- /dev/null
+++ b/config/rootfiles/common/libusb-compat
@@ -0,0 +1,7 @@
+#usr/bin/libusb-config
+#usr/include/usb.h
+usr/lib/libusb-0.1.so.4
+usr/lib/libusb-0.1.so.4.4.4
+#usr/lib/libusb.la
+usr/lib/libusb.so
+#usr/lib/pkgconfig/libusb.pc

diff --git a/config/rootfiles/common/libusbx b/config/rootfiles/common/libusbx
deleted file mode 100644 (file)
index 62d6492..0000000
--- a/config/rootfiles/common/libusbx
+++ /dev/null
@@ -1,8 +0,0 @@
-#usr/include/libusb-1.0
-#usr/include/libusb-1.0/libusb.h
-#usr/lib/libusb-1.0.a
-#usr/lib/libusb-1.0.la
-#usr/lib/libusb-1.0.so
-usr/lib/libusb-1.0.so.0
-usr/lib/libusb-1.0.so.0.1.0
-#usr/lib/pkgconfig/libusb-1.0.pc

diff --git a/lfs/libusb b/lfs/libusb
index b35c90cefbcdb6e556d08f30a5d0e6a78f2c5a71..f557bd8be7d0a15e2fa98fb0eb1efc6a5b07f7a1 100644 (file)
--- a/lfs/libusb
+++ b/lfs/libusb
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #

 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #


@@ -24,10 +24,10 @@
 
 include Config
 
 
 include Config
 

-VER        = 0.1.12
+VER        = 1.0.19

 
 THISAPP    = libusb-$(VER)
 
 THISAPP    = libusb-$(VER)

-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2

 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)


@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = caf182cbc7565dac0fd72155919672e6
+$(DL_FILE)_MD5 = f9e2bb5879968467e5ca756cb4e1fa7e

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)

-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)

        cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/lfs/libusbx b/lfs/libusb-compat
similarity index 84%
rename from lfs/libusbx
rename to lfs/libusb-compat
index 167b9450dbe43de5a535e595f8adcb464d7725b5..dcb76aa021d59a84b90c5490fbf529f81ef15678 100644 (file)
--- a/lfs/libusbx
+++ b/lfs/libusb-compat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #

-# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #

 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #


@@ -24,9 +24,9 @@
 
 include Config
 
 
 include Config
 

-VER        = 1.0.11
+VER        = 0.1.5

 
 

-THISAPP    = libusbx-$(VER)
+THISAPP    = libusb-compat-$(VER)

 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)


@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 9aaab6aee72f65900cc731ecbffb4cf4
+$(DL_FILE)_MD5 = 2780b6a758a1e2c2943bdbf7faf740e4

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -69,10 +69,14 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)

-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr \
-               --enable-examples-build
-       cd $(DIR_APP) && make $(MAKETUNING)
+
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+
+       cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
+       cd $(DIR_APP) && make -j $(PARALLELISM)

        cd $(DIR_APP) && make install
        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)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index db16c55dc15745299a036e4113bd7331df00407b..14f3aedfea1b15dd552bf20f8f1e4905387360d0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -385,7 +385,7 @@ buildipfire() {
   ipfiremake backup
   ipfiremake pkg-config
   ipfiremake libusb
   ipfiremake backup
   ipfiremake pkg-config
   ipfiremake libusb

-  ipfiremake libusbx
+  ipfiremake libusb-compat

   ipfiremake libpcap
   ipfiremake ppp
   ipfiremake pptp
   ipfiremake libpcap
   ipfiremake ppp
   ipfiremake pptp