From 5213ff48709971432a242fd34fa7c0160a90f69f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 17 Oct 2014 12:00:22 +0000 Subject: [PATCH] usbip: Include uninstalled svn path=/dists/trunk/linux-tools/; revision=21956 --- debian/patches/series | 1 + ...ip-include-uninstalled-linux-usbip-h.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 debian/patches/usbip-include-uninstalled-linux-usbip-h.patch diff --git a/debian/patches/series b/debian/patches/series index 413b05d9e..cd239c608 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ tools-perf-version.patch tools-perf-install.patch usbip-document-tcp-wrappers.patch kbuild-fix-recordmcount-dependency.patch +usbip-include-uninstalled-linux-usbip-h.patch diff --git a/debian/patches/usbip-include-uninstalled-linux-usbip-h.patch b/debian/patches/usbip-include-uninstalled-linux-usbip-h.patch new file mode 100644 index 000000000..aec6cb898 --- /dev/null +++ b/debian/patches/usbip-include-uninstalled-linux-usbip-h.patch @@ -0,0 +1,27 @@ +From: Ben Hutchings +Date: Fri, 17 Oct 2014 13:55:16 +0200 +Subject: usbip: Include uninstalled + +We need to include 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. 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 + #include + #include +-#include ++#include "../../../../include/uapi/linux/usbip.h" + + #ifndef USBIDS_FILE + #define USBIDS_FILE "/usr/share/hwdata/usb.ids"