From 7200ab2935278b3e7ad402bd5b85c77f05e35582 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Tue, 4 Apr 2017 16:27:00 +0200 Subject: [PATCH] usb_drv: disambiguate header scan locations When creating a source archive for the USB driver, both the contrib and Genode-specific source codes are merged into a single directory structure. In this case, the original way of determining the Linux source code to scan for #include directives would apply the scanning to Genode-specific source codes too. This patch tightens the search criterion such that only Linux source codes are processed. --- repos/dde_linux/lib/mk/usb_include.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/repos/dde_linux/lib/mk/usb_include.mk b/repos/dde_linux/lib/mk/usb_include.mk index 821e08361..8f77b113e 100644 --- a/repos/dde_linux/lib/mk/usb_include.mk +++ b/repos/dde_linux/lib/mk/usb_include.mk @@ -7,7 +7,9 @@ LX_EMUL_H := $(REP_DIR)/src/lib/usb/include/lx_emul.h # Determine the header files included by the contrib code. For each # of these header files we create a symlink to 'lx_emul.h'. # -GEN_INCLUDES := $(shell grep -rIh "^\#include .*\/" $(USB_CONTRIB_DIR) |\ +SCAN_DIRS := $(addprefix $(USB_CONTRIB_DIR)/include/, asm-generic linux scsi uapi) \ + $(addprefix $(USB_CONTRIB_DIR)/, drivers lib) +GEN_INCLUDES := $(shell grep -rIh "^\#include .*\/" $(SCAN_DIRS) |\ sed "s/^\#include [^<\"]*[<\"]\([^>\"]*\)[>\"].*/\1/" |\ sort | uniq) #