[REPOST, PATCH] builddeb: really include objtool binary in headers package

[REPOST, PATCH] builddeb: really include objtool binary in headers package

[Wilfried Klaebe]

On May 4th, Bjørn Mork provided patch
697bbc7b832048d3a679cd55caf2268a325efbe0 to include objtool binaries in
the 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>
---
 builddeb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 86e56fe..202d6e7 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"
-- 

[REPOST, PATCH] builddeb: really include objtool binary in headers package

[Wilfried Klaebe]

On May 4th, Bj�rn Mork provided patch
697bbc7b832048d3a679cd55caf2268a325efbe0 to include objtool binaries in
the 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>
---
 builddeb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 86e56fe..202d6e7 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"
-- 

Re: [REPOST, PATCH] builddeb: really include objtool binary in headers package

[Greg KH]

On Thu, Jun 23, 2016 at 09:44:22PM +0000, Wilfried Klaebe wrote:
> On May 4th, Bjørn Mork provided patch
> 697bbc7b832048d3a679cd55caf2268a325efbe0 to include objtool binaries in
> the 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>
> ---
>  builddeb |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)


<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
for how to do this properly.

</formletter>

Re: [REPOST, PATCH] builddeb: really include objtool binary in headers package

[Greg KH]

On Thu, Jun 23, 2016 at 09:44:22PM +0000, Wilfried Klaebe wrote:
> On May 4th, Bj�rn Mork provided patch
> 697bbc7b832048d3a679cd55caf2268a325efbe0 to include objtool binaries in
> the 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>
> ---
>  builddeb |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)


<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
for how to do this properly.

</formletter>

Re: [REPOST, PATCH] builddeb: really include objtool binary in headers package

[Bjørn Mork]

Wilfried Klaebe <linux-kernel@lebenslange-mailadresse.de> writes:

> On May 4th, Bjørn Mork provided patch
> 697bbc7b832048d3a679cd55caf2268a325efbe0 to include objtool binaries in
> the headers package. However, that one only works if $srctree=$objtree,
> because the objtool binaries are not written to the srctree, but
> to the objtree.

Ah, right - shows just how much I tested that :)

If you end up with a v2, then please add

  Fixes: 697bbc7b8320 ("builddeb: include objtool binary in headers package")

as well, so it's easier to automatically map your fix against the buggy
commit. I'll leave it to Michal and you to decide whether this is worth
a v2 or not...

Thanks for fixing this.


Bjørn