← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/grub_probe_for_everyone.diff

  • Committer: Bazaar Package Importer
  • Author(s): Albin Tonnerre
  • Date: 2007-05-21 19:54:10 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070521195410-z0mmsqlbreyasqqn
Tags: 1.95+20070520-1ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - Disable stack protector.
  - Modify Maintainer value to match Debian-Maintainer-Field Spec

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/grub_probe_for_everyone.diff
 
1
diff -ur grub2-1.95+20070516.old/conf/powerpc-ieee1275.rmk grub2-1.95+20070516/conf/powerpc-ieee1275.rmk
 
2
--- grub2-1.95+20070516.old/conf/powerpc-ieee1275.rmk   2007-02-22 00:22:20.000000000 +0100
 
3
+++ grub2-1.95+20070516/conf/powerpc-ieee1275.rmk       2007-05-16 17:26:03.000000000 +0200
 
4
@@ -26,14 +26,27 @@
 
5
 
 
6
 # Utilities.
 
7
 bin_UTILITIES = grub-mkimage
 
8
+sbin_UTILITIES = grub-mkdevicemap grub-probe
 
9
 ifeq ($(enable_grub_emu), yes)
 
10
-sbin_UTILITIES = grub-emu
 
11
+sbin_UTILITIES += grub-emu
 
12
 endif
 
13
  
 
14
 # For grub-mkimage.
 
15
 grub_mkimage_SOURCES = util/powerpc/ieee1275/grub-mkimage.c util/misc.c \
 
16
         util/resolve.c 
 
17
 
 
18
+# For grub-mkdevicemap.
 
19
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/misc.c
 
20
+
 
21
+# For grub-probe.
 
22
+grub_probe_SOURCES = util/grub-probe.c \
 
23
+       util/biosdisk.c util/misc.c util/getroot.c      \
 
24
+       kern/device.c kern/disk.c kern/err.c kern/misc.c fs/fat.c       \
 
25
+       fs/ext2.c kern/parser.c kern/partition.c partmap/pc.c           \
 
26
+       partmap/gpt.c fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/fs.c   \
 
27
+       kern/env.c fs/fshelp.c fs/xfs.c fs/affs.c fs/sfs.c fs/hfsplus.c \
 
28
+       disk/lvm.c disk/raid.c
 
29
+
 
30
 # For grub-emu
 
31
 grub_emu_DEPENDENCIES = grub_script.tab.c grub_script.tab.h            \
 
32
        grub_modules_init.h