| From 15f6d337159b2a9fdad8c0bef50ec826593ed5d2 Mon Sep 17 00:00:00 2001 |
| From: Wilfried Klaebe <linux-kernel@lebenslange-mailadresse.de> |
| Date: Tue, 28 Jun 2016 12:21:33 +0000 |
| Subject: builddeb: really include objtool binary in headers package |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Wilfried Klaebe <linux-kernel@lebenslange-mailadresse.de> |
| |
| commit 15f6d337159b2a9fdad8c0bef50ec826593ed5d2 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| scripts/package/builddeb | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- 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" |
