From 34e604bba2b1c4125f38f85967ac5d663a833573 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 1 Jun 2010 13:33:59 +0100 Subject: [PATCH] Always override statically-linked-binary Lintian tag for kernel.img; dynamic linking makes no sense here. --- debian/changelog | 7 +++++++ debian/rules | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7756c356a..a3c96655a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grub2 (1.98+20100527-2) UNRELEASED; urgency=low + + * Always override statically-linked-binary Lintian tag for kernel.img; + dynamic linking makes no sense here. + + -- Colin Watson Tue, 01 Jun 2010 13:31:46 +0100 + grub2 (1.98+20100527-1) unstable; urgency=low * New Bazaar snapshot. diff --git a/debian/rules b/debian/rules index 6b0ee818e..54b667134 100755 --- a/debian/rules +++ b/debian/rules @@ -122,11 +122,9 @@ install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-ieee12 mkdir -p $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides echo "$(subst install/,,$@): unstripped-binary-or-object *.mod" \ >> $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides/$(subst install/,,$@) - if [ "$@" != "install/grub-pc" ] && [ "$(DEB_HOST_ARCH_CPU)" != "sparc" ] && [ "$(DEB_HOST_ARCH_CPU)" != "mipsel" ] ; then \ - cd $(CURDIR)/debian/$(subst install/,,$@) && find ./usr/lib/grub -name kernel.img \ - | sed -e "s%.*%$(subst install/,,$@): statically-linked-binary &%g" \ - >> $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides/$(subst install/,,$@) ; \ - fi + cd $(CURDIR)/debian/$(subst install/,,$@) && find ./usr/lib/grub -name kernel.img \ + | sed -e "s%.*%$(subst install/,,$@): statically-linked-binary &%g" \ + >> $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides/$(subst install/,,$@) if [ "$@" = "install/grub-efi-amd64" ] && [ "$(DEB_HOST_ARCH_CPU)" = "i386" ] ; then \ echo "$(subst install/,,$@): binary-from-other-architecture *.mod" \ >> $(CURDIR)/debian/$(subst install/,,$@)/usr/share/lintian/overrides/$(subst install/,,$@) ; \