Bug#961299: [PATCH] Don't run dh_strip on vmlinuz

From	Ben Hutchings <ben@decadent.org.uk>
Newsgroups	linux.debian.bugs.dist, linux.debian.kernel
Subject	Bug#961299: [PATCH] Don't run dh_strip on vmlinuz
Date	2020-05-26 13:00 +0200
Message-ID	<AaFtn-129-7@gated-at.bofh.it> (permalink)
References	<AarA6-1ks-13@gated-at.bofh.it> <AarA6-1ks-15@gated-at.bofh.it> <AarA6-1ks-13@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Cross-posted to 2 groups.

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

On Mon, 2020-05-25 at 22:06 +0200, Helge Deller wrote:
> The debian kernel build switched to use debhelper
> compatibility level 12 with this commit:
> 
> commit 59a5af36cbf1cc01ef48b91719f999a699d99fab
> Author: Ben Hutchings <ben@decadent.org.uk>
> Date:   Sun Apr 19 19:49:03 2020 +0100
>     debhelper started complaining about level 9, so it's time to upgrade
>     again.
> 
> This change broke the kernel build on the hppa architecture.
> Since compat level 12, dh_strip runs the "strip" command on any vmlinuz*
> files, which wasn't the case before.
> On hppa the 64-bit build needs to run "hppa64-linux-strip" instead of
> "strip".
> 
> Fix it by adding "vmlinuz" to the exclude list of dh_strip, and thus
> behave as compat level 9 did before.
> 
> Tested on hppa and x86-64.
> Ok to commit, or any other idea on how to fix it?

Looks good to me.  Remember to update debian/changelog as well.

Ben.

> Helge
> 
> 
> diff --git a/debian/rules.real b/debian/rules.real
> index e73588b4093c..af1d246f3b27 100644
> --- a/debian/rules.real
> +++ b/debian/rules.real
> @@ -447,7 +447,7 @@ endif
>  	+$(MAKE_SELF) \
>  	  install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_bug \
>  	  PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
> -	dh_strip --no-automatic-dbgsym -Xvmlinux
> +	dh_strip --no-automatic-dbgsym -Xvmlinux -Xvmlinuz
>  	ln -sf linux-image.NEWS debian/$(PACKAGE_NAME).NEWS
>  	+$(MAKE_SELF) install-base
> 
-- 
Ben Hutchings
Editing code like this is akin to sticking plasters on the bleeding
stump of a severed limb. - me, 29 June 1999

Back to linux.debian.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Bug#961299: [PATCH] Don't run dh_strip on vmlinuz Helge Deller <deller@gmx.de> - 2020-05-25 22:10 +0200
  Bug#961299: [PATCH] Don't run dh_strip on vmlinuz Ben Hutchings <ben@decadent.org.uk> - 2020-05-26 13:00 +0200

csiph-web