Bug#335038: grub: FTBFS with new dpkg version (DEB_BUILD_GNU_SYSTEM is 'linux-gnu' instead of 'linux' now)

[Andreas Jochens]

Package: grub
Version: 0.95+cvs20040624-17
Severity: serious
Tags: patch

When building 'grub' on amd64/unstable, I get the following error:

mkdir -p /grub-0.95+cvs20040624/debian/tmp/root/boot/grub
cp /grub-0.95+cvs20040624/debian/grub/lib/grub/*-*/{stage1,e2fs_stage1_5,stage2} \
	/grub-0.95+cvs20040624/docs/menu.lst \
	/grub-0.95+cvs20040624/debian/tmp/root/boot/grub
cp: cannot stat `/grub-0.95+cvs20040624/debian/grub/lib/grub/*-*/e2fs_stage1_5': No such file or directory
make: *** [install-indep] Error 1

With the attached patch 'grub' can be compiled on amd64.

The same problem also occurs on i386. However, on i386 grub has
additional build problems related to the use of gcc-4.0.

Regards
Andreas Jochens

diff -urN ../tmp-orig/grub-0.95+cvs20040624/debian/rules ./debian/rules
--- ../tmp-orig/grub-0.95+cvs20040624/debian/rules	2005-10-21 17:34:29.000000000 +0200
+++ ./debian/rules	2005-10-21 17:34:27.000000000 +0200
@@ -35,7 +35,7 @@
 GRUB_VERSION=0.95
 GRUB_DISK_IMAGE=grub-${GRUB_VERSION}-$(DEB_BUILD_GNU_CPU)-pc
 
-ifeq ($(DEB_BUILD_GNU_SYSTEM),linux)
+ifeq ($(DEB_BUILD_GNU_SYSTEM),linux-gnu)
 filesystems=e2fs jfs minix reiserfs xfs fat
 endif
 ifeq ($(DEB_BUILD_GNU_SYSTEM),gnu)