[kernel] r21956 - dists/trunk/linux-tools/debian/patches

[Ben Hutchings]

Author: benh
Date: Fri Oct 17 12:00:22 2014
New Revision: 21956

Log:
usbip: Include uninstalled <linux/usbip.h>

Added:
   dists/trunk/linux-tools/debian/patches/usbip-include-uninstalled-linux-usbip-h.patch
Modified:
   dists/trunk/linux-tools/debian/patches/series

Modified: dists/trunk/linux-tools/debian/patches/series
==============================================================================
--- dists/trunk/linux-tools/debian/patches/series	Fri Oct 17 11:51:05 2014	(r21955)
+++ dists/trunk/linux-tools/debian/patches/series	Fri Oct 17 12:00:22 2014	(r21956)
@@ -3,3 +3,4 @@
 tools-perf-install.patch
 usbip-document-tcp-wrappers.patch
 kbuild-fix-recordmcount-dependency.patch
+usbip-include-uninstalled-linux-usbip-h.patch

Added: dists/trunk/linux-tools/debian/patches/usbip-include-uninstalled-linux-usbip-h.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/patches/usbip-include-uninstalled-linux-usbip-h.patch	Fri Oct 17 12:00:22 2014	(r21956)
@@ -0,0 +1,27 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 17 Oct 2014 13:55:16 +0200
+Subject: usbip: Include uninstalled <linux/usbip.h>
+
+We need to include <linux/usbip.h> from the current kernel
+source, not the installed linux-libc-dev.  The clean way to
+do this is probably to run 'make headers_install' and then
+add $(top_srcdir)/usr/include to the front of the system
+header list.  But I don't have time to implement that right
+now.
+
+The wrong way to do it is to add include/uapi to the header
+path.  <linux/types.h> explicitly prevents this from working.
+But we can get away with selectively including UAPI headers
+without unifdef processing, so do that here.
+
+--- a/tools/usb/usbip/libsrc/usbip_common.h
++++ b/tools/usb/usbip/libsrc/usbip_common.h
+@@ -15,7 +15,7 @@
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <linux/usb/ch9.h>
+-#include <linux/usbip.h>
++#include "../../../../include/uapi/linux/usbip.h"
+ 
+ #ifndef USBIDS_FILE
+ #define USBIDS_FILE "/usr/share/hwdata/usb.ids"