Revision: 6568
http://ipcop.svn.sourceforge.net/ipcop/?rev=6568&view=rev
Author: gespinasse
Date: 2012-04-25 08:33:42 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
Upgrade libusb to 1.0.9, libusb-compat to 0.1.4
This is motivated by cleaning lfs makefile that use --target for no good reason.
And I doubt passing --target=i486 does something here.
Removing --target show no change to produced code (before lib upgrade)
Comment why --with-pic is required for libusb
For libusb-compat, disable static lib and remove _pic.a hack as the installer
no more link to that lib.
Remove .so link from inclusion and on installed machine on update
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/libusb
ipcop/trunk/lfs/libusb
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
ipcop/trunk/updates/2.1.0/setup
Modified: ipcop/trunk/config/rootfiles/common/libusb
===================================================================
--- ipcop/trunk/config/rootfiles/common/libusb 2012-04-24 19:15:45 UTC (rev
6567)
+++ ipcop/trunk/config/rootfiles/common/libusb 2012-04-25 08:33:42 UTC (rev
6568)
@@ -4,13 +4,10 @@
#usr/include/usb.h
usr/lib/libusb-0.1.so.4
usr/lib/libusb-0.1.so.4.4.4
-#usr/lib/libusb-1.0.la
-usr/lib/libusb-1.0.so
+#usr/lib/libusb-1.0.so
usr/lib/libusb-1.0.so.0
-usr/lib/libusb-1.0.so.0.0.0
+usr/lib/libusb-1.0.so.0.1.0
#usr/lib/libusb-1.0_pic.a
-#usr/lib/libusb.la
-usr/lib/libusb.so
-#usr/lib/libusb_pic.a
+#usr/lib/libusb.so
#usr/lib/pkgconfig/libusb-1.0.pc
#usr/lib/pkgconfig/libusb.pc
Modified: ipcop/trunk/lfs/libusb
===================================================================
--- ipcop/trunk/lfs/libusb 2012-04-24 19:15:45 UTC (rev 6567)
+++ ipcop/trunk/lfs/libusb 2012-04-25 08:33:42 UTC (rev 6568)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = libusb
-VER = 1.0.8
+VER = 1.0.9
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,7 +43,7 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-COMPAT_NAME = libusb-compat-0.1.3
+COMPAT_NAME = libusb-compat-0.1.4
COMPAT_FILE = $(COMPAT_NAME).tar.bz2
COMPAT_DIR = $(DIR_SRC)/$(COMPAT_NAME)
@@ -57,8 +57,8 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(COMPAT_FILE) = $(DL_FROM)/$(COMPAT_FILE)
-$(DL_FILE)_MD5 = 37d34e6eaa69a4b645a19ff4ca63ceef
-$(COMPAT_FILE)_MD5 = 570ac2ea085b80d1f74ddc7c6a93c0eb
+$(DL_FILE)_MD5 = 7f5a02375ad960d4e33a6dae7d63cfcb
+$(COMPAT_FILE)_MD5 = 2ca521fffadd0c28fdf174e6ec73865b
install : $(TARGET)
@@ -89,21 +89,19 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr \
- --target=$(MACHINE) \
- --with-pic
+ # --with-pic is needed for mklibs to reduce the lib for the installer
+ cd $(DIR_APP) && ./configure --prefix=/usr --with-pic
cd $(DIR_APP) && make -j $(PARALLELISM)
cd $(DIR_APP) && make install
@rm -rf $(COMPAT_DIR) && cd $(DIR_SRC) && tar jxf
$(DIR_DL)/$(COMPAT_FILE)
- cd $(COMPAT_DIR) && ./configure --prefix=/usr \
- --target=$(MACHINE)
+ cd $(COMPAT_DIR) && ./configure --prefix=/usr --disable-static
cd $(COMPAT_DIR) && make -j $(PARALLELISM)
cd $(COMPAT_DIR) && make install
cd /usr/lib && mv -f libusb-1.0.a libusb-1.0_pic.a
- cd /usr/lib && mv -f libusb.a libusb_pic.a
+ rm /usr/lib/libusb*.la
@rm -rf $(COMPAT_DIR) $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-04-24 19:15:45 UTC
(rev 6567)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-04-25 08:33:42 UTC
(rev 6568)
@@ -319,6 +319,12 @@
/usr/lib/libltdl.so.7
/usr/lib/libltdl.so.7.3.0
##
+## libusb-1.0.9 and libusb-compat-0.1.4
+/usr/lib/libusb-0.1.so.4
+/usr/lib/libusb-0.1.so.4.4.4
+/usr/lib/libusb-1.0.so.0
+/usr/lib/libusb-1.0.so.0.1.0
+##
## libxml2-2.7.8 patched
/usr/lib/libxml2.so.2
/usr/lib/libxml2.so.2.7.8
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-04-24 19:15:45 UTC (rev
6567)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-04-25 08:33:42 UTC (rev
6568)
@@ -11,7 +11,8 @@
e2fsprogs to 1.42.2, ethtool to 3.2, fontconfig to 2.9, gawk to
4.0.1, glib to 2.30.3,
gmp to 5.0.4, gnupg to 1.4.12, grep to 2.12,
iproute2 to 3.3.0, iptables to 1.4.13, hdparm to 9.39, kernel to
3.0.29, krb5 to 1.9.3,
- libgcrypt to 1.5.0, libpng to 1.5.10, libtool to 2.4.2, lsof to
4.85,
+ libgcrypt to 1.5.0, libpng to 1.5.10, libusb to 1.0.9,
libusb-compat to 0.1.4,
+ libtool to 2.4.2, lsof to 4.85,
openldap to 2.4.30, openssh to 6.0, openssl to 1.0.1a, openswan to
2.6.38,
pcre to 8.30, pixman to 0.24.4, procps to 3.3.2, psmisc to 22.16,
rsyslog to 5.8.9, shadow to 4.1.5, squid-langpack to 20120329,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-04-24 19:15:45 UTC (rev 6567)
+++ ipcop/trunk/updates/2.1.0/setup 2012-04-25 08:33:42 UTC (rev 6568)
@@ -125,10 +125,13 @@
/bin/rm -f /usr/lib/libpixman-1.so.0
/bin/rm -f /usr/lib/libpixman-1.so.0.22.2
/bin/rm -f /usr/lib/libpng15.so.15.8.0
+/bin/rm -f /usr/lib/libusb-1.0.so.0.0.0
# Remove devel lib that should not be needed
/bin/rm -f /usr/lib/libfontconfig.so
/bin/rm -f /usr/lib/libpcre.so
+/bin/rm -f /usr/lib/libusb-1.0.so
+/bin/rm -f /usr/lib/libusb.so
/bin/rm -f /usr/lib/libxml2.so
## e2fsprogs
/bin/rm -f /usr/lib/libcom_err.so
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
