[PATCH 1/2] config support for btrfs

grub-devel
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] config support for btrfs

From:	Surbhi Palande
Subject:	[PATCH 1/2] config support for btrfs
Date:	Mon, 5 Jul 2010 16:47:12 +0300
From: surbhi <address@hidden>

Signed-off-by: surbhi <address@hidden>
---
 conf/common.rmk           |   40 ++++++++++++++++++++--------------------
 conf/i386-pc.rmk          |    4 ++--
 conf/sparc64-ieee1275.rmk |    5 ++---
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 1af14f7..f4532f4 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -33,7 +33,7 @@ grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c      
\
        fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c  \
        fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c       \
        fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c           \
-       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c             \
+       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c fs/btrfs.c  \
        \
        partmap/msdos.c partmap/bsdlabel.c partmap/apple.c \
        partmap/sun.c partmap/sunpc.c partmap/gpt.c \
@@ -57,7 +57,7 @@ grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c 
kern/emu/hostfs.c \
        fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c          \
        fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c      \
        fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c fs/befs.c      \
-       fs/befs_be.c fs/tar.c                   \
+       fs/befs_be.c fs/tar.c fs/btrfs.c                                \
        \
        kern/partition.c partmap/msdos.c partmap/bsdlabel.c             \
        partmap/apple.c partmap/sun.c partmap/sunpc.c partmap/gpt.c     \
@@ -69,8 +69,7 @@ grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c 
kern/emu/hostfs.c \
 # For grub-mkfont.
 ifeq ($(enable_grub_mkfont), yes)
 bin_UTILITIES += grub-mkfont
-grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c \
-       unidata.c kern/emu/misc.c
+grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c 
kern/emu/misc.c
 grub_mkfont_CFLAGS = $(freetype_cflags)
 grub_mkfont_LDFLAGS = $(freetype_libs)
 endif
@@ -96,7 +95,6 @@ grub_script_check_SOURCES = gnulib/progname.c 
gnulib/getdelim.c gnulib/getline.c
        kern/misc.c kern/env.c grub_script.tab.c \
        grub_script.yy.c
 grub_script_check_CFLAGS = $(GNULIB_UTIL_CFLAGS)
-grub_script_check_DEPENDENCIES = grub_script.tab.h
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
@@ -207,9 +205,6 @@ grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom 
41_custom
 ifneq (, $(host_kernel))
 grub-mkconfig_SCRIPTS += 10_$(host_kernel)
 endif
-ifeq (linux, $(host_kernel))
-grub-mkconfig_SCRIPTS += 20_linux_xen
-endif
 
 CLEANFILES += $(grub-mkconfig_SCRIPTS)
 
@@ -233,7 +228,7 @@ CLEANFILES += grub-reboot
 pkglib_MODULES += fshelp.mod fat.mod ufs1.mod ufs2.mod ext2.mod ntfs.mod \
        ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod      \
        affs.mod sfs.mod hfsplus.mod reiserfs.mod cpio.mod tar.mod      \
-       udf.mod afs.mod afs_be.mod befs.mod befs_be.mod
+       udf.mod afs.mod afs_be.mod befs.mod befs_be.mod btrfs.mod
 
 # For fshelp.mod.
 fshelp_mod_SOURCES = fs/fshelp.c
@@ -356,6 +351,12 @@ befs_be_mod_SOURCES = fs/befs_be.c
 befs_be_mod_CFLAGS = $(COMMON_CFLAGS)
 befs_be_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For btrfs.mod.
+btrfs_mod_SOURCES = fs/btrfs.c
+btrfs_mod_CFLAGS = $(COMMON_CFLAGS) 
+btrfs_mod_CFLAGS += -fno-strict-aliasing 
+btrfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # Partition maps.
 
 pkglib_MODULES += part_amiga.mod
@@ -442,7 +443,7 @@ scsi_mod_LDFLAGS = $(COMMON_LDFLAGS)
 pkglib_MODULES += minicmd.mod extcmd.mod hello.mod     \
        ls.mod cmp.mod cat.mod help.mod search.mod loopback.mod \
        configfile.mod echo.mod         \
-       test.mod blocklist.mod hexdump.mod              \
+       terminfo.mod test.mod blocklist.mod hexdump.mod         \
        read.mod sleep.mod loadenv.mod crc.mod parttool.mod     \
        msdospart.mod memrw.mod normal.mod                      \
        gptsync.mod true.mod probe.mod password.mod             \
