diff options
| author | Bjørn Mork <bjorn@mork.no> | 2016-05-04 15:35:39 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2016-05-10 17:41:01 +0200 |
| commit | 697bbc7b832048d3a679cd55caf2268a325efbe0 (patch) | |
| tree | 4ff39808789fe338db50a029902f24ec8be24249 | |
| parent | 27c3bffd230abd0a598586aed0fe0ba7b61e0e2e (diff) | |
| download | linux-697bbc7b832048d3a679cd55caf2268a325efbe0.tar.gz linux-697bbc7b832048d3a679cd55caf2268a325efbe0.tar.bz2 linux-697bbc7b832048d3a679cd55caf2268a325efbe0.zip | |
builddeb: include objtool binary in headers package
"objtool" is required for building external m dules if "Compile-time
stack metadata validation" is enabled. Otherwise all builds based
on the headers package fail with:
make[1]: Entering directory '/usr/src/linux-headers-4.6.0-rc6'
make[2]: *** No rule to make target 'tools/objtool/objtool', needed by 'foo.o'. Stop.
Makefile:1598: recipe for target 'foo.ko' failed
make[1]: *** [foo.ko] Error 2
make[1]: Leaving directory '/usr/src/linux-headers-4.6.0-rc6'
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Michal Marek <mmarek@suse.com>
| -rwxr-xr-x | scripts/package/builddeb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 6c3b038ef40d..93d3b157298d 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -322,6 +322,9 @@ fi # Build kernel header package (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles" +if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then + (cd $srctree; find tools/objtool -type f -executable) >> "$objtree/debian/hdrsrcfiles" +fi (cd $srctree; find arch/$SRCARCH/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles" (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles" (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles" |