[kernel] r21951 - in dists/trunk/linux-tools/debian: . bin build build/drivers build/tools build/tools/usb build/tools/usb/usbip patches

[Ben Hutchings]

Author: benh
Date: Fri Oct 17 09:58:05 2014
New Revision: 21951

Log:
Update to 3.17

usbip userspace moved to tools/usb/usbip.  Update genorig.py,
patch and makefiles accordingly.

Added:
   dists/trunk/linux-tools/debian/build/tools/usb/
      - copied from r21949, dists/trunk/linux-tools/debian/build/drivers/staging/
Deleted:
   dists/trunk/linux-tools/debian/build/drivers/
Modified:
   dists/trunk/linux-tools/debian/bin/genorig.py
   dists/trunk/linux-tools/debian/build/Makefile
   dists/trunk/linux-tools/debian/build/tools/Makefile
   dists/trunk/linux-tools/debian/build/tools/usb/usbip/Makefile
   dists/trunk/linux-tools/debian/changelog
   dists/trunk/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch

Modified: dists/trunk/linux-tools/debian/bin/genorig.py
==============================================================================
--- dists/trunk/linux-tools/debian/bin/genorig.py	Fri Oct 17 09:48:43 2014	(r21950)
+++ dists/trunk/linux-tools/debian/bin/genorig.py	Fri Oct 17 09:58:05 2014	(r21951)
@@ -144,8 +144,6 @@
                 'arch/*/Makefile',
                 'arch/x86/lib/memcpy_64.S',
                 'arch/x86/lib/memset_64.S',
-                'drivers/staging/usbip/uapi/',
-                'drivers/staging/usbip/userspace/',
                 'include/',
                 'lib/rbtree.c',
                 'scripts/',

Modified: dists/trunk/linux-tools/debian/build/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/Makefile	Fri Oct 17 09:48:43 2014	(r21950)
+++ dists/trunk/linux-tools/debian/build/Makefile	Fri Oct 17 09:58:05 2014	(r21951)
@@ -3,7 +3,6 @@
 	Makefile \
 
 SUBDIRS = \
-	drivers/staging/usbip \
 	scripts \
 	tools
 

Modified: dists/trunk/linux-tools/debian/build/tools/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/tools/Makefile	Fri Oct 17 09:48:43 2014	(r21950)
+++ dists/trunk/linux-tools/debian/build/tools/Makefile	Fri Oct 17 09:58:05 2014	(r21951)
@@ -1,4 +1,5 @@
 SUBDIRS = \
-	perf
+	perf \
+	usb/usbip
 
 include ../Makefile.inc

Modified: dists/trunk/linux-tools/debian/build/tools/usb/usbip/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/drivers/staging/usbip/Makefile	Wed Oct 15 07:13:24 2014	(r21949)
+++ dists/trunk/linux-tools/debian/build/tools/usb/usbip/Makefile	Fri Oct 17 09:58:05 2014	(r21951)
@@ -1,4 +1,4 @@
-srcdir := $(top_srcdir)/drivers/staging/usbip/userspace
+srcdir := $(top_srcdir)/tools/usb/usbip
 
 # Make sure we don't override top_srcdir in the sub-make.  'unexport
 # top_srcdir' is *not* sufficient; nor is adding 'MAKEFLAGS=' to the
@@ -7,18 +7,16 @@
 
 all:
 	cd $(srcdir) && ./autogen.sh
-	mkdir -p userspace
-	cd userspace && $(srcdir)/configure \
+	$(srcdir)/configure \
 		--prefix=/usr \
 		--with-tcp-wrappers \
 		--with-usbids-dir=/usr/share/misc \
 		--disable-shared
-	$(MAKE) -C userspace
+	$(MAKE)
 
 install:
-	$(MAKE) -C userspace install
+	$(MAKE) install
 
 clean:
 	rm -rf $(addprefix $(srcdir)/,autom4te.cache aclocal.m4 compile config.guess config.h.in config.sub configure depcomp install-sh ltmain.sh missing)
 	find $(srcdir)/ -name Makefile.in -delete
-	rm -rf userspace

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Fri Oct 17 09:48:43 2014	(r21950)
+++ dists/trunk/linux-tools/debian/changelog	Fri Oct 17 09:58:05 2014	(r21951)
@@ -1,3 +1,10 @@
+linux-tools (3.17-1~exp1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - usbip userspace moved to tools/usb/usbip
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 17 Oct 2014 11:49:02 +0200
+
 linux-tools (3.16-2) unstable; urgency=medium
 
   * linux-kbuild: Change the type headers used for devicetable-offsets.c

Modified: dists/trunk/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch
==============================================================================
--- dists/trunk/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch	Fri Oct 17 09:48:43 2014	(r21950)
+++ dists/trunk/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch	Fri Oct 17 09:58:05 2014	(r21951)
@@ -5,8 +5,8 @@
 
 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
+--- a/tools/usb/usbip/doc/usbipd.8
++++ b/tools/usb/usbip/doc/usbipd.8
 @@ -14,7 +14,8 @@ Devices have to explicitly be exported u
  before usbipd makes them available to other hosts.