@@ -491,8 +492,7 @@ gfxmenu_mod_SOURCES = \
        gfxmenu/gui_progress_bar.c \
        gfxmenu/gui_util.c \
        gfxmenu/gui_string_util.c \
-       gfxmenu/named_colors.c \
-       gfxmenu/font.c
+       gfxmenu/named_colors.c
 gfxmenu_mod_CFLAGS = $(COMMON_CFLAGS)
 gfxmenu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
@@ -568,13 +568,10 @@ configfile_mod_SOURCES = commands/configfile.c
 configfile_mod_CFLAGS = $(COMMON_CFLAGS)
 configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-ifneq ($(platform), ieee1275)
 # For terminfo.mod.
-pkglib_MODULES += terminfo.mod
 terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
 terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
 terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-endif
 
 # For blocklist.mod.
 blocklist_mod_SOURCES = commands/blocklist.c
@@ -627,15 +624,12 @@ keystatus_mod_CFLAGS = $(COMMON_CFLAGS)
 keystatus_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For normal.mod.
-ifneq (, $(FONT_SOURCE))
-normal/charset.c_DEPENDENCIES = widthspec.h
-endif
 normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
        normal/auth.c normal/autofs.c  \
        normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
-       normal/menu_entry.c normal/menu_text.c normal/charset.c \
+       normal/menu_entry.c normal/menu_text.c \
        normal/misc.c normal/crypto.c normal/term.c normal/context.c \
-       script/main.c script/script.c script/execute.c unidata.c \
+       script/main.c script/script.c script/execute.c \
        script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
 normal_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
@@ -709,6 +703,7 @@ png_mod_SOURCES = video/readers/png.c
 png_mod_CFLAGS = $(COMMON_CFLAGS)
 png_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+
 # Misc.
 pkglib_MODULES += gzio.mod elf.mod
 
@@ -762,6 +757,11 @@ setjmp_mod_SOURCES = lib/$(target_cpu)/setjmp.S
 setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
 setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += charset.mod
+charset_mod_SOURCES = lib/charset.c
+charset_mod_CFLAGS = $(COMMON_CFLAGS)
+charset_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 pkglib_MODULES += regexp.mod
 regexp_mod_SOURCES = gnulib/regex.c commands/regexp.c
 regexp_mod_CFLAGS = $(COMMON_CFLAGS) $(GNULIB_CFLAGS)
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 96058e8..aca59a4 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -73,7 +73,7 @@ grub_setup_SOURCES = gnulib/progname.c 
util/i386/pc/grub-setup.c      \
        fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c          \
        fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c               \
        fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c                   \
-       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c                     \
+       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c fs/btrfs.c          \
                                                                        \
        partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c              \
        partmap/gpt.c                                                   \
@@ -147,7 +147,7 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
+xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/pc/xnu.c \
         loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
 xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index cb6b070..0c7e29e 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -31,8 +31,7 @@ kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S 
kern/ieee1275/cmain.c       \
        kern/sparc64/ieee1275/init.c                                    \
        kern/ieee1275/mmap.c                                            \
        term/ieee1275/ofconsole.c                                       \
-       kern/ieee1275/openfw.c term/terminfo.c term/tparm.c             \
-       disk/ieee1275/ofdisk.c  \
+       kern/ieee1275/openfw.c disk/ieee1275/ofdisk.c                   \
        kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c       
\
        kern/generic/millisleep.c kern/time.c                           \
        symlist.c kern/$(target_cpu)/cache.S
@@ -57,7 +56,7 @@ grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c       
                \
        fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c          \
        fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c               \
        fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c                   \
-       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c                     \
+       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c fs/btrfs.c          \
                                                                        \
        partmap/amiga.c partmap/apple.c partmap/msdos.c                 \
        partmap/bsdlabel.c partmap/sun.c partmap/acorn.c                \
-- 
1.7.0.4
[Prev in Thread]
Current Thread
[Next in Thread]
[PATCH 0/2] btrfs-support for grub-2, Surbhi Palande, 2010/07/05
- [PATCH 1/2] config support for btrfs, Surbhi Palande <=
- [PATCH 2/2] btrfs support for grub-2, Surbhi Palande, 2010/07/05
Prev by Date: [PATCH 0/2] btrfs-support for grub-2
Next by Date: [PATCH 2/2] btrfs support for grub-2
Previous by thread: [PATCH 0/2] btrfs-support for grub-2
Next by thread: [PATCH 2/2] btrfs support for grub-2
Index(es):
- Date
- Thread