Commit 15f6d337 authored by Wilfried Klaebe's avatar Wilfried Klaebe Committed by Michal Marek
Browse files

builddeb: really include objtool binary in headers package 



On May 4th, Bjørn Mork provided patch 697bbc7b ("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: default avatarWilfried Klaebe <linux-kernel@lebenslange-mailadresse.de>
Fixes: 697bbc7b ("builddeb: include objtool binary in headers package")
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
parent b7b2ee41

scripts/package/builddeb

+3 −3
Original line number Diff line number Diff line
@@ -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"

CRA Git | Maintained and supported by SUSTech CRA and CCSE