← Back to branch summary

~ubuntu-core-dev/ubuntu/maverick/grub2/maverick

« back to all changes in this revision

Viewing changes to debian/patches/enable_zfs.patch

  • Committer: Colin Watson
  • Date: 2010-09-19 22:54:11 UTC
  • mfrom: (1892.1.300 grub)
  • Revision ID: cjwatson@canonical.com-20100919225411-9d09pttxo2ry5rfb
merge from Debian 1.98+20100804-5

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/enable_zfs.patch
1
1
Description: Enable ZFS support in grub-probe and grub-setup
2
2
Author: Robert Millan <rmh@debian.org>
3
3
Forwarded: not-needed
4
 
Last-Update: 2010-07-29
 
4
Last-Update: 2010-09-10
5
5
 
6
6
--- a/conf/common.rmk   2010-07-06 18:27:55 +0000
7
7
+++ b/conf/common.rmk   2010-07-29 14:19:10 +0000
35
35
        kern/partition.c partmap/msdos.c partmap/bsdlabel.c             \
36
36
        partmap/apple.c partmap/sun.c partmap/sunpc.c partmap/gpt.c     \
37
37
        kern/fs.c kern/env.c fs/fshelp.c disk/raid.c                    \
38
 
 
 
38
        disk/raid5_recover.c disk/raid6_recover.c                       \
 
39
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \
 
40
        grub_fstest_init.c
 
41
+grub_fstest_CFLAGS = -I$(GRUB_CONTRIB)/zfs/include
 
42
 
 
43
 # For grub-mkfont.
 
44
 ifeq ($(enable_grub_mkfont), yes)
39
45
--- a/conf/i386-pc.rmk  2010-07-06 18:27:55 +0000
40
46
+++ b/conf/i386-pc.rmk  2010-07-29 14:19:31 +0000
41
47
@@ -75,6 +75,12 @@