diff --git a/debian/grub-xen-host.lintian-overrides b/debian/grub-xen-host.lintian-overrides index 846b4ce88..7af919ff6 100644 --- a/debian/grub-xen-host.lintian-overrides +++ b/debian/grub-xen-host.lintian-overrides @@ -1,3 +1,3 @@ -grub-xen-host: statically-linked-binary usr/lib/grub-xen/grub-i386-xen.bin -grub-xen-host: statically-linked-binary usr/lib/grub-xen/grub-i386-xen_pvh.bin -grub-xen-host: statically-linked-binary usr/lib/grub-xen/grub-x86_64-xen.bin +grub-xen-host: statically-linked-binary [usr/lib/grub-xen/grub-i386-xen.bin] +grub-xen-host: statically-linked-binary [usr/lib/grub-xen/grub-i386-xen_pvh.bin] +grub-xen-host: statically-linked-binary [usr/lib/grub-xen/grub-x86_64-xen.bin] diff --git a/debian/rules b/debian/rules index 04b346f23..eb892e1e6 100755 --- a/debian/rules +++ b/debian/rules @@ -404,21 +404,21 @@ install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-efi-ia xargs -0r chmod -x mkdir -p debian/$(package_bin)/usr/share/lintian/overrides - echo "$(package_bin): unstripped-binary-or-object *.mod" \ + echo "$(package_bin): unstripped-binary-or-object [*.mod]" \ >> debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin) cd debian/tmp-$(package) && find usr/lib/grub -name kernel.img \ - | sed -e "s%.*%$(package_bin): statically-linked-binary &%g" \ + | sed -e "s%.*%$(package_bin): statically-linked-binary [&]%g" \ >> $(CURDIR)/debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin) cd debian/tmp-$(package) && find usr/lib/grub -name kernel.img \ - | sed -e "s%.*%$(package_bin): unstripped-binary-or-object &%g" \ + | sed -e "s%.*%$(package_bin): unstripped-binary-or-object [&]%g" \ >> $(CURDIR)/debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin) if ([ "$@" = "install/grub-efi-amd64" ] && [ "$(DEB_HOST_ARCH_CPU)" = "i386" ]) || \ ([ "$@" != "install/grub-emu" ] && [ "$(DEB_HOST_ARCH_CPU):$(DEB_HOST_ARCH_BITS)" = "amd64:32" ]) || \ [ "$@" = "install/grub-xen" ]; then \ - echo "$(package_bin): binary-from-other-architecture *.mod" \ + echo "$(package_bin): binary-from-other-architecture [*.mod]" \ >> debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin) ; \ cd debian/tmp-$(package) && find usr/lib/grub -name kernel.img \ - | sed -e "s%.*%$(package_bin): binary-from-other-architecture &%g" \ + | sed -e "s%.*%$(package_bin): binary-from-other-architecture [&]%g" \ >> $(CURDIR)/debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin) ; \ fi if ([ "$@" = "install/grub-pc" ] || \ @@ -428,36 +428,36 @@ install/grub-pc install/grub-efi-ia32 install/grub-efi-amd64 install/grub-efi-ia [ "$@" = "install/grub-emu" ]) && \ [ "$(DEB_HOST_ARCH_OS)" = "linux" ] && \ [ "$(DEB_HOST_ARCH_CPU):$(DEB_HOST_ARCH_BITS)" != "amd64:64" ] ; then \ - echo "$(package_bin): binary-from-other-architecture *efiemu64.o" \ + echo "$(package_bin): binary-from-other-architecture [*efiemu64.o]" \ >> debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin) ; \ fi case $@ in \ install/grub-efi*) \ (echo "# These aren't Windows executables, and these features wouldn't be very useful." \ - echo "$(package_bin): portable-executable-missing-security-features *.efi ASLR DEP/NX") \ + echo "$(package_bin): portable-executable-missing-security-features [*.efi ASLR DEP/NX") \ >> debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin) ;; \ esac if [ "$@" = "install/grub-emu" ]; then \ (echo "# This seems to be due to a readelf bug: https://bugs.debian.org/929585"; \ - echo "$(package_bin): binary-or-shlib-defines-rpath usr/lib/grub/*-emu/macho.mod 0x0") \ + echo "$(package_bin): binary-or-shlib-defines-rpath [usr/lib/grub/*-emu/macho.mod] 0x0") \ >> debian/$(package_bin)/usr/share/lintian/overrides/$(package_bin); \ fi mkdir -p debian/$(package_dbg)/usr/share/lintian/overrides - echo "$(package_dbg): unstripped-binary-or-object *.module" \ + echo "$(package_dbg): unstripped-binary-or-object [*.module]" \ >> debian/$(package_dbg)/usr/share/lintian/overrides/$(package_dbg) - echo "$(package_dbg): statically-linked-binary *.image" \ + echo "$(package_dbg): statically-linked-binary [*.image]" \ >> debian/$(package_dbg)/usr/share/lintian/overrides/$(package_dbg) cd debian/tmp-$(package) && find usr/lib/grub -name kernel.exec \ - | sed -e "s%.*%$(package_dbg): statically-linked-binary &%g" \ + | sed -e "s%.*%$(package_dbg): statically-linked-binary [&]%g" \ >> $(CURDIR)/debian/$(package_dbg)/usr/share/lintian/overrides/$(package_dbg) if ([ "$@" = "install/grub-efi-amd64" ] && [ "$(DEB_HOST_ARCH_CPU)" = "i386" ]) || \ ([ "$@" != "install/grub-emu" ] && [ "$(DEB_HOST_ARCH_CPU):$(DEB_HOST_ARCH_BITS)" = "amd64:32" ]) || \ [ "$@" = "install/grub-xen" ] ; then \ - echo "$(package_dbg): binary-from-other-architecture *.module" \ + echo "$(package_dbg): binary-from-other-architecture [*.module]" \ >> debian/$(package_dbg)/usr/share/lintian/overrides/$(package_dbg) ; \ cd debian/tmp-$(package) && find usr/lib/grub -name kernel.exec \ - | sed -e "s%.*%$(package_dbg): binary-from-other-architecture &%g" \ + | sed -e "s%.*%$(package_dbg): binary-from-other-architecture [&]%g" \ >> $(CURDIR)/debian/$(package_dbg)/usr/share/lintian/overrides/$(package_dbg) ; \ fi