Control: tag -1 upstream patch On Fri, 03 Mar 2017 23:10:56 +0530 Ritesh Raj Sarraf <rrs@debian.org> wrote: [...] > Dear (Linux) Kernel Team: > > We currently have systemtap 3.0 in Debian testing where this problem was > reported. > > In Experimental, I have also pushed the 3.1 release. The 3.1 release is reported > to work perfectly in our tests with the custom built kernel. The problem is only > seen with the Debian built Linux kernels. [...] I investigated this and found that it occurs when the kernel source and object trees are separate (an "out-of-tree" build, not to be confused with out-of-tree modules). We separate them in Debian kernel header packages to avoid duplicating source files for each flavour. When this is the case, the compiler is called in the root of the object tree, and the kernel build system adjusts -I options in the compiler flags to refer to subdirectories of the source tree if necessary. Any directory name beginning with /, ./ or ../ is excluded from this adjustment. systemtap uses -I"/usr/share/systemtap/runtime", which ought to be excluded... but make has no understanding of shell quoting, so it is wrongly adjusted to something like -I/usr/src/linux-headers-4.9.0-2-common/"/usr/share/systemtap/runtime" and runtime_defines.h cannot be found. So my fix is to delete quotes before checking for the exclusions: --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -206,7 +206,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj # Prefix -I with $(srctree) if it is not an absolute path. # skip if -I has no parameter addtree = $(if $(patsubst -I%,%,$(1)), \ -$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1))) +$(if $(filter-out -I/% -I./% -I../%,$(subst $(quote),,$(subst $(squote),,$(1)))),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1))) # Find all -I options and call addtree flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o))) --- END --- Ben. -- Ben Hutchings All the simple programs have been written, and all the good names taken.
Attachment:
signature.asc
Description: This is a digitally signed message part