diffstat of debian/ for linux-tools_3.5-1~experimental.1 linux-tools_3.6.2-1 bin/gencontrol.py | 1 bin/genorig.py | 31 +-- build/Makefile | 1 build/drivers/staging/usbip/Makefile | 24 ++ build/tools/perf/Makefile | 9 changelog | 32 +-- control | 48 +++- control.md5sum | 8 libusbip-dev.install | 3 libusbip-dev.lintian-overrides | 3 patches/perf-Fix-include-order-for-bison-flex-generated-C-fi.patch | 36 --- patches/series | 4 patches/tools-perf-version.patch | 12 - patches/usbip-document-tcp-wrappers.patch | 27 ++ patches/usbip-fix-explicit-configure-with-tcp-wrappers.patch | 37 +++ patches/usbip-update-man-pages.patch | 99 ++++++++++ rules.gen | 4 rules.real | 29 ++ templates/control.main.in | 33 +++ templates/control.source.in | 3 usbip.install | 4 21 files changed, 342 insertions(+), 106 deletions(-) --- linux-tools-3.5/debian/bin/gencontrol.py 2011-08-07 15:47:52.000000000 +0000 +++ linux-tools-3.6.2/debian/bin/gencontrol.py 2012-06-24 00:40:09.000000000 +0000 @@ -39,6 +39,7 @@ def do_main_setup(self, vars, makeflags): makeflags.update({ 'VERSION': self.version.linux_version, + 'VERSION_DEBIAN': self.version.complete, 'UPSTREAMVERSION': self.version.linux_upstream, }) --- linux-tools-3.5/debian/bin/genorig.py 2012-08-19 22:07:31.000000000 +0000 +++ linux-tools-3.6.2/debian/bin/genorig.py 2012-06-20 04:14:45.000000000 +0000 @@ -47,12 +47,12 @@ class Main(object): - def __init__(self, input_files, override_version): + def __init__(self, input_files, override_version, override_tag): self.log = sys.stdout.write self.input_files = input_files - changelog = Changelog(version=VersionLinux)[0] + changelog = Changelog(version = VersionLinux)[0] source = changelog.source version = changelog.version @@ -67,12 +67,11 @@ self.orig = '%s-%s' % (source, version.upstream) self.orig_tar = '%s_%s.orig.tar.gz' % (source, version.upstream) - self.tag = 'v' + re.sub(r"^(\d+\.\d+)\.0", r"\1", - version.upstream.replace('~', '-')) + self.tag = override_tag or ('v' + version.upstream.replace('~', '-')) def __call__(self): import tempfile - self.dir = tempfile.mkdtemp(prefix='genorig', dir='debian') + self.dir = tempfile.mkdtemp(prefix = 'genorig', dir = 'debian') try: if os.path.isdir(self.input_files[0]): self.upstream_export(self.input_files[0]) @@ -102,7 +101,7 @@ def upstream_extract(self, input_tar): self.log("Extracting tarball %s\n" % input_tar) - match = re.match(r'(^|.*/)(?Plinux-\d+\.\d+(\.\d+)?(-\S+)?)\.tar(\.(?P(bz2|gz)))?$', input_tar) + match = re.match(r'(^|.*/)(?Plinux-\d+\.\d+\.\d+(-\S+)?)\.tar(\.(?P(bz2|gz)))?$', input_tar) if not match: raise RuntimeError("Can't identify name of tarball") @@ -146,6 +145,7 @@ 'arch/*/include/', 'arch/*/Makefile', 'arch/x86/lib/memcpy_64.S', + 'drivers/staging/usbip/userspace/', 'include/', 'lib/rbtree.c', 'scripts/', @@ -169,13 +169,11 @@ out = os.path.join("../orig", self.orig_tar) try: os.mkdir("../orig") - except OSError: - pass + except OSError: pass try: os.stat(out) raise RuntimeError("Destination already exists") - except OSError: - pass + except OSError: pass self.log("Generate tarball %s\n" % out) cmdline = ['tar -czf', out, '-C', self.dir, self.orig] try: @@ -185,19 +183,18 @@ except: try: os.unlink(out) - except OSError: - pass + except OSError: pass raise try: os.symlink(os.path.join('orig', self.orig_tar), os.path.join('..', self.orig_tar)) - except OSError: - pass + except OSError: pass if __name__ == '__main__': from optparse import OptionParser - parser = OptionParser(usage="%prog [OPTION]... {TAR [PATCH] | REPO}") - parser.add_option("-V", "--override-version", dest="override_version", help="Override version", metavar="VERSION") + parser = OptionParser(usage = "%prog [OPTION]... {TAR [PATCH] | REPO}") + parser.add_option("-V", "--override-version", dest = "override_version", help = "Override version", metavar = "VERSION") + parser.add_option("-t", "--override-tag", dest = "override_tag", help = "Override tag", metavar = "TAG") options, args = parser.parse_args() assert 1 <= len(args) <= 2 - Main(args, options.override_version)() + Main(args, options.override_version, options.override_tag)() --- linux-tools-3.5/debian/build/Makefile 2011-10-07 15:41:59.000000000 +0000 +++ linux-tools-3.6.2/debian/build/Makefile 2012-06-20 04:14:45.000000000 +0000 @@ -3,6 +3,7 @@ Makefile \ SUBDIRS = \ + drivers/staging/usbip \ scripts \ tools --- linux-tools-3.5/debian/build/drivers/staging/usbip/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ linux-tools-3.6.2/debian/build/drivers/staging/usbip/Makefile 2012-06-24 01:16:50.000000000 +0000 @@ -0,0 +1,24 @@ +srcdir := $(top_srcdir)/drivers/staging/usbip/userspace + +# Make sure we don't override top_srcdir in the sub-make. 'unexport +# top_srcdir' is *not* sufficient; nor is adding 'MAKEFLAGS=' to the +# sub-make command line. +unexport MAKEFLAGS + +all: + cd $(srcdir) && ./autogen.sh + mkdir -p userspace + cd userspace && $(srcdir)/configure \ + --prefix=/usr \ + --with-tcp-wrappers \ + --with-usbids-dir=/usr/share/misc \ + --disable-shared + $(MAKE) -C userspace + +install: + $(MAKE) -C userspace install + +clean: + rm -rf $(addprefix $(srcdir)/,autom4te.cache aclocal.m4 config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing) + find $(srcdir)/ -name Makefile.in -delete + rm -rf userspace --- linux-tools-3.5/debian/build/tools/perf/Makefile 2012-08-19 22:43:54.000000000 +0000 +++ linux-tools-3.6.2/debian/build/tools/perf/Makefile 2012-06-10 03:47:30.000000000 +0000 @@ -4,14 +4,10 @@ DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) -ifeq ($(DEB_HOST_ARCH_CPU),alpha) - KERNEL_ARCH_PERF = alpha -else ifeq ($(DEB_HOST_ARCH_CPU),amd64) +ifeq ($(DEB_HOST_ARCH_CPU),amd64) KERNEL_ARCH_PERF = x86 else ifeq ($(DEB_HOST_ARCH_CPU),arm) KERNEL_ARCH_PERF = arm -else ifeq ($(DEB_HOST_ARCH_CPU),hppa) - KERNEL_ARCH_PERF = parisc else ifeq ($(DEB_HOST_ARCH_CPU),i386) KERNEL_ARCH_PERF = x86 else ifeq ($(DEB_HOST_ARCH_CPU),powerpc) @@ -30,8 +26,7 @@ KERNEL_ARCH_PERF = sparc endif -# disable Gtk UI until it's more usable -MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_GTK2=1 NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error +MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error all: ifdef KERNEL_ARCH_PERF --- linux-tools-3.5/debian/changelog 2012-08-19 23:57:13.000000000 +0000 +++ linux-tools-3.6.2/debian/changelog 2012-10-19 06:37:54.000000000 +0000 @@ -1,24 +1,26 @@ -linux-tools (3.5-1~experimental.1) experimental; urgency=low +linux-tools (3.6.2-1) unstable; urgency=low - * New upstream release + * SprezzOS - -- Ben Hutchings Mon, 20 Aug 2012 00:57:12 +0100 + -- nick black Fri, 19 Oct 2012 02:37:33 -0400 -linux-tools (3.4-1~experimental.1) experimental; urgency=low +linux-tools (3.2.17-1) unstable; urgency=low - * New upstream release - * Build-Depend on bison and flex, now required to build perf - * Fix version insertion in perf man pages - - -- Ben Hutchings Sat, 09 Jun 2012 20:51:12 +0100 + * New upstream stable updates: + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.15 + - modpost: fix ALL_INIT_DATA_SECTIONS + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.16 + - perf hists: Catch and handle out-of-date hist entry maps. + http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.2.17 + - Perf: fix build breakage -linux-tools (3.3-1~experimental.1) experimental; urgency=low - - * New upstream release candidate - * linux-kbuild: debian/control: Set Multi-Arch: foreign - * linux-tools: Build perf on alpha and hppa (Closes: #664834) + * Fix version insertion in perf man pages + * Build usbip userland packages (Closes: #568362) + - Do not build a shared library package; the API and ABI have changed + from libusbip0 but there has been no upstream soversion change + * usbipd: Enable TCP wrappers for access control - -- Ben Hutchings Sat, 24 Mar 2012 23:15:59 +0000 + -- Ben Hutchings Sun, 24 Jun 2012 02:52:26 +0100 linux-tools (3.2.7-2) unstable; urgency=high --- linux-tools-3.5/debian/control 2012-08-19 23:57:34.000000000 +0000 +++ linux-tools-3.6.2/debian/control 2012-10-19 06:38:44.000000000 +0000 @@ -4,27 +4,57 @@ Maintainer: Debian Kernel Team Uploaders: Bastian Blank , Ben Hutchings Standards-Version: 3.9.2 -Build-Depends: debhelper (>> 7), python, asciidoc, binutils-dev, bison, flex, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto +Build-Depends: debhelper (>> 7), python, asciidoc, binutils-dev, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto, autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev, libwrap0-dev Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/ Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/ -Package: linux-kbuild-3.5 +Package: linux-kbuild-3.6 Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Kbuild infrastructure for Linux 3.5 +Description: Kbuild infrastructure for Linux 3.6 This package provides the kbuild infrastructure for the headers packages - for Linux kernel version 3.5. -Multi-Arch: ${linux-kbuild:Multi-Arch} + for Linux kernel version 3.6. -Package: linux-tools-3.5 +Package: linux-tools-3.6 Architecture: alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends} Recommends: linux-base (>= 3.4~) -Suggests: linux-doc-3.5 -Description: Performance analysis tools for Linux 3.5 +Suggests: linux-doc-3.6 +Description: Performance analysis tools for Linux 3.6 This package contains the 'perf' performance analysis tools for Linux - kernel version 3.5. + kernel version 3.6. . The linux-base package contains a 'perf' command which will invoke the appropriate version for the running kernel. +Package: libusbip-dev +Architecture: linux-any +Section: libdevel +Depends: ${misc:Depends} +Description: USB device sharing system over IP network (development files) + USB/IP is a system for sharing USB devices over the network. + . + This package provides headers for the libusbip library and the library + itself for static linking. + +Package: usbip +Architecture: linux-any +Section: admin +Depends: usbutils, ${shlibs:Depends}, ${misc:Depends} +Description: USB device sharing system over IP network + USB/IP is a system for sharing USB devices over the network. + . + To share USB devices between computers with their full functionality, + USB/IP encapsulates "USB requests" into IP packets and transmits them + between computers. + . + Original USB device drivers and applications can be used for remote USB + devices without any modification of them. A computer can use remote USB + devices as if they were directly attached. + . + Currently USB/IP provides no access control or encryption. It should only + be used in trusted environments. + . + This package provides the server component 'usbipd' and the client tool + 'usbip'. + --- linux-tools-3.5/debian/control.md5sum 2012-08-19 23:57:34.000000000 +0000 +++ linux-tools-3.6.2/debian/control.md5sum 2012-10-19 06:38:44.000000000 +0000 @@ -1,4 +1,4 @@ -57fe7e40fc35dbfe4f05a2a2fb2ca3a7 debian/bin/gencontrol.py -0f66cde9a5c71916b21d6a0a2917c38b debian/changelog -06b6989e88382b2b9f8b6991881cee79 debian/templates/control.main.in -4e8d83a6467e31b7252096862cf273fa debian/templates/control.source.in +23788524d7a1d1f9f865a96b03874afa debian/bin/gencontrol.py +3da39a3e363294a7535a122cf3661cf1 debian/changelog +c39777d6939a2b78ce5722f0ad5b4ba3 debian/templates/control.main.in +475b9f4fd0758a77eadd5b027dc53cb4 debian/templates/control.source.in --- linux-tools-3.5/debian/libusbip-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ linux-tools-3.6.2/debian/libusbip-dev.install 2012-06-20 05:38:23.000000000 +0000 @@ -0,0 +1,3 @@ +usr/lib/libusbip.la +usr/lib/libusbip.a +usr/include/usbip/* --- linux-tools-3.5/debian/libusbip-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ linux-tools-3.6.2/debian/libusbip-dev.lintian-overrides 2012-06-20 05:56:02.000000000 +0000 @@ -0,0 +1,3 @@ +# We only install a static library, and in this case the .la file is useful. +# This should be changed if and when we install a shared library. +non-empty-dependency_libs-in-la-file usr/lib/libusbip.la --- linux-tools-3.5/debian/patches/perf-Fix-include-order-for-bison-flex-generated-C-fi.patch 2012-08-19 23:51:01.000000000 +0000 +++ linux-tools-3.6.2/debian/patches/perf-Fix-include-order-for-bison-flex-generated-C-fi.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -From: Ben Hutchings -Date: Mon, 20 Aug 2012 00:35:01 +0100 -Subject: perf: Fix include order for bison/flex-generated C files - -When we use a separate output directory, we add util/ to the include -path for the generated C files. However, this is currently added to -the end of the path, behind /usr/include/slang and -/usr/include/gtk-2.0 if use of the respective libraries is enabled. -Thus the '#include "../perf.h"' in util/parse-events.l can actually -include /usr/include/perf.h if it exists. - -Move '-Iutil/' ahead of all the other preprocessor options. - -Reported-by: Sedat Dilek -Signed-off-by: Ben Hutchings ---- - tools/perf/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/perf/Makefile b/tools/perf/Makefile -index 0eee64c..434175c 100644 ---- a/tools/perf/Makefile -+++ b/tools/perf/Makefile -@@ -756,10 +756,10 @@ $(OUTPUT)perf.o perf.spec \ - # over the general rule for .o - - $(OUTPUT)util/%-flex.o: $(OUTPUT)util/%-flex.c $(OUTPUT)PERF-CFLAGS -- $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Iutil/ -w $< -+ $(QUIET_CC)$(CC) -o $@ -c -Iutil/ $(ALL_CFLAGS) -w $< - - $(OUTPUT)util/%-bison.o: $(OUTPUT)util/%-bison.c $(OUTPUT)PERF-CFLAGS -- $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -Iutil/ -w $< -+ $(QUIET_CC)$(CC) -o $@ -c -Iutil/ $(ALL_CFLAGS) -DYYENABLE_NLS=0 -DYYLTYPE_IS_TRIVIAL=0 -w $< - - $(OUTPUT)%.o: %.c $(OUTPUT)PERF-CFLAGS - $(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) $< --- linux-tools-3.5/debian/patches/series 2012-08-19 23:50:33.000000000 +0000 +++ linux-tools-3.6.2/debian/patches/series 2012-10-19 06:33:44.000000000 +0000 @@ -1,4 +1,6 @@ modpost-symbol-prefix.patch tools-perf-version.patch tools-perf-install.patch -perf-Fix-include-order-for-bison-flex-generated-C-fi.patch +usbip-update-man-pages.patch +#usbip-fix-explicit-configure-with-tcp-wrappers.patch +#usbip-document-tcp-wrappers.patch --- linux-tools-3.5/debian/patches/tools-perf-version.patch 2012-06-09 19:13:22.000000000 +0000 +++ linux-tools-3.6.2/debian/patches/tools-perf-version.patch 2012-06-09 19:18:58.000000000 +0000 @@ -1,6 +1,6 @@ --- a/tools/perf/Makefile +++ b/tools/perf/Makefile -@@ -939,7 +939,7 @@ +@@ -859,7 +859,7 @@ install: all $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' @@ -9,7 +9,7 @@ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace' $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin' $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' -@@ -959,7 +959,7 @@ +@@ -879,7 +879,7 @@ $(MAKE) -C Documentation install install-man: @@ -20,18 +20,18 @@ $(MAKE) -C Documentation install-html --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile -@@ -170,13 +170,15 @@ +@@ -156,13 +156,15 @@ install: install-man -install-man: man -+install-man: $(addprefix install-man-,$(_DOC_MAN1)) ++install-man: $(addprefix install-man-,$(DOC_MAN1)) + -+install-man-perf.1: $(OUTPUT)perf.1 ++install-man-perf.1: perf.1 + $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) + sed -e 's/"PERF"/"PERF_$(VERSION)"/' -e 's/fBperf-/fBperf_$(VERSION)-/g' $^ > $(DESTDIR)$(man1dir)/perf_$(VERSION).1 + -+install-man-perf%.1: $(OUTPUT)perf%.1 ++install-man-perf%.1: perf%.1 $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) -# $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) -# $(INSTALL) -d -m 755 $(DESTDIR)$(man7dir) --- linux-tools-3.5/debian/patches/usbip-document-tcp-wrappers.patch 1970-01-01 00:00:00.000000000 +0000 +++ linux-tools-3.6.2/debian/patches/usbip-document-tcp-wrappers.patch 2012-06-24 01:51:10.000000000 +0000 @@ -0,0 +1,27 @@ +From: Ben Hutchings +Subject: usbip: Document TCP wrappers + +Add references to TCP wrappers configuration in the manual page. + +--- a/drivers/staging/usbip/userspace/doc/usbipd.8 ++++ b/drivers/staging/usbip/userspace/doc/usbipd.8 +@@ -14,7 +14,8 @@ + before usbipd makes them available to other hosts. + + The daemon accepts connections from USB/IP clients +-on TCP port 3240. ++on TCP port 3240. The clients authorised to connect may be ++configured as documented in hosts_access(5). + + .SH OPTIONS + .HP +@@ -39,7 +40,8 @@ + + .B usbipd + offers no authentication or authorization for USB/IP. Any +-USB/IP client can connect and use exported devices. ++USB/IP client running on an authorised host can connect and ++use exported devices. + + .SH EXAMPLES + --- linux-tools-3.5/debian/patches/usbip-fix-explicit-configure-with-tcp-wrappers.patch 1970-01-01 00:00:00.000000000 +0000 +++ linux-tools-3.6.2/debian/patches/usbip-fix-explicit-configure-with-tcp-wrappers.patch 2012-06-24 01:33:24.000000000 +0000 @@ -0,0 +1,37 @@ +From: Ben Hutchings +Subject: usbip: Fix explicit configure --with-tcp-wrappers + +If the --with-tcp-wrappers[=yes] option is given and the wrap library +checks out, we currently add '-lwrap' to $LIBS but then reset it to +$saved_LIBS. In fact there is no need to save and restore $LIBS here +because failure is fatal. $wrap_LIB is also unused, so don't set that +either. + +--- a/drivers/staging/usbip/userspace/configure.ac ++++ b/drivers/staging/usbip/userspace/configure.ac +@@ -56,8 +56,7 @@ + [AS_HELP_STRING([--with-tcp-wrappers], + [use the libwrap (TCP wrappers) library])], + dnl [ACTION-IF-GIVEN] +- [saved_LIBS="$LIBS" +- if test "$withval" = "yes"; then ++ [if test "$withval" = "yes"; then + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([for hosts_access in -lwrap]) + LIBS="-lwrap $LIBS" +@@ -65,13 +64,11 @@ + [int hosts_access(); int allow_severity, deny_severity;], + [hosts_access()], + [AC_MSG_RESULT([yes]); +- AC_DEFINE([HAVE_LIBWRAP], [1], +- [use tcp wrapper]) wrap_LIB="-lwrap"], ++ AC_DEFINE([HAVE_LIBWRAP], [1], [use tcp wrapper])], + [AC_MSG_RESULT([not found]); exit 1]) + else + AC_MSG_RESULT([no]) +- fi +- LIBS="$saved_LIBS"], ++ fi], + dnl [ACTION-IF-NOT-GIVEN] + [AC_MSG_RESULT([(default)]) + AC_MSG_CHECKING([for hosts_access in -lwrap]) --- linux-tools-3.5/debian/patches/usbip-update-man-pages.patch 1970-01-01 00:00:00.000000000 +0000 +++ linux-tools-3.6.2/debian/patches/usbip-update-man-pages.patch 2012-06-24 01:38:09.000000000 +0000 @@ -0,0 +1,99 @@ +From: Ben Hutchings +Subject: Update man pages for merging of commands + +usbip_bind_driver (formerly usbip_attach_driver) was merged into the +usbip command. Remove the separate man page for it. Update examples +and references accordingly. +--- a/drivers/staging/usbip/userspace/Makefile.am ++++ b/drivers/staging/usbip/userspace/Makefile.am +@@ -3,4 +3,4 @@ + include_HEADERS := $(addprefix libsrc/, \ + usbip_common.h vhci_driver.h usbip_host_driver.h) + +-dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8) ++dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8) +--- a/drivers/staging/usbip/userspace/doc/usbip_bind_driver.8 ++++ /dev/null +@@ -1,42 +0,0 @@ +-.TH USBIP_BIND_DRIVER "8" "February 2009" "usbip" "System Administration Utilities" +-.SH NAME +-usbip_bind_driver \- change driver binding for USB/IP +- +-.SH SYNOPSIS +-.B usbip_bind_driver +-[\fIoptions\fR] +- +-.SH DESCRIPTION +-Driver bindings for USB devices can be changed using +-this program. It is used to export and unexport USB +-devices over USB/IP. +- +-.SH OPTIONS +-.TP +-\fB\-u\fR, \fB\-\-usbip\fR +-Make a device exportable +-.TP +-\fB\-o\fR, \fB\-\-other\fR +-Use a device by a local driver +-.TP +-\fB\-l\fR, \fB\-\-list\fR +-Print usb devices and their drivers +-.TP +-\fB\-L\fR, \fB\-\-list2\fR +-Print usb devices and their drivers in parseable mode +- +-.SH EXAMPLES +- +- server:# usbip_bind_driver --list +- - List driver assignments for usb devices. +- +- server:# usbip_bind_driver --usbip 1-2 +- - Bind usbip-host.ko to the device of busid 1-2. +- - A usb device 1-2 is now exportable to other hosts! +- +- server:# usbip_bind_driver --other 1-2 +- - Shutdown exporting and use the device locally. +- +-.SH "SEE ALSO" +-\fBusbip\fP\fB(8)\fB\fP, +-\fBusbipd\fP\fB(8)\fB\fP +--- a/drivers/staging/usbip/userspace/doc/usbip.8 ++++ b/drivers/staging/usbip/userspace/doc/usbip.8 +@@ -67,5 +67,4 @@ + - Detach the usb device. + + .SH "SEE ALSO" +-\fBusbipd\fP\fB(8)\fB\fP, +-\fBusbip_attach_driver\fP\fB(8)\fB\fP ++\fBusbipd\fP\fB(8)\fB\fP +--- a/drivers/staging/usbip/userspace/doc/usbipd.8 ++++ b/drivers/staging/usbip/userspace/doc/usbipd.8 +@@ -10,7 +10,7 @@ + provides USB/IP clients access to exported USB devices. + + Devices have to explicitly be exported using +-.B usbip_bind_driver ++.B usbip bind + before usbipd makes them available to other hosts. + + The daemon accepts connections from USB/IP clients +@@ -48,15 +48,14 @@ + server:# usbipd -D + - Start usbip daemon. + +- server:# usbip_bind_driver --list ++ server:# usbip list + - List driver assignments for usb devices. + +- server:# usbip_bind_driver --usbip 1-2 ++ server:# usbip bind -b 1-2 + - Bind usbip-host.ko to the device of busid 1-2. + - A usb device 1-2 is now exportable to other hosts! +- - Use 'usbip_bind_driver --other 1-2' when you want to shutdown exporting and use the device locally. ++ - Use 'usbip unbind -b 1-2' when you want to shutdown exporting and use the device locally. + + .SH "SEE ALSO" +-\fBusbip\fP\fB(8)\fB\fP, +-\fBusbip_attach_driver\fP\fB(8)\fB\fP ++\fBusbip\fP\fB(8)\fB\fP + --- linux-tools-3.5/debian/rules.gen 2012-08-19 23:57:34.000000000 +0000 +++ linux-tools-3.6.2/debian/rules.gen 2012-10-19 06:38:44.000000000 +0000 @@ -1,5 +1,5 @@ .NOTPARALLEL: binary-arch:: - $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='3.5' VERSION='3.5' + $(MAKE) -f debian/rules.real binary-arch VERSION_DEBIAN='3.6.2-1' VERSION='3.6' UPSTREAMVERSION='3.6' build:: - $(MAKE) -f debian/rules.real build UPSTREAMVERSION='3.5' VERSION='3.5' + $(MAKE) -f debian/rules.real build VERSION_DEBIAN='3.6.2-1' VERSION='3.6' UPSTREAMVERSION='3.6' --- linux-tools-3.5/debian/rules.real 2012-03-11 03:35:54.000000000 +0000 +++ linux-tools-3.6.2/debian/rules.real 2012-06-24 00:42:34.000000000 +0000 @@ -3,9 +3,8 @@ include debian/rules.defs DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) -HAVE_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) -binary-arch: install-kbuild +binary-arch: install-kbuild install-usbip ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),) binary-arch: install-tools endif @@ -24,11 +23,6 @@ dh_testdir dh_testroot dh_clean -k -d -ifneq (,$(HAVE_MULTIARCH)) - echo linux-kbuild:Multi-Arch=foreign >>debian/$(PACKAGE_NAME).substvars -else - echo linux-kbuild:Multi-Arch= >>debian/$(PACKAGE_NAME).substvars -endif $(MAKE) -C $(BUILD_DIR)/scripts install prefix=$(DIR) top_srcdir=$(CURDIR) dh_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME) dh_installchangelogs @@ -63,3 +57,24 @@ dh_md5sums dh_builddeb +install-usbip: DH_OPTIONS = -plibusbip-dev -pusbip +install-usbip: DIR = $(CURDIR)/debian/tmp +install-usbip: override VERSION := $(shell sed -ne 's,^#define PACKAGE_VERSION "\(.*\)"$$,\1,p' $(BUILD_DIR)/drivers/staging/usbip/userspace/config.h) +install-usbip: $(STAMPS_DIR)/build + dh_testdir + dh_testroot + dh_clean -k -d + $(MAKE) -C $(BUILD_DIR)/drivers/staging/usbip install top_srcdir=$(CURDIR) DESTDIR=$(DIR) + dh_install + dh_installchangelogs + dh_installdocs + dh_lintian + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + test -n "$(VERSION)" -a -n "$(VERSION_DEBIAN)" + dh_gencontrol -- -v$(VERSION)+$(VERSION_DEBIAN) + dh_md5sums + dh_builddeb --- linux-tools-3.5/debian/templates/control.main.in 2012-03-11 03:32:36.000000000 +0000 +++ linux-tools-3.6.2/debian/templates/control.main.in 2012-06-20 05:37:46.000000000 +0000 @@ -1,7 +1,6 @@ Package: linux-kbuild-@version@ Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} -Multi-Arch: ${linux-kbuild:Multi-Arch} Description: Kbuild infrastructure for Linux @version@ This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@. @@ -16,3 +15,35 @@ . The linux-base package contains a 'perf' command which will invoke the appropriate version for the running kernel. + +Package: libusbip-dev +Architecture: linux-any +Depends: ${misc:Depends} +Section: libdevel +Description: USB device sharing system over IP network (development files) + USB/IP is a system for sharing USB devices over the network. + . + This package provides headers for the libusbip library and + the library itself for static linking. + +Package: usbip +Architecture: linux-any +Depends: usbutils, ${shlibs:Depends}, ${misc:Depends} +Section: admin +Description: USB device sharing system over IP network + USB/IP is a system for sharing USB devices over the network. + . + To share USB devices between computers with their full + functionality, USB/IP encapsulates "USB requests" into IP + packets and transmits them between computers. + . + Original USB device drivers and applications can be used + for remote USB devices without any modification of them. A + computer can use remote USB devices as if they were + directly attached. + . + Currently USB/IP provides no access control or encryption. + It should only be used in trusted environments. + . + This package provides the server component 'usbipd' and the + client tool 'usbip'. --- linux-tools-3.5/debian/templates/control.source.in 2012-08-19 22:42:48.000000000 +0000 +++ linux-tools-3.6.2/debian/templates/control.source.in 2012-06-24 01:21:44.000000000 +0000 @@ -6,6 +6,7 @@ Standards-Version: 3.9.2 Build-Depends: debhelper (>> 7), python, - asciidoc, binutils-dev, bison, flex, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto + asciidoc, binutils-dev, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto, + autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev, libwrap0-dev Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/ Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/ --- linux-tools-3.5/debian/usbip.install 1970-01-01 00:00:00.000000000 +0000 +++ linux-tools-3.6.2/debian/usbip.install 2012-06-20 05:39:10.000000000 +0000 @@ -0,0 +1,4 @@ +usr/sbin/usbip +usr/sbin/usbipd +usr/share/man/man8/usbip.8 +usr/share/man/man8/usbipd.8