diff options
| -rw-r--r-- | package/Config.in | 2 | ||||
| -rw-r--r-- | package/Makefile | 2 | ||||
| -rw-r--r-- | package/libusb/Config.in | 5 | ||||
| -rw-r--r-- | package/libusb/Makefile | 89 | ||||
| -rw-r--r-- | package/libusb/libusb.control | 6 | ||||
| -rw-r--r-- | package/libusb/patches/no-libusbpp.patch | 105 | ||||
| -rw-r--r-- | package/usbutils/Config.in | 6 | ||||
| -rw-r--r-- | package/usbutils/Makefile | 80 | ||||
| -rw-r--r-- | package/usbutils/usbutils.control | 7 |
9 files changed, 302 insertions, 0 deletions
diff --git a/package/Config.in b/package/Config.in index 0437e05d28..d6fa8b53c7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -49,6 +49,7 @@ source "package/shfs/Config.in" source "package/asterisk/Config.in" source "package/snort/Config.in" source "package/olsrd/Config.in" +source "package/usbutils/Config.in" comment "Libraries" source "package/libgcc/Config.in" @@ -69,6 +70,7 @@ source "package/mysql/Config.in" source "package/postgresql/Config.in" source "package/fuse/Config.in" source "package/speex/Config.in" +source "package/libusb/Config.in" comment "Extra stuff" source "package/sdk/Config.in" diff --git a/package/Makefile b/package/Makefile index 2042c5737d..41681ce02b 100644 --- a/package/Makefile +++ b/package/Makefile @@ -28,6 +28,7 @@ package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux package-$(BR2_PACKAGE_LIBELF) += libelf package-$(BR2_PACKAGE_LIBGCC) += libgcc package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread +package-$(BR2_PACKAGE_LIBUSB) += libusb package-$(BR2_PACKAGE_LZO) += lzo package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl package-$(BR2_PACKAGE_MICROPERL) += microperl @@ -56,6 +57,7 @@ package-$(BR2_PACKAGE_SNORT) += snort package-$(BR2_PACKAGE_SPEEX) += speex package-$(BR2_PACKAGE_STRACE) += strace package-$(BR2_PACKAGE_TCPDUMP) += tcpdump +package-$(BR2_PACKAGE_USBUTILS) += usbutils package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools package-$(BR2_PACKAGE_WOL) += wol package-$(BR2_PACKAGE_ZLIB) += zlib diff --git a/package/libusb/Config.in b/package/libusb/Config.in new file mode 100644 index 0000000000..8157ed291d --- /dev/null +++ b/package/libusb/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_LIBUSB + tristate "libusb" + default m if CONFIG_DEVEL + help + A library for accessing Linux USB devices diff --git a/package/libusb/Makefile b/package/libusb/Makefile new file mode 100644 index 0000000000..c252965272 --- /dev/null +++ b/package/libusb/Makefile @@ -0,0 +1,89 @@ +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libusb +PKG_VERSION:=0.1.10a +PKG_RELEASE:=1 +PKG_MD5SUM:=c6062b29acd2cef414bcc34e0decbdd1 + +PKG_SOURCE_URL:=@SF/libusb +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) +PKG_INFO:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list + +$(DL_DIR)/$(PKG_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) + +$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(PATCH) $(PKG_BUILD_DIR) ./patches + touch $(PKG_BUILD_DIR)/.prepared + +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared + (cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + ac_cv_c_bigendian=no \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ + --enable-shared \ + --enable-static \ + ); + touch $(PKG_BUILD_DIR)/.configured + +$(PKG_BUILD_DIR)/.libs/libusb.so: $(PKG_BUILD_DIR)/.configured + $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ + CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH) \ + +$(STAGING_DIR)/usr/lib/libusb.so: $(PKG_BUILD_DIR)/.libs/libusb.so + mkdir -p $(STAGING_DIR)/usr/lib + mkdir -p $(STAGING_DIR)/usr/include + cp -a $(PKG_BUILD_DIR)/.libs/*.so* $(STAGING_DIR)/usr/lib/ + cp -a $(PKG_BUILD_DIR)/usb.h $(STAGING_DIR)/usr/include/ + +$(PKG_IPK): $(STAGING_DIR)/usr/lib/libusb.so + $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(PKG_IPK_DIR)/usr/lib + cp -a $(PKG_BUILD_DIR)/.libs/libusb*.so* $(PKG_IPK_DIR)/usr/lib/ + $(STRIP) $(PKG_IPK_DIR)/usr/lib/* + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) + +$(PKG_INFO): $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.prepared +compile: $(PKG_IPK) $(STAGING_DIR)/usr/lib/libusb.so +install: $(PKG_INFO) + +clean: + rm -f $(STAGING_DIR)/usr/lib/libusb* + rm -f $(STAGING_DIR)/usr/include/usb.h + rm -rf $(PKG_BUILD_DIR) $(PKG_IPK) diff --git a/package/libusb/libusb.control b/package/libusb/libusb.control new file mode 100644 index 0000000000..89cc640dce --- /dev/null +++ b/package/libusb/libusb.control @@ -0,0 +1,6 @@ +Package: libusb +Priority: optional +Section: libs +Maintainer: Felix Fietkau <nbd@vd-s.ath.cx> +Source: buildroot internal +Description: a Library for accessing Linux USB devices diff --git a/package/libusb/patches/no-libusbpp.patch b/package/libusb/patches/no-libusbpp.patch new file mode 100644 index 0000000000..e9f48f14db --- /dev/null +++ b/package/libusb/patches/no-libusbpp.patch @@ -0,0 +1,105 @@ +--- libusb-0.1.10a.dev/Makefile.in.old 2005-04-20 21:49:04.000000000 +0200 ++++ libusb-0.1.10a.dev/Makefile.in 2005-04-20 21:50:23.000000000 +0200 +@@ -16,7 +16,7 @@ + + + +-SOURCES = $(libusb_la_SOURCES) $(libusbpp_la_SOURCES) ++SOURCES = $(libusb_la_SOURCES) + + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -71,8 +71,8 @@ + am_libusb_la_OBJECTS = usb.lo error.lo descriptors.lo $(am__objects_1) + libusb_la_OBJECTS = $(am_libusb_la_OBJECTS) + libusbpp_la_LIBADD = +-am_libusbpp_la_OBJECTS = usbpp.lo +-libusbpp_la_OBJECTS = $(am_libusbpp_la_OBJECTS) ++am_libusbpp_la_OBJECTS = ++libusbpp_la_OBJECTS = + binSCRIPT_INSTALL = $(INSTALL_SCRIPT) + SCRIPTS = $(bin_SCRIPTS) + DEFAULT_INCLUDES = +@@ -80,8 +80,7 @@ + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bsd.Plo ./$(DEPDIR)/darwin.Plo \ + @AMDEP_TRUE@ ./$(DEPDIR)/descriptors.Plo ./$(DEPDIR)/error.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/linux.Plo ./$(DEPDIR)/usb.Plo \ +-@AMDEP_TRUE@ ./$(DEPDIR)/usbpp.Plo ++@AMDEP_TRUE@ ./$(DEPDIR)/linux.Plo ./$(DEPDIR)/usb.Plo + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ +@@ -98,8 +97,8 @@ + CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(libusb_la_SOURCES) $(libusbpp_la_SOURCES) +-DIST_SOURCES = $(am__libusb_la_SOURCES_DIST) $(libusbpp_la_SOURCES) ++SOURCES = $(libusb_la_SOURCES) ++DIST_SOURCES = $(am__libusb_la_SOURCES_DIST) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ +@@ -250,7 +249,7 @@ + # require automake 1.4 + # gnu strictness chokes on README being autogenerated + AUTOMAKE_OPTIONS = 1.4 foreign +-SUBDIRS = . tests doc ++SUBDIRS = . + AM_CFLAGS = $(CFLAGS_EXT) + configincludedir = $(pkglibdir)/include + bin_SCRIPTS = libusb-config +@@ -259,7 +258,7 @@ + apidocs/footer.html apidocs/doxygen.css apidocs/doxygen.png + + EXTRA_libusb_la_SOURCE = linux.c linux.h bsd.c darwin.c +-lib_LTLIBRARIES = libusb.la libusbpp.la ++lib_LTLIBRARIES = libusb.la + @BSD_API_FALSE@@DARWIN_API_FALSE@@LINUX_API_FALSE@OS_SUPPORT = + @BSD_API_FALSE@@DARWIN_API_TRUE@@LINUX_API_FALSE@OS_SUPPORT = darwin.c + @BSD_API_TRUE@@LINUX_API_FALSE@OS_SUPPORT = bsd.c +@@ -269,24 +268,18 @@ + AM_CPPFLAGS = -I. + AM_CXXFLAGS = + libusb_la_SOURCES = usb.c usbi.h error.c error.h descriptors.c $(OS_SUPPORT) +-libusbpp_la_SOURCES = usbpp.cpp usbpp.h ++libusbpp_la_SOURCES = + + # Do not add usb.h to *_SOURCES, regardless of dependencies. + # It would be added to the dist tarball, which it shouldn't be. + nodist_include_HEADERS = usb.h +-include_HEADERS = usbpp.h ++include_HEADERS = + libusb_la_LDFLAGS = \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) \ + -export-dynamic \ + $(LDADDS) + +-libusbpp_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) \ +- -export-dynamic \ +- $(LDADDS) -lusb $(QT_LDFLAGS) +- + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +@@ -381,8 +374,6 @@ + done + libusb.la: $(libusb_la_OBJECTS) $(libusb_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libusb_la_LDFLAGS) $(libusb_la_OBJECTS) $(libusb_la_LIBADD) $(LIBS) +-libusbpp.la: $(libusbpp_la_OBJECTS) $(libusbpp_la_DEPENDENCIES) +- $(CXXLINK) -rpath $(libdir) $(libusbpp_la_LDFLAGS) $(libusbpp_la_OBJECTS) $(libusbpp_la_LIBADD) $(LIBS) + install-binSCRIPTS: $(bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" +@@ -415,7 +406,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usb.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usbpp.Plo@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in new file mode 100644 index 0000000000..9b7de2dde4 --- /dev/null +++ b/package/usbutils/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_USBUTILS + tristate "lsusb" + default m if CONFIG_DEVEL + select BR2_PACKAGE_LIBUSB + help + A program to list Linux USB devices diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile new file mode 100644 index 0000000000..5492d96e9a --- /dev/null +++ b/package/usbutils/Makefile @@ -0,0 +1,80 @@ +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=usbutils +PKG_VERSION:=0.70 +PKG_RELEASE:=1 +PKG_MD5SUM:=05276dc307a0297904bc892e9998bf59 + +PKG_SOURCE_URL:=@SF/linux-usb +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +IPKG_LSUSB:=$(PACKAGE_DIR)/lsusb_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +IDIR_LSUSB:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) +INFO_LSUSB:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list + +$(DL_DIR)/$(PKG_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) + +$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(PKG_BUILD_DIR)/.prepared + +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared + (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + ac_cv_func_malloc_0_nonnull=yes \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ + ); + touch $(PKG_BUILD_DIR)/.configured + +$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC=$(TARGET_CC) + +$(IPKG_LSUSB): $(PKG_BUILD_DIR)/$(PKG_NAME) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LSUSB) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(IDIR_LSUSB)/usr/share + cp $(PKG_BUILD_DIR)/usb.ids $(IDIR_LSUSB)/usr/share/ + mkdir -p $(IDIR_LSUSB)/usr/sbin + cp $(PKG_BUILD_DIR)/lsusb $(IDIR_LSUSB)/usr/sbin/ + $(STRIP) $(IDIR_LSUSB)/usr/sbin/* + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(IDIR_LSUSB) $(PACKAGE_DIR) + +$(INFO_LSUSB): $(IPKG_LSUSB) + $(IPKG) install $(IPKG_LSUSB) + +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.prepared +compile: $(IPKG_LSUSB) +install: $(INFO_LSUSB) + +clean: + rm -rf $(PKG_BUILD_DIR) $(IPKG_LSUSB) diff --git a/package/usbutils/usbutils.control b/package/usbutils/usbutils.control new file mode 100644 index 0000000000..7f864d15a2 --- /dev/null +++ b/package/usbutils/usbutils.control @@ -0,0 +1,7 @@ +Package: lsusb +Priority: optional +Section: net +Maintainer: Felix Fietkau <nbd@vd-s.ath.cx> +Source: buildroot internal +Depends: libusb +Description: A program to list USB devices |