← Back to branch summary

~ubuntu-branches/debian/sid/grub2/sid-200907171837

« back to all changes in this revision

Viewing changes to debian/patches/01_fix_grub-install.patch

  • Committer: Bazaar Package Importer
  • Author(s): Otavio Salvador
  • Date: 2006-06-10 19:57:01 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060610195701-2khcfacexb229tq4
Tags: 1.94-3
http://bugs.debian.org/372548
Fix FTBFS in amd64. Closes: 372548

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_fix_grub-install.patch
1
 
diff -Nur grub2-1.92/util/i386/pc/grub-install.in grub2-1.92.new/util/i386/pc/grub-install.in
2
 
--- grub2-1.92/util/i386/pc/grub-install.in     2005-08-07 14:02:35.000000000 -0300
3
 
+++ grub2-1.92.new/util/i386/pc/grub-install.in 2006-01-06 09:46:07.730083392 -0200
4
 
@@ -20,6 +20,7 @@
5
 
 # Initialize some variables.
6
 
 prefix=@prefix@
7
 
 exec_prefix=@exec_prefix@
8
 
+bindir=@bindir@
9
 
 sbindir=@sbindir@
10
 
 datadir=@datadir@
11
 
 PACKAGE_NAME=@PACKAGE_NAME@
12
 
@@ -31,7 +32,7 @@
13
 
 pkgdatadir=${datadir}/${PACKAGE_TARNAME}/${host_cpu}-${host_vendor}
14
 
 
15
 
 grub_setup=${sbindir}/grub-setup
16
 
-grub_mkimage=${sbindir}/grub-mkimage
17
 
+grub_mkimage=${bindir}/grub-mkimage
18
 
 grub_mkdevicemap=${sbindir}/grub-mkdevicemap
19
 
 grub_probefs=${sbindir}/grub-probefs
20
 
 rootdir=
21
 
@@ -210,7 +211,7 @@
22
 
 fs_module=`$grub_probefs --device-map=${device_map} ${grubdir}`
23
 
 if test "x$fs_module" = x -a "x$modules" = x; then
24
 
     echo "Auto-detection of a filesystem module failed." 1>&2
25
 
-    echo "Please specify the module with the option `--modules' explicitly." 1>&2
26
 
+    echo "Please specify the module with the option \`--modules' explicitly." 1>&2
27
 
     exit 1
28
 
 fi
29
 
 
 
1
diff -Nur grub2-1.94/conf/powerpc-ieee1275.rmk grub2-1.94.new/conf/powerpc-ieee1275.rmk
 
2
--- grub2-1.94/conf/powerpc-ieee1275.rmk        2006-05-28 20:01:43.000000000 -0300
 
3
+++ grub2-1.94.new/conf/powerpc-ieee1275.rmk    2006-06-07 21:32:59.000000000 -0300
 
4
@@ -26,9 +26,9 @@
 
5
 pkgdata_PROGRAMS = kernel.elf
 
6
 
 
7
 # Utilities.
 
8
-bin_UTILITIES = grub-emu
 
9
-sbin_UTILITIES = grub-mkimage
 
10
-
 
11
+bin_UTILITIES = grub-mkimage
 
12
+sbin_UTILITIES = grub-emu 
 
13
+ 
 
14
 # For grub-mkimage.
 
15
 grub_mkimage_SOURCES = util/powerpc/ieee1275/grub-mkimage.c util/misc.c \
 
16
         util/resolve.c