Hi,
This patch updates libusb to 1.0.9 and usbutils to usbutils-006. I haven't been
able to build with the current versions for quite some time.
Regards,
Marcus.
--
Marcus Furlong - Network/Systems Administrator
Victorian Partnership for Advanced Computing
Index: Makefile
===================================================================
--- Makefile (revision 3500)
+++ Makefile (working copy)
@@ -14,7 +14,7 @@
# TODO: kbd-1.15.2 Missing configure
kbd=kbd-1.15.2
#TODO:libusb-1.0.8
-libusb=libusb-0.1.12
+libusb=libusb-1.0.9
linux=linux-3.4.4
module-init-tools=module-init-tools-3.12
mysql=mysql-5.0.92
@@ -34,7 +34,7 @@
samba=samba-3.3.15
slang=slang-2.0.7
syslinux=syslinux-4.04
-usbutils=usbutils-0.91
+usbutils=usbutils-006
wireless_tools=wireless_tools.28
zlib=zlib-1.2.5
@@ -798,7 +798,7 @@
stage1 += stage1/lib/libexpat.so
## libusb
-$(libusb)/.libs/libusb-0.1.so.4.4.4:
+$(libusb)/libusb/.libs/libusb-1.0.so.0.1.0:
cd $(libusb) \
&& CC="$(CC)" CXX="$(CXX)" ./configure --disable-static \
--build=i586-linux \
@@ -806,18 +806,19 @@
&& $(MAKE)
[ -e $@ ]
-$(call copy_lib,$(libusb)/.libs/libusb-0.1.so.4.4.4,stage1/lib/libusb.so)
-$(call copy_file,$(libusb)/usb.h,fakeinclude/usb.h)
-stage1 += stage1/lib/libusb.so
+$(call copy_lib,$(libusb)/libusb/.libs/libusb-1.0.so.0.1.0,stage1/lib/libusb-1.0.so)
+$(call copy_file,$(libusb)/libusb/libusb.h,fakeinclude/libusb.h)
+$(call copy_file,$(libusb)/libusb/libusb.h,fakeinclude/libusb-1.0/libusb.h)
+stage1 += stage1/lib/libusb-1.0.so
## usbutils
## use LIBUSB_CFLAGS and LIBUSB_LIBS to avoid pkg-config usage.
## FIXME '-lusb' is sufficient since usage of fakelib_cflags for CFLAGS.
-$(usbutils)/lsusb: stage1/lib/libusb.so fakeinclude/usb.h
+$(usbutils)/lsusb: stage1/lib/libusb-1.0.so fakeinclude/libusb.h fakeinclude/libusb-1.0/libusb.h
cd $(usbutils) \
- && CC="$(CC)" CFLAGS="$(fakelib_cflags)" \
- LIBUSB_CFLAGS="-I$(cwd)/fakeinclude" LIBUSB_LIBS="-lusb" \
+ && CC="$(CC)" CFLAGS="$(fakelib_cflags) -I$(cwd)/fakeinclude" LDFLAGS="$(fakelib_cflags)" \
+ LIBUSB_CFLAGS="-I$(cwd)/fakeinclude" LIBUSB_LIBS="-lusb-1.0" \
./configure --prefix=/usr \
&& $(MAKE)
@@ -1038,8 +1039,8 @@
$(call download_rule, $(glibc), tar.bz2, http://ftp.gnu.org/gnu/glibc/)
$(call download_rule, $(kbd), tar.gz, \
http://ftp.altlinux.com/pub/people/legion/kbd/)
-$(call download_rule, $(libusb), tar.gz, \
- http://downloads.sourceforge.net/libusb/)
+$(call download_rule, $(libusb), tar.bz2, \
+ http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.9/)
$(call download_rule, $(linux), tar.bz2, \
http://www.kernel.org/pub/linux/kernel/v3.0/)
$(call download_rule, $(module-init-tools), tar.bz2, \
------------------------------------------------------------------------------
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/
_______________________________________________
unattended-devel mailing list
unattended-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/unattended-devel
