diff options
| author | Wilfried Klaebe <linux-kernel@lebenslange-mailadresse.de> | 2016-06-28 12:21:33 +0000 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2016-07-19 11:19:27 +0200 |
| commit | 15f6d337159b2a9fdad8c0bef50ec826593ed5d2 (patch) | |
| tree | 57c45e86bc0fcb560f04952c4d6c737e2f678684 /scripts | |
| parent | b7b2ee41f300b69c67c798df0cd5b8648bcb26a3 (diff) | |
| download | lwn-15f6d337159b2a9fdad8c0bef50ec826593ed5d2.tar.gz lwn-15f6d337159b2a9fdad8c0bef50ec826593ed5d2.zip | |
builddeb: really include objtool binary in headers package
On May 4th, Bjørn Mork provided patch 697bbc7b8320 ("builddeb: include
objtool binary in headers package"). However, that one only works if
$srctree=$objtree, because the objtool binaries are not written to the
srctree, but to the objtree.
Signed-off-by: Wilfried Klaebe <linux-kernel@lebenslange-mailadresse.de>
Fixes: 697bbc7b8320 ("builddeb: include objtool binary in headers package")
Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/package/builddeb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 86e56fef7473..202d6e7db859 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -322,12 +322,12 @@ 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/*/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" +if grep -q '^CONFIG_STACK_VALIDATION=y' $KCONFIG_CONFIG ; then + (cd $objtree; find tools/objtool -type f -executable) >> "$objtree/debian/hdrobjfiles" +fi (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles" destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" |