From 90fbb6433381613859710d54da597b164039b919 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Fri, 17 Oct 2014 09:58:05 +0000
Subject: [PATCH] Update to 3.17

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

svn path=/dists/trunk/linux-tools/; revision=21951
---
 debian/bin/genorig.py                                  |  2 --
 debian/build/Makefile                                  |  1 -
 debian/build/tools/Makefile                            |  3 ++-
 .../{drivers/staging => tools/usb}/usbip/Makefile      | 10 ++++------
 debian/changelog                                       |  7 +++++++
 debian/patches/usbip-document-tcp-wrappers.patch       |  4 ++--
 6 files changed, 15 insertions(+), 12 deletions(-)
 rename debian/build/{drivers/staging => tools/usb}/usbip/Makefile (74%)

diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py
index 668e82760..5773e5fcf 100755
--- a/debian/bin/genorig.py
+++ b/debian/bin/genorig.py
@@ -144,8 +144,6 @@ class Main(object):
                 '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/',
diff --git a/debian/build/Makefile b/debian/build/Makefile
index c14458250..970d4e4c7 100644
--- a/debian/build/Makefile
+++ b/debian/build/Makefile
@@ -3,7 +3,6 @@ DATA = \
 	Makefile \
 
 SUBDIRS = \
-	drivers/staging/usbip \
 	scripts \
 	tools
 
diff --git a/debian/build/tools/Makefile b/debian/build/tools/Makefile
index 561fc1f61..bb530cbbe 100644
--- a/debian/build/tools/Makefile
+++ b/debian/build/tools/Makefile
@@ -1,4 +1,5 @@
 SUBDIRS = \
-	perf
+	perf \
+	usb/usbip
 
 include ../Makefile.inc
diff --git a/debian/build/drivers/staging/usbip/Makefile b/debian/build/tools/usb/usbip/Makefile
similarity index 74%
rename from debian/build/drivers/staging/usbip/Makefile
rename to debian/build/tools/usb/usbip/Makefile
index 59992d7b9..294766806 100644
--- a/debian/build/drivers/staging/usbip/Makefile
+++ b/debian/build/tools/usb/usbip/Makefile
@@ -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 @@ unexport MAKEFLAGS
 
 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
diff --git a/debian/changelog b/debian/changelog
index 14025d861..564642622 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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
diff --git a/debian/patches/usbip-document-tcp-wrappers.patch b/debian/patches/usbip-document-tcp-wrappers.patch
index 10ef542e3..d9d7b301d 100644
--- a/debian/patches/usbip-document-tcp-wrappers.patch
+++ b/debian/patches/usbip-document-tcp-wrappers.patch
@@ -5,8 +5,8 @@ Forwarded: no
 
 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.