automake commit without merge history
authorBVK Chaitanya <bvk.groups@gmail.com>
Thu, 6 May 2010 06:04:04 +0000 (11:34 +0530)
committerBVK Chaitanya <bvk.groups@gmail.com>
Thu, 6 May 2010 06:04:04 +0000 (11:34 +0530)
810 files changed:
.bzrignore
ABOUT-NLS [new file with mode: 0644]
Makefile.am [new file with mode: 0644]
Makefile.in [deleted file]
autogen.sh
configure.ac
configure.common [new file with mode: 0644]
docs/Makefile.am [new file with mode: 0644]
geninit.sh
geninitheader.sh [deleted file]
genkernsyms.sh.in [deleted file]
genmk.rb [deleted file]
gentpl.py [new file with mode: 0644]
grub-core/Makefile.am [new file with mode: 0644]
grub-core/Makefile.extra-dist [new file with mode: 0644]
grub-core/Makefile.kernel [new file with mode: 0644]
grub-core/Makefile.vars [new file with mode: 0644]
grub-core/boot/i386/pc/boot.S [moved from boot/i386/pc/boot.S with 100% similarity]
grub-core/boot/i386/pc/cdboot.S [moved from boot/i386/pc/cdboot.S with 100% similarity]
grub-core/boot/i386/pc/diskboot.S [moved from boot/i386/pc/diskboot.S with 100% similarity]
grub-core/boot/i386/pc/lnxboot.S [moved from boot/i386/pc/lnxboot.S with 100% similarity]
grub-core/boot/i386/pc/pxeboot.S [moved from boot/i386/pc/pxeboot.S with 100% similarity]
grub-core/boot/i386/qemu/boot.S [moved from boot/i386/qemu/boot.S with 100% similarity]
grub-core/boot/sparc64/ieee1275/boot.S [moved from boot/sparc64/ieee1275/boot.S with 100% similarity]
grub-core/boot/sparc64/ieee1275/diskboot.S [moved from boot/sparc64/ieee1275/diskboot.S with 100% similarity]
grub-core/bus/bonito.c [moved from bus/bonito.c with 100% similarity]
grub-core/bus/emu/pci.c [moved from util/pci.c with 98% similarity]
grub-core/bus/pci.c [moved from bus/pci.c with 100% similarity]
grub-core/bus/usb/emu/usb.c [moved from util/usb.c with 100% similarity]
grub-core/bus/usb/ohci.c [moved from bus/usb/ohci.c with 100% similarity]
grub-core/bus/usb/uhci.c [moved from bus/usb/uhci.c with 100% similarity]
grub-core/bus/usb/usb.c [moved from bus/usb/usb.c with 100% similarity]
grub-core/bus/usb/usbhub.c [moved from bus/usb/usbhub.c with 100% similarity]
grub-core/bus/usb/usbtrans.c [moved from bus/usb/usbtrans.c with 100% similarity]
grub-core/commands/acpi.c [moved from commands/acpi.c with 100% similarity]
grub-core/commands/blocklist.c [moved from commands/blocklist.c with 100% similarity]
grub-core/commands/boot.c [moved from commands/boot.c with 100% similarity]
grub-core/commands/cat.c [moved from commands/cat.c with 100% similarity]
grub-core/commands/cmp.c [moved from commands/cmp.c with 100% similarity]
grub-core/commands/configfile.c [moved from commands/configfile.c with 100% similarity]
grub-core/commands/crc.c [moved from commands/crc.c with 100% similarity]
grub-core/commands/date.c [moved from commands/date.c with 100% similarity]
grub-core/commands/echo.c [moved from commands/echo.c with 100% similarity]
grub-core/commands/efi/acpi.c [moved from commands/efi/acpi.c with 100% similarity]
grub-core/commands/efi/fixvideo.c [moved from commands/efi/fixvideo.c with 100% similarity]
grub-core/commands/efi/loadbios.c [moved from commands/efi/loadbios.c with 100% similarity]
grub-core/commands/extcmd.c [moved from commands/extcmd.c with 100% similarity]
grub-core/commands/gptsync.c [moved from commands/gptsync.c with 100% similarity]
grub-core/commands/halt.c [moved from commands/halt.c with 100% similarity]
grub-core/commands/handler.c [moved from commands/handler.c with 100% similarity]
grub-core/commands/hashsum.c [moved from commands/hashsum.c with 100% similarity]
grub-core/commands/hdparm.c [moved from commands/hdparm.c with 100% similarity]
grub-core/commands/help.c [moved from commands/help.c with 100% similarity]
grub-core/commands/hexdump.c [moved from commands/hexdump.c with 100% similarity]
grub-core/commands/i386/cpuid.c [moved from commands/i386/cpuid.c with 100% similarity]
grub-core/commands/i386/pc/acpi.c [moved from commands/i386/pc/acpi.c with 100% similarity]
grub-core/commands/i386/pc/drivemap.c [moved from commands/i386/pc/drivemap.c with 100% similarity]
grub-core/commands/i386/pc/drivemap_int13h.S [moved from commands/i386/pc/drivemap_int13h.S with 100% similarity]
grub-core/commands/i386/pc/halt.c [moved from commands/i386/pc/halt.c with 100% similarity]
grub-core/commands/i386/pc/play.c [moved from commands/i386/pc/play.c with 100% similarity]
grub-core/commands/i386/pc/pxecmd.c [moved from commands/i386/pc/pxecmd.c with 100% similarity]
grub-core/commands/i386/pc/vbeinfo.c [moved from commands/i386/pc/vbeinfo.c with 100% similarity]
grub-core/commands/i386/pc/vbetest.c [moved from commands/i386/pc/vbetest.c with 100% similarity]
grub-core/commands/ieee1275/suspend.c [moved from commands/ieee1275/suspend.c with 100% similarity]
grub-core/commands/iorw.c [moved from commands/iorw.c with 100% similarity]
grub-core/commands/keystatus.c [moved from commands/keystatus.c with 100% similarity]
grub-core/commands/loadenv.c [moved from commands/loadenv.c with 100% similarity]
grub-core/commands/ls.c [moved from commands/ls.c with 100% similarity]
grub-core/commands/lsmmap.c [moved from commands/lsmmap.c with 100% similarity]
grub-core/commands/lspci.c [moved from commands/lspci.c with 100% similarity]
grub-core/commands/memrw.c [moved from commands/memrw.c with 100% similarity]
grub-core/commands/minicmd.c [moved from commands/minicmd.c with 100% similarity]
grub-core/commands/parttool.c [moved from commands/parttool.c with 99% similarity]
grub-core/commands/password.c [moved from commands/password.c with 100% similarity]
grub-core/commands/password_pbkdf2.c [moved from commands/password_pbkdf2.c with 100% similarity]
grub-core/commands/probe.c [moved from commands/probe.c with 100% similarity]
grub-core/commands/read.c [moved from commands/read.c with 100% similarity]
grub-core/commands/reboot.c [moved from commands/reboot.c with 100% similarity]
grub-core/commands/regexp.c [moved from commands/regexp.c with 100% similarity]
grub-core/commands/search.c [moved from commands/search.c with 100% similarity]
grub-core/commands/search_file.c [moved from commands/search_file.c with 100% similarity]
grub-core/commands/search_label.c [moved from commands/search_label.c with 100% similarity]
grub-core/commands/search_uuid.c [moved from commands/search_uuid.c with 100% similarity]
grub-core/commands/search_wrap.c [moved from commands/search_wrap.c with 100% similarity]
grub-core/commands/setpci.c [moved from commands/setpci.c with 100% similarity]
grub-core/commands/sleep.c [moved from commands/sleep.c with 100% similarity]
grub-core/commands/terminal.c [moved from commands/terminal.c with 100% similarity]
grub-core/commands/test.c [moved from commands/test.c with 100% similarity]
grub-core/commands/true.c [moved from commands/true.c with 100% similarity]
grub-core/commands/usbtest.c [moved from commands/usbtest.c with 100% similarity]
grub-core/commands/videotest.c [moved from commands/videotest.c with 100% similarity]
grub-core/commands/xnu_uuid.c [moved from commands/xnu_uuid.c with 100% similarity]
grub-core/conf/any-emu.rmk [moved from conf/any-emu.rmk with 100% similarity]
grub-core/conf/common.rmk [moved from conf/common.rmk with 100% similarity]
grub-core/conf/i386-coreboot.rmk [moved from conf/i386-coreboot.rmk with 100% similarity]
grub-core/conf/i386-efi.rmk [moved from conf/i386-efi.rmk with 100% similarity]
grub-core/conf/i386-ieee1275.rmk [moved from conf/i386-ieee1275.rmk with 100% similarity]
grub-core/conf/i386-multiboot.rmk [moved from conf/i386-multiboot.rmk with 100% similarity]
grub-core/conf/i386-pc-cygwin-img-ld.sc [moved from conf/i386-pc-cygwin-img-ld.sc with 100% similarity]
grub-core/conf/i386-pc.rmk [moved from conf/i386-pc.rmk with 100% similarity]
grub-core/conf/i386-qemu.rmk [moved from conf/i386-qemu.rmk with 100% similarity]
grub-core/conf/i386.rmk [moved from conf/i386.rmk with 100% similarity]
grub-core/conf/mips-qemu-mips.rmk [moved from conf/mips-qemu-mips.rmk with 100% similarity]
grub-core/conf/mips-yeeloong.rmk [moved from conf/mips-yeeloong.rmk with 100% similarity]
grub-core/conf/mips.rmk [moved from conf/mips.rmk with 100% similarity]
grub-core/conf/powerpc-ieee1275.rmk [moved from conf/powerpc-ieee1275.rmk with 100% similarity]
grub-core/conf/sparc64-ieee1275.rmk [moved from conf/sparc64-ieee1275.rmk with 100% similarity]
grub-core/conf/tests.rmk [moved from conf/tests.rmk with 100% similarity]
grub-core/conf/x86-efi.rmk [moved from conf/x86-efi.rmk with 100% similarity]
grub-core/conf/x86_64-efi.rmk [moved from conf/x86_64-efi.rmk with 100% similarity]
grub-core/configure.ac [new file with mode: 0644]
grub-core/disk/ata.c [moved from disk/ata.c with 100% similarity]
grub-core/disk/ata_pthru.c [moved from disk/ata_pthru.c with 100% similarity]
grub-core/disk/dmraid_nvidia.c [moved from disk/dmraid_nvidia.c with 100% similarity]
grub-core/disk/efi/efidisk.c [moved from disk/efi/efidisk.c with 100% similarity]
grub-core/disk/host.c [moved from disk/host.c with 100% similarity]
grub-core/disk/i386/pc/biosdisk.c [moved from disk/i386/pc/biosdisk.c with 100% similarity]
grub-core/disk/ieee1275/nand.c [moved from disk/ieee1275/nand.c with 100% similarity]
grub-core/disk/ieee1275/ofdisk.c [moved from disk/ieee1275/ofdisk.c with 100% similarity]
grub-core/disk/loopback.c [moved from disk/loopback.c with 100% similarity]
grub-core/disk/lvm.c [moved from disk/lvm.c with 100% similarity]
grub-core/disk/mdraid_linux.c [moved from disk/mdraid_linux.c with 100% similarity]
grub-core/disk/memdisk.c [moved from disk/memdisk.c with 100% similarity]
grub-core/disk/raid.c [moved from disk/raid.c with 100% similarity]
grub-core/disk/raid5_recover.c [moved from disk/raid5_recover.c with 100% similarity]
grub-core/disk/raid6_recover.c [moved from disk/raid6_recover.c with 100% similarity]
grub-core/disk/scsi.c [moved from disk/scsi.c with 100% similarity]
grub-core/disk/usbms.c [moved from disk/usbms.c with 100% similarity]
grub-core/efiemu/i386/coredetect.c [moved from efiemu/i386/coredetect.c with 100% similarity]
grub-core/efiemu/i386/loadcore32.c [moved from efiemu/i386/loadcore32.c with 100% similarity]
grub-core/efiemu/i386/loadcore64.c [moved from efiemu/i386/loadcore64.c with 100% similarity]
grub-core/efiemu/i386/pc/cfgtables.c [moved from efiemu/i386/pc/cfgtables.c with 100% similarity]
grub-core/efiemu/loadcore.c [moved from efiemu/loadcore.c with 100% similarity]
grub-core/efiemu/loadcore32.c [moved from efiemu/loadcore32.c with 100% similarity]
grub-core/efiemu/loadcore64.c [moved from efiemu/loadcore64.c with 100% similarity]
grub-core/efiemu/loadcore_common.c [moved from efiemu/loadcore_common.c with 100% similarity]
grub-core/efiemu/main.c [moved from efiemu/main.c with 100% similarity]
grub-core/efiemu/mm.c [moved from efiemu/mm.c with 100% similarity]
grub-core/efiemu/pnvram.c [moved from efiemu/pnvram.c with 100% similarity]
grub-core/efiemu/prepare.c [moved from efiemu/prepare.c with 100% similarity]
grub-core/efiemu/prepare32.c [moved from efiemu/prepare32.c with 100% similarity]
grub-core/efiemu/prepare64.c [moved from efiemu/prepare64.c with 100% similarity]
grub-core/efiemu/runtime/config.h [moved from efiemu/runtime/config.h with 100% similarity]
grub-core/efiemu/runtime/efiemu.S [moved from efiemu/runtime/efiemu.S with 100% similarity]
grub-core/efiemu/runtime/efiemu.c [moved from efiemu/runtime/efiemu.c with 100% similarity]
grub-core/efiemu/runtime/efiemu.sh [moved from efiemu/runtime/efiemu.sh with 100% similarity]
grub-core/efiemu/symbols.c [moved from efiemu/symbols.c with 100% similarity]
grub-core/font/font.c [moved from font/font.c with 100% similarity]
grub-core/font/font_cmd.c [moved from font/font_cmd.c with 100% similarity]
grub-core/fs/affs.c [moved from fs/affs.c with 100% similarity]
grub-core/fs/afs.c [moved from fs/afs.c with 100% similarity]
grub-core/fs/afs_be.c [moved from fs/afs_be.c with 100% similarity]
grub-core/fs/befs.c [moved from fs/befs.c with 100% similarity]
grub-core/fs/befs_be.c [moved from fs/befs_be.c with 100% similarity]
grub-core/fs/cpio.c [moved from fs/cpio.c with 100% similarity]
grub-core/fs/ext2.c [moved from fs/ext2.c with 100% similarity]
grub-core/fs/fat.c [moved from fs/fat.c with 100% similarity]
grub-core/fs/fshelp.c [moved from fs/fshelp.c with 100% similarity]
grub-core/fs/hfs.c [moved from fs/hfs.c with 100% similarity]
grub-core/fs/hfsplus.c [moved from fs/hfsplus.c with 100% similarity]
grub-core/fs/i386/pc/pxe.c [moved from fs/i386/pc/pxe.c with 100% similarity]
grub-core/fs/iso9660.c [moved from fs/iso9660.c with 100% similarity]
grub-core/fs/jfs.c [moved from fs/jfs.c with 100% similarity]
grub-core/fs/minix.c [moved from fs/minix.c with 100% similarity]
grub-core/fs/nilfs2.c [moved from fs/nilfs2.c with 100% similarity]
grub-core/fs/ntfs.c [moved from fs/ntfs.c with 100% similarity]
grub-core/fs/ntfscomp.c [moved from fs/ntfscomp.c with 100% similarity]
grub-core/fs/reiserfs.c [moved from fs/reiserfs.c with 100% similarity]
grub-core/fs/sfs.c [moved from fs/sfs.c with 100% similarity]
grub-core/fs/tar.c [moved from fs/tar.c with 100% similarity]
grub-core/fs/udf.c [moved from fs/udf.c with 100% similarity]
grub-core/fs/ufs.c [moved from fs/ufs.c with 100% similarity]
grub-core/fs/ufs2.c [moved from fs/ufs2.c with 100% similarity]
grub-core/fs/xfs.c [moved from fs/xfs.c with 100% similarity]
grub-core/gencmdlist.sh [moved from gencmdlist.sh with 100% similarity]
grub-core/gendistlist.sh [moved from gendistlist.sh with 100% similarity]
grub-core/genemuinit.sh [moved from genemuinit.sh with 100% similarity]
grub-core/genemuinitheader.sh [moved from genemuinitheader.sh with 100% similarity]
grub-core/genfslist.sh [moved from genfslist.sh with 100% similarity]
grub-core/genhandlerlist.sh [moved from genhandlerlist.sh with 100% similarity]
grub-core/genmoddep.awk [moved from genmoddep.awk with 93% similarity]
grub-core/genmodsrc.sh [moved from genmodsrc.sh with 100% similarity]
grub-core/genpartmaplist.sh [moved from genpartmaplist.sh with 100% similarity]
grub-core/genparttoollist.sh [moved from genparttoollist.sh with 100% similarity]
grub-core/gensymlist.sh [moved from gensymlist.sh.in with 84% similarity]
grub-core/genterminallist.sh [moved from genterminallist.sh with 100% similarity]
grub-core/gentrigtables.c [moved from gentrigtables.c with 93% similarity]
grub-core/genvideolist.sh [moved from genvideolist.sh with 100% similarity]
grub-core/gettext/gettext.c [moved from gettext/gettext.c with 100% similarity]
grub-core/gfxmenu/gfxmenu.c [moved from gfxmenu/gfxmenu.c with 100% similarity]
grub-core/gfxmenu/gui_box.c [moved from gfxmenu/gui_box.c with 100% similarity]
grub-core/gfxmenu/gui_canvas.c [moved from gfxmenu/gui_canvas.c with 100% similarity]
grub-core/gfxmenu/gui_circular_progress.c [moved from gfxmenu/gui_circular_progress.c with 100% similarity]
grub-core/gfxmenu/gui_image.c [moved from gfxmenu/gui_image.c with 100% similarity]
grub-core/gfxmenu/gui_label.c [moved from gfxmenu/gui_label.c with 100% similarity]
grub-core/gfxmenu/gui_list.c [moved from gfxmenu/gui_list.c with 100% similarity]
grub-core/gfxmenu/gui_progress_bar.c [moved from gfxmenu/gui_progress_bar.c with 100% similarity]
grub-core/gfxmenu/gui_string_util.c [moved from gfxmenu/gui_string_util.c with 100% similarity]
grub-core/gfxmenu/gui_util.c [moved from gfxmenu/gui_util.c with 100% similarity]
grub-core/gfxmenu/icon_manager.c [moved from gfxmenu/icon_manager.c with 100% similarity]
grub-core/gfxmenu/model.c [moved from gfxmenu/model.c with 100% similarity]
grub-core/gfxmenu/named_colors.c [moved from gfxmenu/named_colors.c with 100% similarity]
grub-core/gfxmenu/theme_loader.c [moved from gfxmenu/theme_loader.c with 100% similarity]
grub-core/gfxmenu/view.c [moved from gfxmenu/view.c with 100% similarity]
grub-core/gfxmenu/widget-box.c [moved from gfxmenu/widget-box.c with 100% similarity]
grub-core/gnulib/alloca.h [moved from gnulib/alloca.h with 100% similarity]
grub-core/gnulib/argp-ba.c [moved from gnulib/argp-ba.c with 100% similarity]
grub-core/gnulib/argp-eexst.c [moved from gnulib/argp-eexst.c with 100% similarity]
grub-core/gnulib/argp-fmtstream.c [moved from gnulib/argp-fmtstream.c with 100% similarity]
grub-core/gnulib/argp-fmtstream.h [moved from gnulib/argp-fmtstream.h with 100% similarity]
grub-core/gnulib/argp-fs-xinl.c [moved from gnulib/argp-fs-xinl.c with 100% similarity]
grub-core/gnulib/argp-help.c [moved from gnulib/argp-help.c with 100% similarity]
grub-core/gnulib/argp-namefrob.h [moved from gnulib/argp-namefrob.h with 100% similarity]
grub-core/gnulib/argp-parse.c [moved from gnulib/argp-parse.c with 100% similarity]
grub-core/gnulib/argp-pin.c [moved from gnulib/argp-pin.c with 100% similarity]
grub-core/gnulib/argp-pv.c [moved from gnulib/argp-pv.c with 100% similarity]
grub-core/gnulib/argp-pvh.c [moved from gnulib/argp-pvh.c with 100% similarity]
grub-core/gnulib/argp-version-etc.c [moved from gnulib/argp-version-etc.c with 100% similarity]
grub-core/gnulib/argp-version-etc.h [moved from gnulib/argp-version-etc.h with 100% similarity]
grub-core/gnulib/argp-xinl.c [moved from gnulib/argp-xinl.c with 100% similarity]
grub-core/gnulib/argp.h [moved from gnulib/argp.h with 100% similarity]
grub-core/gnulib/error.c [moved from gnulib/error.c with 100% similarity]
grub-core/gnulib/error.h [moved from gnulib/error.h with 100% similarity]
grub-core/gnulib/fnmatch.c [moved from gnulib/fnmatch.c with 100% similarity]
grub-core/gnulib/fnmatch.h [moved from gnulib/fnmatch.h with 100% similarity]
grub-core/gnulib/fnmatch_loop.c [moved from gnulib/fnmatch_loop.c with 100% similarity]
grub-core/gnulib/getdelim.c [moved from gnulib/getdelim.c with 100% similarity]
grub-core/gnulib/getline.c [moved from gnulib/getline.c with 100% similarity]
grub-core/gnulib/getopt.c [moved from gnulib/getopt.c with 100% similarity]
grub-core/gnulib/getopt.h [moved from gnulib/getopt.h with 100% similarity]
grub-core/gnulib/getopt1.c [moved from gnulib/getopt1.c with 100% similarity]
grub-core/gnulib/getopt_int.h [moved from gnulib/getopt_int.h with 100% similarity]
grub-core/gnulib/gettext.h [moved from gnulib/gettext.h with 100% similarity]
grub-core/gnulib/progname.c [moved from gnulib/progname.c with 100% similarity]
grub-core/gnulib/progname.h [moved from gnulib/progname.h with 100% similarity]
grub-core/gnulib/regcomp.c [moved from gnulib/regcomp.c with 100% similarity]
grub-core/gnulib/regex.c [moved from gnulib/regex.c with 100% similarity]
grub-core/gnulib/regex.h [moved from gnulib/regex.h with 100% similarity]
grub-core/gnulib/regex_internal.c [moved from gnulib/regex_internal.c with 100% similarity]
grub-core/gnulib/regex_internal.h [moved from gnulib/regex_internal.h with 100% similarity]
grub-core/gnulib/regexec.c [moved from gnulib/regexec.c with 100% similarity]
grub-core/hello/hello.c [moved from hello/hello.c with 100% similarity]
grub-core/hook/datehook.c [moved from hook/datehook.c with 100% similarity]
grub-core/import_gcry.py [moved from util/import_gcry.py with 100% similarity]
grub-core/include/grub/acorn_filecore.h [moved from include/grub/acorn_filecore.h with 100% similarity]
grub-core/include/grub/acpi.h [moved from include/grub/acpi.h with 100% similarity]
grub-core/include/grub/aout.h [moved from include/grub/aout.h with 100% similarity]
grub-core/include/grub/at_keyboard.h [moved from include/grub/at_keyboard.h with 100% similarity]
grub-core/include/grub/ata.h [moved from include/grub/ata.h with 100% similarity]
grub-core/include/grub/auth.h [moved from include/grub/auth.h with 100% similarity]
grub-core/include/grub/autoefi.h [moved from include/grub/autoefi.h with 100% similarity]
grub-core/include/grub/bitmap.h [moved from include/grub/bitmap.h with 100% similarity]
grub-core/include/grub/bitmap_scale.h [moved from include/grub/bitmap_scale.h with 100% similarity]
grub-core/include/grub/boot.h [moved from include/grub/boot.h with 100% similarity]
grub-core/include/grub/bsdlabel.h [moved from include/grub/bsdlabel.h with 100% similarity]
grub-core/include/grub/bufio.h [moved from include/grub/bufio.h with 100% similarity]
grub-core/include/grub/cache.h [moved from include/grub/cache.h with 100% similarity]
grub-core/include/grub/charset.h [moved from include/grub/charset.h with 100% similarity]
grub-core/include/grub/cmos.h [moved from include/grub/cmos.h with 100% similarity]
grub-core/include/grub/command.h [moved from include/grub/command.h with 100% similarity]
grub-core/include/grub/crypto.h [moved from include/grub/crypto.h with 100% similarity]
grub-core/include/grub/datetime.h [moved from include/grub/datetime.h with 100% similarity]
grub-core/include/grub/device.h [moved from include/grub/device.h with 100% similarity]
grub-core/include/grub/disk.h [moved from include/grub/disk.h with 100% similarity]
grub-core/include/grub/dl.h [moved from include/grub/dl.h with 90% similarity]
grub-core/include/grub/efi/api.h [moved from include/grub/efi/api.h with 100% similarity]
grub-core/include/grub/efi/console.h [moved from include/grub/efi/console.h with 100% similarity]
grub-core/include/grub/efi/console_control.h [moved from include/grub/efi/console_control.h with 100% similarity]
grub-core/include/grub/efi/disk.h [moved from include/grub/efi/disk.h with 100% similarity]
grub-core/include/grub/efi/efi.h [moved from include/grub/efi/efi.h with 100% similarity]
grub-core/include/grub/efi/graphics_output.h [moved from include/grub/efi/graphics_output.h with 100% similarity]
grub-core/include/grub/efi/memory.h [moved from include/grub/efi/memory.h with 100% similarity]
grub-core/include/grub/efi/pe32.h [moved from include/grub/efi/pe32.h with 100% similarity]
grub-core/include/grub/efi/time.h [moved from include/grub/efi/time.h with 100% similarity]
grub-core/include/grub/efi/uga_draw.h [moved from include/grub/efi/uga_draw.h with 100% similarity]
grub-core/include/grub/efiemu/efiemu.h [moved from include/grub/efiemu/efiemu.h with 100% similarity]
grub-core/include/grub/efiemu/runtime.h [moved from include/grub/efiemu/runtime.h with 100% similarity]
grub-core/include/grub/elf.h [moved from include/grub/elf.h with 100% similarity]
grub-core/include/grub/elfload.h [moved from include/grub/elfload.h with 100% similarity]
grub-core/include/grub/emu/console.h [moved from include/grub/util/console.h with 100% similarity]
grub-core/include/grub/emu/getroot.h [moved from include/grub/util/getroot.h with 94% similarity]
grub-core/include/grub/emu/hostdisk.h [moved from include/grub/util/hostdisk.h with 100% similarity]
grub-core/include/grub/emu/misc.h [new file with mode: 0644]
grub-core/include/grub/env.h [moved from include/grub/env.h with 100% similarity]
grub-core/include/grub/env_private.h [moved from include/grub/env_private.h with 100% similarity]
grub-core/include/grub/err.h [moved from include/grub/err.h with 100% similarity]
grub-core/include/grub/extcmd.h [moved from include/grub/extcmd.h with 100% similarity]
grub-core/include/grub/fbblit.h [moved from include/grub/fbblit.h with 100% similarity]
grub-core/include/grub/fbfill.h [moved from include/grub/fbfill.h with 100% similarity]
grub-core/include/grub/fbutil.h [moved from include/grub/fbutil.h with 100% similarity]
grub-core/include/grub/file.h [moved from include/grub/file.h with 100% similarity]
grub-core/include/grub/font.h [moved from include/grub/font.h with 100% similarity]
grub-core/include/grub/fontformat.h [moved from include/grub/fontformat.h with 100% similarity]
grub-core/include/grub/fs.h [moved from include/grub/fs.h with 100% similarity]
grub-core/include/grub/fshelp.h [moved from include/grub/fshelp.h with 100% similarity]
grub-core/include/grub/gfxmenu_model.h [moved from include/grub/gfxmenu_model.h with 100% similarity]
grub-core/include/grub/gfxmenu_view.h [moved from include/grub/gfxmenu_view.h with 100% similarity]
grub-core/include/grub/gfxterm.h [moved from include/grub/gfxterm.h with 100% similarity]
grub-core/include/grub/gfxwidgets.h [moved from include/grub/gfxwidgets.h with 100% similarity]
grub-core/include/grub/gpt_partition.h [moved from include/grub/gpt_partition.h with 100% similarity]
grub-core/include/grub/gui.h [moved from include/grub/gui.h with 100% similarity]
grub-core/include/grub/gui_string_util.h [moved from include/grub/gui_string_util.h with 100% similarity]
grub-core/include/grub/gzio.h [moved from include/grub/gzio.h with 100% similarity]
grub-core/include/grub/handler.h [moved from include/grub/handler.h with 100% similarity]
grub-core/include/grub/hfs.h [moved from include/grub/hfs.h with 100% similarity]
grub-core/include/grub/i18n.h [moved from include/grub/i18n.h with 100% similarity]
grub-core/include/grub/i386/at_keyboard.h [moved from include/grub/i386/at_keyboard.h with 100% similarity]
grub-core/include/grub/i386/bsd.h [moved from include/grub/i386/bsd.h with 100% similarity]
grub-core/include/grub/i386/cmos.h [moved from include/grub/i386/cmos.h with 100% similarity]
grub-core/include/grub/i386/coreboot/boot.h [moved from include/grub/i386/coreboot/boot.h with 100% similarity]
grub-core/include/grub/i386/coreboot/console.h [moved from include/grub/i386/coreboot/console.h with 100% similarity]
grub-core/include/grub/i386/coreboot/init.h [moved from include/grub/i386/coreboot/init.h with 100% similarity]
grub-core/include/grub/i386/coreboot/kernel.h [moved from include/grub/i386/coreboot/kernel.h with 100% similarity]
grub-core/include/grub/i386/coreboot/loader.h [moved from include/grub/i386/coreboot/loader.h with 100% similarity]
grub-core/include/grub/i386/coreboot/memory.h [moved from include/grub/i386/coreboot/memory.h with 100% similarity]
grub-core/include/grub/i386/coreboot/serial.h [moved from include/grub/i386/coreboot/serial.h with 100% similarity]
grub-core/include/grub/i386/coreboot/time.h [moved from include/grub/i386/coreboot/time.h with 100% similarity]
grub-core/include/grub/i386/cpuid.h [moved from include/grub/i386/cpuid.h with 100% similarity]
grub-core/include/grub/i386/efi/kernel.h [moved from include/grub/i386/efi/kernel.h with 100% similarity]
grub-core/include/grub/i386/efi/loader.h [moved from include/grub/i386/efi/loader.h with 100% similarity]
grub-core/include/grub/i386/efi/memory.h [moved from include/grub/i386/efi/memory.h with 100% similarity]
grub-core/include/grub/i386/efi/serial.h [moved from include/grub/i386/efi/serial.h with 100% similarity]
grub-core/include/grub/i386/efi/time.h [moved from include/grub/i386/efi/time.h with 100% similarity]
grub-core/include/grub/i386/efiemu.h [moved from include/grub/i386/efiemu.h with 100% similarity]
grub-core/include/grub/i386/freebsd_linker.h [moved from include/grub/i386/freebsd_linker.h with 100% similarity]
grub-core/include/grub/i386/freebsd_reboot.h [moved from include/grub/i386/freebsd_reboot.h with 100% similarity]
grub-core/include/grub/i386/ieee1275/console.h [moved from include/grub/i386/ieee1275/console.h with 100% similarity]
grub-core/include/grub/i386/ieee1275/ieee1275.h [moved from include/grub/i386/ieee1275/ieee1275.h with 100% similarity]
grub-core/include/grub/i386/ieee1275/kernel.h [moved from include/grub/i386/ieee1275/kernel.h with 100% similarity]
grub-core/include/grub/i386/ieee1275/loader.h [moved from include/grub/i386/ieee1275/loader.h with 100% similarity]
grub-core/include/grub/i386/ieee1275/memory.h [moved from include/grub/i386/ieee1275/memory.h with 100% similarity]
grub-core/include/grub/i386/ieee1275/serial.h [moved from include/grub/i386/ieee1275/serial.h with 100% similarity]
grub-core/include/grub/i386/ieee1275/time.h [moved from include/grub/i386/ieee1275/time.h with 100% similarity]
grub-core/include/grub/i386/io.h [moved from include/grub/i386/io.h with 100% similarity]
grub-core/include/grub/i386/kernel.h [moved from include/grub/i386/kernel.h with 100% similarity]
grub-core/include/grub/i386/linux.h [moved from include/grub/i386/linux.h with 100% similarity]
grub-core/include/grub/i386/loader.h [moved from include/grub/i386/loader.h with 100% similarity]
grub-core/include/grub/i386/macho.h [moved from include/grub/i386/macho.h with 100% similarity]
grub-core/include/grub/i386/memory.h [moved from include/grub/i386/memory.h with 100% similarity]
grub-core/include/grub/i386/multiboot.h [moved from include/grub/i386/multiboot.h with 100% similarity]
grub-core/include/grub/i386/multiboot/boot.h [moved from include/grub/i386/multiboot/boot.h with 100% similarity]
grub-core/include/grub/i386/multiboot/console.h [moved from include/grub/i386/multiboot/console.h with 100% similarity]
grub-core/include/grub/i386/multiboot/init.h [moved from include/grub/i386/multiboot/init.h with 100% similarity]
grub-core/include/grub/i386/multiboot/kernel.h [moved from include/grub/i386/multiboot/kernel.h with 100% similarity]
grub-core/include/grub/i386/multiboot/loader.h [moved from include/grub/i386/multiboot/loader.h with 100% similarity]
grub-core/include/grub/i386/multiboot/memory.h [moved from include/grub/i386/multiboot/memory.h with 100% similarity]
grub-core/include/grub/i386/multiboot/serial.h [moved from include/grub/i386/multiboot/serial.h with 100% similarity]
grub-core/include/grub/i386/multiboot/time.h [moved from include/grub/i386/multiboot/time.h with 100% similarity]
grub-core/include/grub/i386/netbsd_bootinfo.h [moved from include/grub/i386/netbsd_bootinfo.h with 100% similarity]
grub-core/include/grub/i386/netbsd_reboot.h [moved from include/grub/i386/netbsd_reboot.h with 100% similarity]
grub-core/include/grub/i386/openbsd_bootarg.h [moved from include/grub/i386/openbsd_bootarg.h with 100% similarity]
grub-core/include/grub/i386/openbsd_reboot.h [moved from include/grub/i386/openbsd_reboot.h with 100% similarity]
grub-core/include/grub/i386/pc/biosdisk.h [moved from include/grub/i386/pc/biosdisk.h with 100% similarity]
grub-core/include/grub/i386/pc/biosnum.h [moved from include/grub/i386/pc/biosnum.h with 100% similarity]
grub-core/include/grub/i386/pc/boot.h [moved from include/grub/i386/pc/boot.h with 100% similarity]
grub-core/include/grub/i386/pc/chainloader.h [moved from include/grub/i386/pc/chainloader.h with 100% similarity]
grub-core/include/grub/i386/pc/console.h [moved from include/grub/i386/pc/console.h with 100% similarity]
grub-core/include/grub/i386/pc/efiemu.h [moved from include/grub/i386/pc/efiemu.h with 100% similarity]
grub-core/include/grub/i386/pc/init.h [moved from include/grub/i386/pc/init.h with 100% similarity]
grub-core/include/grub/i386/pc/kernel.h [moved from include/grub/i386/pc/kernel.h with 100% similarity]
grub-core/include/grub/i386/pc/loader.h [moved from include/grub/i386/pc/loader.h with 100% similarity]
grub-core/include/grub/i386/pc/memory.h [moved from include/grub/i386/pc/memory.h with 100% similarity]
grub-core/include/grub/i386/pc/pxe.h [moved from include/grub/i386/pc/pxe.h with 100% similarity]
grub-core/include/grub/i386/pc/time.h [moved from include/grub/i386/pc/time.h with 100% similarity]
grub-core/include/grub/i386/pc/vbe.h [moved from include/grub/i386/pc/vbe.h with 100% similarity]
grub-core/include/grub/i386/pc/vga.h [moved from include/grub/i386/pc/vga.h with 100% similarity]
grub-core/include/grub/i386/pci.h [moved from include/grub/i386/pci.h with 100% similarity]
grub-core/include/grub/i386/pit.h [moved from include/grub/i386/pit.h with 100% similarity]
grub-core/include/grub/i386/qemu/boot.h [moved from include/grub/i386/qemu/boot.h with 100% similarity]
grub-core/include/grub/i386/qemu/console.h [moved from include/grub/i386/qemu/console.h with 100% similarity]
grub-core/include/grub/i386/qemu/init.h [moved from include/grub/i386/qemu/init.h with 100% similarity]
grub-core/include/grub/i386/qemu/kernel.h [moved from include/grub/i386/qemu/kernel.h with 100% similarity]
grub-core/include/grub/i386/qemu/loader.h [moved from include/grub/i386/qemu/loader.h with 100% similarity]
grub-core/include/grub/i386/qemu/memory.h [moved from include/grub/i386/qemu/memory.h with 100% similarity]
grub-core/include/grub/i386/qemu/serial.h [moved from include/grub/i386/qemu/serial.h with 100% similarity]
grub-core/include/grub/i386/qemu/time.h [moved from include/grub/i386/qemu/time.h with 100% similarity]
grub-core/include/grub/i386/relocator.h [moved from include/grub/i386/relocator.h with 100% similarity]
grub-core/include/grub/i386/setjmp.h [moved from include/grub/i386/setjmp.h with 100% similarity]
grub-core/include/grub/i386/time.h [moved from include/grub/i386/time.h with 100% similarity]
grub-core/include/grub/i386/tsc.h [moved from include/grub/i386/tsc.h with 100% similarity]
grub-core/include/grub/i386/types.h [moved from include/grub/i386/types.h with 100% similarity]
grub-core/include/grub/i386/vga_common.h [moved from include/grub/i386/vga_common.h with 100% similarity]
grub-core/include/grub/i386/xnu.h [moved from include/grub/i386/xnu.h with 100% similarity]
grub-core/include/grub/icon_manager.h [moved from include/grub/icon_manager.h with 100% similarity]
grub-core/include/grub/ieee1275/ieee1275.h [moved from include/grub/ieee1275/ieee1275.h with 100% similarity]
grub-core/include/grub/ieee1275/ofdisk.h [moved from include/grub/ieee1275/ofdisk.h with 100% similarity]
grub-core/include/grub/kernel.h [moved from include/grub/kernel.h with 100% similarity]
grub-core/include/grub/lib/LzFind.h [moved from include/grub/lib/LzFind.h with 100% similarity]
grub-core/include/grub/lib/LzHash.h [moved from include/grub/lib/LzHash.h with 100% similarity]
grub-core/include/grub/lib/LzmaDec.h [moved from include/grub/lib/LzmaDec.h with 100% similarity]
grub-core/include/grub/lib/LzmaEnc.h [moved from include/grub/lib/LzmaEnc.h with 100% similarity]
grub-core/include/grub/lib/LzmaTypes.h [moved from include/grub/lib/LzmaTypes.h with 100% similarity]
grub-core/include/grub/lib/arg.h [moved from include/grub/lib/arg.h with 100% similarity]
grub-core/include/grub/lib/crc.h [moved from include/grub/lib/crc.h with 100% similarity]
grub-core/include/grub/lib/envblk.h [moved from include/grub/lib/envblk.h with 100% similarity]
grub-core/include/grub/lib/hexdump.h [moved from include/grub/lib/hexdump.h with 100% similarity]
grub-core/include/grub/libgcc.h [moved from include/grub/libgcc.h with 100% similarity]
grub-core/include/grub/libpciaccess.h [moved from include/grub/libpciaccess.h with 100% similarity]
grub-core/include/grub/libusb.h [moved from include/grub/libusb.h with 100% similarity]
grub-core/include/grub/list.h [moved from include/grub/list.h with 100% similarity]
grub-core/include/grub/loader.h [moved from include/grub/loader.h with 100% similarity]
grub-core/include/grub/lvm.h [moved from include/grub/lvm.h with 100% similarity]
grub-core/include/grub/macho.h [moved from include/grub/macho.h with 100% similarity]
grub-core/include/grub/machoload.h [moved from include/grub/machoload.h with 100% similarity]
grub-core/include/grub/memory.h [moved from include/grub/memory.h with 100% similarity]
grub-core/include/grub/menu.h [moved from include/grub/menu.h with 100% similarity]
grub-core/include/grub/menu_viewer.h [moved from include/grub/menu_viewer.h with 100% similarity]
grub-core/include/grub/mips/at_keyboard.h [moved from include/grub/mips/at_keyboard.h with 100% similarity]
grub-core/include/grub/mips/cache.h [moved from include/grub/mips/cache.h with 100% similarity]
grub-core/include/grub/mips/cmos.h [moved from include/grub/mips/cmos.h with 100% similarity]
grub-core/include/grub/mips/io.h [moved from include/grub/mips/io.h with 100% similarity]
grub-core/include/grub/mips/kernel.h [moved from include/grub/mips/kernel.h with 100% similarity]
grub-core/include/grub/mips/multiboot.h [moved from include/grub/mips/multiboot.h with 100% similarity]
grub-core/include/grub/mips/pci.h [moved from include/grub/mips/pci.h with 100% similarity]
grub-core/include/grub/mips/qemu-mips/boot.h [moved from include/grub/mips/qemu-mips/boot.h with 100% similarity]
grub-core/include/grub/mips/qemu-mips/kernel.h [moved from include/grub/mips/qemu-mips/kernel.h with 100% similarity]
grub-core/include/grub/mips/qemu-mips/loader.h [moved from include/grub/mips/qemu-mips/loader.h with 100% similarity]
grub-core/include/grub/mips/qemu-mips/memory.h [moved from include/grub/mips/qemu-mips/memory.h with 100% similarity]
grub-core/include/grub/mips/qemu-mips/serial.h [moved from include/grub/mips/qemu-mips/serial.h with 100% similarity]
grub-core/include/grub/mips/qemu-mips/time.h [moved from include/grub/mips/qemu-mips/time.h with 100% similarity]
grub-core/include/grub/mips/relocator.h [moved from include/grub/mips/relocator.h with 100% similarity]
grub-core/include/grub/mips/setjmp.h [moved from include/grub/mips/setjmp.h with 100% similarity]
grub-core/include/grub/mips/time.h [moved from include/grub/mips/time.h with 100% similarity]
grub-core/include/grub/mips/types.h [moved from include/grub/mips/types.h with 100% similarity]
grub-core/include/grub/mips/yeeloong/at_keyboard.h [moved from include/grub/mips/yeeloong/at_keyboard.h with 100% similarity]
grub-core/include/grub/mips/yeeloong/boot.h [moved from include/grub/mips/yeeloong/boot.h with 100% similarity]
grub-core/include/grub/mips/yeeloong/cmos.h [moved from include/grub/mips/yeeloong/cmos.h with 100% similarity]
grub-core/include/grub/mips/yeeloong/kernel.h [moved from include/grub/mips/yeeloong/kernel.h with 100% similarity]
grub-core/include/grub/mips/yeeloong/loader.h [moved from include/grub/mips/yeeloong/loader.h with 100% similarity]
grub-core/include/grub/mips/yeeloong/memory.h [moved from include/grub/mips/yeeloong/memory.h with 100% similarity]
grub-core/include/grub/mips/yeeloong/pci.h [moved from include/grub/mips/yeeloong/pci.h with 100% similarity]
grub-core/include/grub/mips/yeeloong/serial.h [moved from include/grub/mips/yeeloong/serial.h with 100% similarity]
grub-core/include/grub/mips/yeeloong/time.h [moved from include/grub/mips/yeeloong/time.h with 100% similarity]
grub-core/include/grub/misc.h [moved from include/grub/misc.h with 100% similarity]
grub-core/include/grub/mm.h [moved from include/grub/mm.h with 100% similarity]
grub-core/include/grub/msdos_partition.h [moved from include/grub/msdos_partition.h with 100% similarity]
grub-core/include/grub/multiboot.h [moved from include/grub/multiboot.h with 100% similarity]
grub-core/include/grub/multiboot_loader.h [moved from include/grub/multiboot_loader.h with 100% similarity]
grub-core/include/grub/net.h [moved from include/grub/net.h with 100% similarity]
grub-core/include/grub/normal.h [moved from include/grub/normal.h with 100% similarity]
grub-core/include/grub/ntfs.h [moved from include/grub/ntfs.h with 100% similarity]
grub-core/include/grub/parser.h [moved from include/grub/parser.h with 100% similarity]
grub-core/include/grub/partition.h [moved from include/grub/partition.h with 100% similarity]
grub-core/include/grub/parttool.h [moved from include/grub/parttool.h with 100% similarity]
grub-core/include/grub/pci.h [moved from include/grub/pci.h with 100% similarity]
grub-core/include/grub/pciutils.h [moved from include/grub/pciutils.h with 100% similarity]
grub-core/include/grub/powerpc/ieee1275/biosdisk.h [moved from include/grub/powerpc/ieee1275/biosdisk.h with 100% similarity]
grub-core/include/grub/powerpc/ieee1275/console.h [moved from include/grub/powerpc/ieee1275/console.h with 100% similarity]
grub-core/include/grub/powerpc/ieee1275/ieee1275.h [moved from include/grub/powerpc/ieee1275/ieee1275.h with 100% similarity]
grub-core/include/grub/powerpc/ieee1275/kernel.h [moved from include/grub/powerpc/ieee1275/kernel.h with 100% similarity]
grub-core/include/grub/powerpc/ieee1275/loader.h [moved from include/grub/powerpc/ieee1275/loader.h with 100% similarity]
grub-core/include/grub/powerpc/ieee1275/memory.h [moved from include/grub/powerpc/ieee1275/memory.h with 100% similarity]
grub-core/include/grub/powerpc/ieee1275/time.h [moved from include/grub/powerpc/ieee1275/time.h with 100% similarity]
grub-core/include/grub/powerpc/ieee1275/util/biosdisk.h [moved from include/grub/powerpc/ieee1275/util/biosdisk.h with 100% similarity]
grub-core/include/grub/powerpc/kernel.h [moved from include/grub/powerpc/kernel.h with 100% similarity]
grub-core/include/grub/powerpc/setjmp.h [moved from include/grub/powerpc/setjmp.h with 100% similarity]
grub-core/include/grub/powerpc/time.h [moved from include/grub/powerpc/time.h with 100% similarity]
grub-core/include/grub/powerpc/types.h [moved from include/grub/powerpc/types.h with 100% similarity]
grub-core/include/grub/raid.h [moved from include/grub/raid.h with 100% similarity]
grub-core/include/grub/reader.h [moved from include/grub/reader.h with 100% similarity]
grub-core/include/grub/script_sh.h [moved from include/grub/script_sh.h with 100% similarity]
grub-core/include/grub/scsi.h [moved from include/grub/scsi.h with 100% similarity]
grub-core/include/grub/scsicmd.h [moved from include/grub/scsicmd.h with 100% similarity]
grub-core/include/grub/sdl.h [moved from include/grub/sdl.h with 100% similarity]
grub-core/include/grub/search.h [moved from include/grub/search.h with 100% similarity]
grub-core/include/grub/serial.h [moved from include/grub/serial.h with 100% similarity]
grub-core/include/grub/setjmp.h [moved from include/grub/setjmp.h with 100% similarity]
grub-core/include/grub/sparc64/ieee1275/boot.h [moved from include/grub/sparc64/ieee1275/boot.h with 100% similarity]
grub-core/include/grub/sparc64/ieee1275/console.h [moved from include/grub/sparc64/ieee1275/console.h with 100% similarity]
grub-core/include/grub/sparc64/ieee1275/ieee1275.h [moved from include/grub/sparc64/ieee1275/ieee1275.h with 100% similarity]
grub-core/include/grub/sparc64/ieee1275/kernel.h [moved from include/grub/sparc64/ieee1275/kernel.h with 100% similarity]
grub-core/include/grub/sparc64/ieee1275/loader.h [moved from include/grub/sparc64/ieee1275/loader.h with 100% similarity]
grub-core/include/grub/sparc64/ieee1275/memory.h [moved from include/grub/sparc64/ieee1275/memory.h with 100% similarity]
grub-core/include/grub/sparc64/ieee1275/time.h [moved from include/grub/sparc64/ieee1275/time.h with 100% similarity]
grub-core/include/grub/sparc64/kernel.h [moved from include/grub/sparc64/kernel.h with 100% similarity]
grub-core/include/grub/sparc64/setjmp.h [moved from include/grub/sparc64/setjmp.h with 100% similarity]
grub-core/include/grub/sparc64/time.h [moved from include/grub/sparc64/time.h with 100% similarity]
grub-core/include/grub/sparc64/types.h [moved from include/grub/sparc64/types.h with 100% similarity]
grub-core/include/grub/symbol.h [moved from include/grub/symbol.h with 100% similarity]
grub-core/include/grub/term.h [moved from include/grub/term.h with 100% similarity]
grub-core/include/grub/terminfo.h [moved from include/grub/terminfo.h with 100% similarity]
grub-core/include/grub/test.h [moved from include/grub/test.h with 93% similarity]
grub-core/include/grub/time.h [moved from include/grub/time.h with 100% similarity]
grub-core/include/grub/tparm.h [moved from include/grub/tparm.h with 100% similarity]
grub-core/include/grub/trig.h [moved from include/grub/trig.h with 100% similarity]
grub-core/include/grub/types.h [moved from include/grub/types.h with 100% similarity]
grub-core/include/grub/usb.h [moved from include/grub/usb.h with 100% similarity]
grub-core/include/grub/usbdesc.h [moved from include/grub/usbdesc.h with 100% similarity]
grub-core/include/grub/usbtrans.h [moved from include/grub/usbtrans.h with 100% similarity]
grub-core/include/grub/util/deviceiter.h [moved from include/grub/util/deviceiter.h with 100% similarity]
grub-core/include/grub/util/lvm.h [moved from include/grub/util/lvm.h with 100% similarity]
grub-core/include/grub/util/misc.h [moved from include/grub/util/misc.h with 85% similarity]
grub-core/include/grub/util/ofpath.h [moved from include/grub/util/ofpath.h with 100% similarity]
grub-core/include/grub/util/raid.h [moved from include/grub/util/raid.h with 100% similarity]
grub-core/include/grub/util/resolve.h [moved from include/grub/util/resolve.h with 100% similarity]
grub-core/include/grub/video.h [moved from include/grub/video.h with 100% similarity]
grub-core/include/grub/video_fb.h [moved from include/grub/video_fb.h with 100% similarity]
grub-core/include/grub/x86_64/at_keyboard.h [moved from include/grub/x86_64/at_keyboard.h with 100% similarity]
grub-core/include/grub/x86_64/efi/kernel.h [moved from include/grub/x86_64/efi/kernel.h with 100% similarity]
grub-core/include/grub/x86_64/efi/loader.h [moved from include/grub/x86_64/efi/loader.h with 100% similarity]
grub-core/include/grub/x86_64/efi/memory.h [moved from include/grub/x86_64/efi/memory.h with 100% similarity]
grub-core/include/grub/x86_64/efi/serial.h [moved from include/grub/x86_64/efi/serial.h with 100% similarity]
grub-core/include/grub/x86_64/efi/time.h [moved from include/grub/x86_64/efi/time.h with 100% similarity]
grub-core/include/grub/x86_64/io.h [moved from include/grub/x86_64/io.h with 100% similarity]
grub-core/include/grub/x86_64/kernel.h [moved from include/grub/x86_64/kernel.h with 100% similarity]
grub-core/include/grub/x86_64/linux.h [moved from include/grub/x86_64/linux.h with 100% similarity]
grub-core/include/grub/x86_64/macho.h [moved from include/grub/x86_64/macho.h with 100% similarity]
grub-core/include/grub/x86_64/multiboot.h [moved from include/grub/x86_64/multiboot.h with 100% similarity]
grub-core/include/grub/x86_64/pci.h [moved from include/grub/x86_64/pci.h with 100% similarity]
grub-core/include/grub/x86_64/relocator.h [moved from include/grub/x86_64/relocator.h with 100% similarity]
grub-core/include/grub/x86_64/setjmp.h [moved from include/grub/x86_64/setjmp.h with 100% similarity]
grub-core/include/grub/x86_64/time.h [moved from include/grub/x86_64/time.h with 100% similarity]
grub-core/include/grub/x86_64/types.h [moved from include/grub/x86_64/types.h with 100% similarity]
grub-core/include/grub/x86_64/xnu.h [moved from include/grub/x86_64/xnu.h with 100% similarity]
grub-core/include/grub/xnu.h [moved from include/grub/xnu.h with 100% similarity]
grub-core/include/multiboot.h [moved from include/multiboot.h with 100% similarity]
grub-core/include/multiboot2.h [moved from include/multiboot2.h with 100% similarity]
grub-core/io/bufio.c [moved from io/bufio.c with 100% similarity]
grub-core/io/gzio.c [moved from io/gzio.c with 100% similarity]
grub-core/kern/command.c [moved from kern/command.c with 100% similarity]
grub-core/kern/corecmd.c [moved from kern/corecmd.c with 100% similarity]
grub-core/kern/device.c [moved from kern/device.c with 100% similarity]
grub-core/kern/disk.c [moved from kern/disk.c with 100% similarity]
grub-core/kern/dl.c [moved from kern/dl.c with 99% similarity]
grub-core/kern/efi/efi.c [moved from kern/efi/efi.c with 100% similarity]
grub-core/kern/efi/init.c [moved from kern/efi/init.c with 100% similarity]
grub-core/kern/efi/mm.c [moved from kern/efi/mm.c with 100% similarity]
grub-core/kern/elf.c [moved from kern/elf.c with 100% similarity]
grub-core/kern/emu/cache.S [new file with mode: 0644]
grub-core/kern/emu/console.c [moved from util/console.c with 99% similarity]
grub-core/kern/emu/dl.c [new file with mode: 0644]
grub-core/kern/emu/dummy/dl.c [new file with mode: 0644]
grub-core/kern/emu/dummy/symlist.c [new file with mode: 0644]
grub-core/kern/emu/getroot.c [moved from util/getroot.c with 82% similarity]
grub-core/kern/emu/hostdisk.c [moved from util/hostdisk.c with 99% similarity]
grub-core/kern/emu/hostfs.c [moved from util/hostfs.c with 100% similarity]
grub-core/kern/emu/lite.c [new file with mode: 0644]
grub-core/kern/emu/main.c [moved from util/grub-emu.c with 90% similarity]
grub-core/kern/emu/misc.c [new file with mode: 0644]
grub-core/kern/emu/time.c [moved from util/time.c with 100% similarity]
grub-core/kern/env.c [moved from kern/env.c with 100% similarity]
grub-core/kern/err.c [moved from kern/err.c with 100% similarity]
grub-core/kern/file.c [moved from kern/file.c with 100% similarity]
grub-core/kern/fs.c [moved from kern/fs.c with 100% similarity]
grub-core/kern/generic/millisleep.c [moved from kern/generic/millisleep.c with 100% similarity]
grub-core/kern/generic/rtc_get_time_ms.c [moved from kern/generic/rtc_get_time_ms.c with 100% similarity]
grub-core/kern/handler.c [moved from kern/handler.c with 100% similarity]
grub-core/kern/i386/coreboot/init.c [moved from kern/i386/coreboot/init.c with 100% similarity]
grub-core/kern/i386/coreboot/mmap.c [moved from kern/i386/coreboot/mmap.c with 100% similarity]
grub-core/kern/i386/coreboot/startup.S [moved from kern/i386/coreboot/startup.S with 100% similarity]
grub-core/kern/i386/dl.c [moved from kern/i386/dl.c with 100% similarity]
grub-core/kern/i386/efi/init.c [moved from kern/i386/efi/init.c with 100% similarity]
grub-core/kern/i386/efi/startup.S [moved from kern/i386/efi/startup.S with 100% similarity]
grub-core/kern/i386/halt.c [moved from kern/i386/halt.c with 100% similarity]
grub-core/kern/i386/ieee1275/init.c [moved from kern/i386/ieee1275/init.c with 100% similarity]
grub-core/kern/i386/ieee1275/startup.S [moved from kern/i386/ieee1275/startup.S with 100% similarity]
grub-core/kern/i386/loader.S [moved from kern/i386/loader.S with 100% similarity]
grub-core/kern/i386/misc.S [moved from kern/i386/misc.S with 100% similarity]
grub-core/kern/i386/multiboot_mmap.c [moved from kern/i386/multiboot_mmap.c with 100% similarity]
grub-core/kern/i386/pc/init.c [moved from kern/i386/pc/init.c with 100% similarity]
grub-core/kern/i386/pc/lzma_decode.S [moved from kern/i386/pc/lzma_decode.S with 100% similarity]
grub-core/kern/i386/pc/mmap.c [moved from kern/i386/pc/mmap.c with 100% similarity]
grub-core/kern/i386/pc/startup.S [moved from kern/i386/pc/startup.S with 100% similarity]
grub-core/kern/i386/pit.c [moved from kern/i386/pit.c with 100% similarity]
grub-core/kern/i386/qemu/mmap.c [moved from kern/i386/qemu/mmap.c with 100% similarity]
grub-core/kern/i386/qemu/startup.S [moved from kern/i386/qemu/startup.S with 100% similarity]
grub-core/kern/i386/realmode.S [moved from kern/i386/realmode.S with 100% similarity]
grub-core/kern/i386/tsc.c [moved from kern/i386/tsc.c with 100% similarity]
grub-core/kern/ieee1275/cmain.c [moved from kern/ieee1275/cmain.c with 100% similarity]
grub-core/kern/ieee1275/ieee1275.c [moved from kern/ieee1275/ieee1275.c with 100% similarity]
grub-core/kern/ieee1275/init.c [moved from kern/ieee1275/init.c with 100% similarity]
grub-core/kern/ieee1275/mmap.c [moved from kern/ieee1275/mmap.c with 100% similarity]
grub-core/kern/ieee1275/openfw.c [moved from kern/ieee1275/openfw.c with 100% similarity]
grub-core/kern/list.c [moved from kern/list.c with 100% similarity]
grub-core/kern/main.c [moved from kern/main.c with 100% similarity]
grub-core/kern/mips/cache.S [moved from kern/mips/cache.S with 100% similarity]
grub-core/kern/mips/cache_flush.S [moved from kern/mips/cache_flush.S with 100% similarity]
grub-core/kern/mips/dl.c [moved from kern/mips/dl.c with 100% similarity]
grub-core/kern/mips/init.c [moved from kern/mips/init.c with 100% similarity]
grub-core/kern/mips/qemu-mips/init.c [moved from kern/mips/qemu-mips/init.c with 100% similarity]
grub-core/kern/mips/startup.S [moved from kern/mips/startup.S with 100% similarity]
grub-core/kern/mips/yeeloong/init.c [moved from kern/mips/yeeloong/init.c with 100% similarity]
grub-core/kern/misc.c [moved from kern/misc.c with 100% similarity]
grub-core/kern/mm.c [moved from kern/mm.c with 100% similarity]
grub-core/kern/parser.c [moved from kern/parser.c with 100% similarity]
grub-core/kern/partition.c [moved from kern/partition.c with 100% similarity]
grub-core/kern/powerpc/cache.S [moved from kern/powerpc/cache.S with 100% similarity]
grub-core/kern/powerpc/dl.c [moved from kern/powerpc/dl.c with 100% similarity]
grub-core/kern/powerpc/ieee1275/startup.S [moved from kern/powerpc/ieee1275/startup.S with 100% similarity]
grub-core/kern/rescue_parser.c [moved from kern/rescue_parser.c with 100% similarity]
grub-core/kern/rescue_reader.c [moved from kern/rescue_reader.c with 100% similarity]
grub-core/kern/sparc64/cache.S [moved from kern/sparc64/cache.S with 100% similarity]
grub-core/kern/sparc64/dl.c [moved from kern/sparc64/dl.c with 100% similarity]
grub-core/kern/sparc64/ieee1275/crt0.S [moved from kern/sparc64/ieee1275/crt0.S with 100% similarity]
grub-core/kern/sparc64/ieee1275/ieee1275.c [moved from kern/sparc64/ieee1275/ieee1275.c with 100% similarity]
grub-core/kern/sparc64/ieee1275/init.c [moved from kern/sparc64/ieee1275/init.c with 100% similarity]
grub-core/kern/term.c [moved from kern/term.c with 100% similarity]
grub-core/kern/time.c [moved from kern/time.c with 100% similarity]
grub-core/kern/x86_64/dl.c [moved from kern/x86_64/dl.c with 100% similarity]
grub-core/kern/x86_64/efi/callwrap.S [moved from kern/x86_64/efi/callwrap.S with 100% similarity]
grub-core/kern/x86_64/efi/startup.S [moved from kern/x86_64/efi/startup.S with 100% similarity]
grub-core/lib/LzFind.c [moved from lib/LzFind.c with 100% similarity]
grub-core/lib/LzmaDec.c [moved from lib/LzmaDec.c with 100% similarity]
grub-core/lib/LzmaEnc.c [moved from lib/LzmaEnc.c with 100% similarity]
grub-core/lib/arg.c [moved from lib/arg.c with 100% similarity]
grub-core/lib/charset.c [moved from lib/charset.c with 100% similarity]
grub-core/lib/cmos_datetime.c [moved from lib/cmos_datetime.c with 100% similarity]
grub-core/lib/crc.c [moved from lib/crc.c with 100% similarity]
grub-core/lib/crypto.c [moved from lib/crypto.c with 100% similarity]
grub-core/lib/efi/datetime.c [moved from lib/efi/datetime.c with 100% similarity]
grub-core/lib/envblk.c [moved from lib/envblk.c with 100% similarity]
grub-core/lib/hexdump.c [moved from lib/hexdump.c with 100% similarity]
grub-core/lib/i386/pc/biosnum.c [moved from lib/i386/pc/biosnum.c with 100% similarity]
grub-core/lib/i386/relocator.c [moved from lib/i386/relocator.c with 100% similarity]
grub-core/lib/i386/relocator_asm.S [moved from lib/i386/relocator_asm.S with 100% similarity]
grub-core/lib/i386/relocator_backward.S [moved from lib/i386/relocator_backward.S with 100% similarity]
grub-core/lib/i386/setjmp.S [moved from lib/i386/setjmp.S with 100% similarity]
grub-core/lib/ieee1275/datetime.c [moved from lib/ieee1275/datetime.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/ChangeLog [moved from lib/libgcrypt/cipher/ChangeLog with 100% similarity]
grub-core/lib/libgcrypt/cipher/ac.c [moved from lib/libgcrypt/cipher/ac.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/arcfour.c [moved from lib/libgcrypt/cipher/arcfour.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/bithelp.h [moved from lib/libgcrypt/cipher/bithelp.h with 100% similarity]
grub-core/lib/libgcrypt/cipher/blowfish.c [moved from lib/libgcrypt/cipher/blowfish.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/camellia-glue.c [moved from lib/libgcrypt/cipher/camellia-glue.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/camellia.c [moved from lib/libgcrypt/cipher/camellia.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/camellia.h [moved from lib/libgcrypt/cipher/camellia.h with 100% similarity]
grub-core/lib/libgcrypt/cipher/cast5.c [moved from lib/libgcrypt/cipher/cast5.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/cipher.c [moved from lib/libgcrypt/cipher/cipher.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/crc.c [moved from lib/libgcrypt/cipher/crc.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/des.c [moved from lib/libgcrypt/cipher/des.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/dsa.c [moved from lib/libgcrypt/cipher/dsa.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/ecc.c [moved from lib/libgcrypt/cipher/ecc.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/elgamal.c [moved from lib/libgcrypt/cipher/elgamal.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/hash-common.c [moved from lib/libgcrypt/cipher/hash-common.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/hash-common.h [moved from lib/libgcrypt/cipher/hash-common.h with 100% similarity]
grub-core/lib/libgcrypt/cipher/hmac-tests.c [moved from lib/libgcrypt/cipher/hmac-tests.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/md.c [moved from lib/libgcrypt/cipher/md.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/md4.c [moved from lib/libgcrypt/cipher/md4.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/md5.c [moved from lib/libgcrypt/cipher/md5.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/primegen.c [moved from lib/libgcrypt/cipher/primegen.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/pubkey.c [moved from lib/libgcrypt/cipher/pubkey.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/rfc2268.c [moved from lib/libgcrypt/cipher/rfc2268.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/rijndael-tables.h [moved from lib/libgcrypt/cipher/rijndael-tables.h with 100% similarity]
grub-core/lib/libgcrypt/cipher/rijndael.c [moved from lib/libgcrypt/cipher/rijndael.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/rmd.h [moved from lib/libgcrypt/cipher/rmd.h with 100% similarity]
grub-core/lib/libgcrypt/cipher/rmd160.c [moved from lib/libgcrypt/cipher/rmd160.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/rsa.c [moved from lib/libgcrypt/cipher/rsa.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/seed.c [moved from lib/libgcrypt/cipher/seed.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/serpent.c [moved from lib/libgcrypt/cipher/serpent.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/sha1.c [moved from lib/libgcrypt/cipher/sha1.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/sha256.c [moved from lib/libgcrypt/cipher/sha256.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/sha512.c [moved from lib/libgcrypt/cipher/sha512.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/tiger.c [moved from lib/libgcrypt/cipher/tiger.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/twofish.c [moved from lib/libgcrypt/cipher/twofish.c with 100% similarity]
grub-core/lib/libgcrypt/cipher/whirlpool.c [moved from lib/libgcrypt/cipher/whirlpool.c with 100% similarity]
grub-core/lib/libgcrypt_wrap/cipher_wrap.h [moved from lib/libgcrypt_wrap/cipher_wrap.h with 100% similarity]
grub-core/lib/mips/relocator.c [moved from lib/mips/relocator.c with 100% similarity]
grub-core/lib/mips/relocator_asm.S [moved from lib/mips/relocator_asm.S with 100% similarity]
grub-core/lib/mips/setjmp.S [moved from lib/mips/setjmp.S with 100% similarity]
grub-core/lib/pbkdf2.c [moved from lib/pbkdf2.c with 100% similarity]
grub-core/lib/posix_wrap/assert.h [moved from lib/posix_wrap/assert.h with 100% similarity]
grub-core/lib/posix_wrap/ctype.h [moved from lib/posix_wrap/ctype.h with 100% similarity]
grub-core/lib/posix_wrap/errno.h [moved from lib/posix_wrap/errno.h with 100% similarity]
grub-core/lib/posix_wrap/langinfo.h [moved from lib/posix_wrap/langinfo.h with 100% similarity]
grub-core/lib/posix_wrap/limits.h [moved from lib/posix_wrap/limits.h with 100% similarity]
grub-core/lib/posix_wrap/localcharset.h [moved from lib/posix_wrap/localcharset.h with 100% similarity]
grub-core/lib/posix_wrap/locale.h [moved from lib/posix_wrap/locale.h with 100% similarity]
grub-core/lib/posix_wrap/stdint.h [moved from lib/posix_wrap/stdint.h with 100% similarity]
grub-core/lib/posix_wrap/stdio.h [moved from lib/posix_wrap/stdio.h with 100% similarity]
grub-core/lib/posix_wrap/stdlib.h [moved from lib/posix_wrap/stdlib.h with 98% similarity]
grub-core/lib/posix_wrap/string.h [moved from lib/posix_wrap/string.h with 97% similarity]
grub-core/lib/posix_wrap/sys/types.h [moved from lib/posix_wrap/sys/types.h with 100% similarity]
grub-core/lib/posix_wrap/unistd.h [moved from lib/posix_wrap/unistd.h with 100% similarity]
grub-core/lib/posix_wrap/wchar.h [moved from lib/posix_wrap/wchar.h with 100% similarity]
grub-core/lib/posix_wrap/wctype.h [moved from lib/posix_wrap/wctype.h with 100% similarity]
grub-core/lib/powerpc/setjmp.S [moved from lib/powerpc/setjmp.S with 100% similarity]
grub-core/lib/relocator.c [moved from lib/relocator.c with 100% similarity]
grub-core/lib/sparc64/setjmp.S [moved from lib/sparc64/setjmp.S with 100% similarity]
grub-core/lib/x86_64/setjmp.S [moved from lib/x86_64/setjmp.S with 100% similarity]
grub-core/loader/aout.c [moved from loader/aout.c with 100% similarity]
grub-core/loader/efi/appleloader.c [moved from loader/efi/appleloader.c with 100% similarity]
grub-core/loader/efi/chainloader.c [moved from loader/efi/chainloader.c with 100% similarity]
grub-core/loader/i386/bsd.c [moved from loader/i386/bsd.c with 100% similarity]
grub-core/loader/i386/bsd32.c [moved from loader/i386/bsd32.c with 100% similarity]
grub-core/loader/i386/bsd64.c [moved from loader/i386/bsd64.c with 100% similarity]
grub-core/loader/i386/bsdXX.c [moved from loader/i386/bsdXX.c with 100% similarity]
grub-core/loader/i386/bsd_helper.S [moved from loader/i386/bsd_helper.S with 100% similarity]
grub-core/loader/i386/bsd_pagetable.c [moved from loader/i386/bsd_pagetable.c with 100% similarity]
grub-core/loader/i386/bsd_trampoline.S [moved from loader/i386/bsd_trampoline.S with 100% similarity]
grub-core/loader/i386/efi/linux.c [moved from loader/i386/efi/linux.c with 100% similarity]
grub-core/loader/i386/efi/xnu.c [moved from loader/i386/efi/xnu.c with 100% similarity]
grub-core/loader/i386/ieee1275/linux.c [moved from loader/i386/ieee1275/linux.c with 100% similarity]
grub-core/loader/i386/linux.c [moved from loader/i386/linux.c with 100% similarity]
grub-core/loader/i386/linux_trampoline.S [moved from loader/i386/linux_trampoline.S with 100% similarity]
grub-core/loader/i386/multiboot_mbi.c [moved from loader/i386/multiboot_mbi.c with 100% similarity]
grub-core/loader/i386/pc/chainloader.c [moved from loader/i386/pc/chainloader.c with 100% similarity]
grub-core/loader/i386/pc/linux.c [moved from loader/i386/pc/linux.c with 100% similarity]
grub-core/loader/i386/pc/xnu.c [moved from loader/i386/pc/xnu.c with 100% similarity]
grub-core/loader/i386/xnu.c [moved from loader/i386/xnu.c with 100% similarity]
grub-core/loader/macho.c [moved from loader/macho.c with 100% similarity]
grub-core/loader/macho32.c [moved from loader/macho32.c with 100% similarity]
grub-core/loader/macho64.c [moved from loader/macho64.c with 100% similarity]
grub-core/loader/machoXX.c [moved from loader/machoXX.c with 100% similarity]
grub-core/loader/mips/linux.c [moved from loader/mips/linux.c with 100% similarity]
grub-core/loader/multiboot.c [moved from loader/multiboot.c with 100% similarity]
grub-core/loader/multiboot_elfxx.c [moved from loader/multiboot_elfxx.c with 100% similarity]
grub-core/loader/multiboot_mbi2.c [moved from loader/multiboot_mbi2.c with 100% similarity]
grub-core/loader/powerpc/ieee1275/linux.c [moved from loader/powerpc/ieee1275/linux.c with 100% similarity]
grub-core/loader/sparc64/ieee1275/linux.c [moved from loader/sparc64/ieee1275/linux.c with 100% similarity]
grub-core/loader/xnu.c [moved from loader/xnu.c with 100% similarity]
grub-core/loader/xnu_resume.c [moved from loader/xnu_resume.c with 100% similarity]
grub-core/mmap/efi/mmap.c [moved from mmap/efi/mmap.c with 100% similarity]
grub-core/mmap/i386/mmap.c [moved from mmap/i386/mmap.c with 100% similarity]
grub-core/mmap/i386/pc/mmap.c [moved from mmap/i386/pc/mmap.c with 100% similarity]
grub-core/mmap/i386/pc/mmap_helper.S [moved from mmap/i386/pc/mmap_helper.S with 100% similarity]
grub-core/mmap/i386/uppermem.c [moved from mmap/i386/uppermem.c with 100% similarity]
grub-core/mmap/mips/yeeloong/uppermem.c [moved from mmap/mips/yeeloong/uppermem.c with 100% similarity]
grub-core/mmap/mmap.c [moved from mmap/mmap.c with 100% similarity]
grub-core/modules.def [new file with mode: 0644]
grub-core/normal/auth.c [moved from normal/auth.c with 100% similarity]
grub-core/normal/autofs.c [moved from normal/autofs.c with 100% similarity]
grub-core/normal/cmdline.c [moved from normal/cmdline.c with 100% similarity]
grub-core/normal/color.c [moved from normal/color.c with 100% similarity]
grub-core/normal/completion.c [moved from normal/completion.c with 100% similarity]
grub-core/normal/context.c [moved from normal/context.c with 100% similarity]
grub-core/normal/crypto.c [moved from normal/crypto.c with 100% similarity]
grub-core/normal/datetime.c [moved from normal/datetime.c with 100% similarity]
grub-core/normal/dyncmd.c [moved from normal/dyncmd.c with 100% similarity]
grub-core/normal/handler.c [moved from normal/handler.c with 100% similarity]
grub-core/normal/main.c [moved from normal/main.c with 100% similarity]
grub-core/normal/menu.c [moved from normal/menu.c with 100% similarity]
grub-core/normal/menu_entry.c [moved from normal/menu_entry.c with 100% similarity]
grub-core/normal/menu_text.c [moved from normal/menu_text.c with 100% similarity]
grub-core/normal/misc.c [moved from normal/misc.c with 100% similarity]
grub-core/normal/term.c [moved from normal/term.c with 100% similarity]
grub-core/partmap/acorn.c [moved from partmap/acorn.c with 100% similarity]
grub-core/partmap/amiga.c [moved from partmap/amiga.c with 100% similarity]
grub-core/partmap/apple.c [moved from partmap/apple.c with 100% similarity]
grub-core/partmap/bsdlabel.c [moved from partmap/bsdlabel.c with 100% similarity]
grub-core/partmap/gpt.c [moved from partmap/gpt.c with 100% similarity]
grub-core/partmap/msdos.c [moved from partmap/msdos.c with 100% similarity]
grub-core/partmap/sun.c [moved from partmap/sun.c with 100% similarity]
grub-core/partmap/sunpc.c [moved from partmap/sunpc.c with 100% similarity]
grub-core/parttool/msdospart.c [moved from parttool/msdospart.c with 100% similarity]
grub-core/po/Makefile.am [new file with mode: 0644]
grub-core/po/POTFILES [moved from po/POTFILES with 100% similarity]
grub-core/po/POTFILES-shell [moved from po/POTFILES-shell with 100% similarity]
grub-core/po/README [moved from po/README with 100% similarity]
grub-core/script/execute.c [moved from script/execute.c with 100% similarity]
grub-core/script/function.c [moved from script/function.c with 100% similarity]
grub-core/script/lexer.c [moved from script/lexer.c with 100% similarity]
grub-core/script/main.c [moved from script/main.c with 100% similarity]
grub-core/script/parser.y [moved from script/parser.y with 100% similarity]
grub-core/script/script.c [moved from script/script.c with 100% similarity]
grub-core/script/yylex.l [moved from script/yylex.l with 100% similarity]
grub-core/term/at_keyboard.c [moved from term/at_keyboard.c with 100% similarity]
grub-core/term/efi/console.c [moved from term/efi/console.c with 100% similarity]
grub-core/term/gfxterm.c [moved from term/gfxterm.c with 100% similarity]
grub-core/term/i386/pc/console.c [moved from term/i386/pc/console.c with 100% similarity]
grub-core/term/i386/pc/vga.c [moved from term/i386/pc/vga.c with 100% similarity]
grub-core/term/i386/pc/vga_text.c [moved from term/i386/pc/vga_text.c with 100% similarity]
grub-core/term/i386/vga_common.c [moved from term/i386/vga_common.c with 100% similarity]
grub-core/term/ieee1275/ofconsole.c [moved from term/ieee1275/ofconsole.c with 100% similarity]
grub-core/term/serial.c [moved from term/serial.c with 100% similarity]
grub-core/term/terminfo.c [moved from term/terminfo.c with 100% similarity]
grub-core/term/tparm.c [moved from term/tparm.c with 100% similarity]
grub-core/term/usb_keyboard.c [moved from term/usb_keyboard.c with 100% similarity]
grub-core/tests/example_functional_test.c [moved from tests/example_functional_test.c with 95% similarity]
grub-core/tests/lib/functional_test.c [moved from tests/lib/functional_test.c with 100% similarity]
grub-core/tests/lib/test.c [moved from tests/lib/test.c with 100% similarity]
grub-core/video/bitmap.c [moved from video/bitmap.c with 100% similarity]
grub-core/video/bitmap_scale.c [moved from video/bitmap_scale.c with 100% similarity]
grub-core/video/efi_gop.c [moved from video/efi_gop.c with 100% similarity]
grub-core/video/efi_uga.c [moved from video/efi_uga.c with 100% similarity]
grub-core/video/emu/sdl.c [moved from util/sdl.c with 100% similarity]
grub-core/video/fb/fbblit.c [moved from video/fb/fbblit.c with 100% similarity]
grub-core/video/fb/fbfill.c [moved from video/fb/fbfill.c with 100% similarity]
grub-core/video/fb/fbutil.c [moved from video/fb/fbutil.c with 100% similarity]
grub-core/video/fb/video_fb.c [moved from video/fb/video_fb.c with 100% similarity]
grub-core/video/i386/pc/vbe.c [moved from video/i386/pc/vbe.c with 100% similarity]
grub-core/video/ieee1275.c [moved from video/ieee1275.c with 100% similarity]
grub-core/video/readers/jpeg.c [moved from video/readers/jpeg.c with 100% similarity]
grub-core/video/readers/png.c [moved from video/readers/png.c with 100% similarity]
grub-core/video/readers/tga.c [moved from video/readers/tga.c with 100% similarity]
grub-core/video/sm712.c [moved from video/sm712.c with 100% similarity]
grub-core/video/video.c [moved from video/video.c with 100% similarity]
modules.def [new file with mode: 0644]
po/Makefile.am [new file with mode: 0644]
tests/example_grub_script_test.in
tests/lib/unit_test.c
tests/util/grub-shell-tester.in
tests/util/grub-shell.in
util/elf/grub-mkimage.c
util/grub-editenv.c
util/grub-fstest.c
util/grub-mkdevicemap.c
util/grub-mkfont.c
util/grub-mkpasswd-pbkdf2.c
util/grub-mkrawimage.c
util/grub-mkrelpath.c
util/grub-mkrescue.in
util/grub-probe.c
util/grub-script-check.c
util/i386/efi/grub-mkimage.c
util/i386/pc/grub-setup.c
util/lvm.c
util/misc.c
util/raid.c
util/resolve.c
util/sparc64/ieee1275/grub-setup.c

index 46e8637..f91e72e 100644 (file)
@@ -71,3 +71,9 @@ stamp-h.in
 symlist.c
 trigtables.c
 update-grub_lib
+Makefile.in
+modules.am
+GPATH
+GRTAGS
+GSYMS
+GTAGS
\ No newline at end of file
diff --git a/ABOUT-NLS b/ABOUT-NLS
new file mode 100644 (file)
index 0000000..866b904
--- /dev/null
+++ b/ABOUT-NLS
@@ -0,0 +1,223 @@
+1 Notes on the Free Translation Project
+***************************************
+
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work on translations can contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+1.1 Quick configuration advice
+==============================
+
+If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+1.2 INSTALL Matters
+===================
+
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will, respectively, bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages usually have many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+1.3 Using This Package
+======================
+
+As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
+and `CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+1.4 Translating Teams
+=====================
+
+For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
+
+1.5 Available Packages
+======================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of October
+2006.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+# Matrix here is removed!
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If October 2006 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+matrix with full percentage details can be found at
+`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+
+1.6 Using `gettext' in new packages
+===================================
+
+If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+the use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`translation@iro.umontreal.ca' to make the `.pot' files available to
+the translation teams.
+
diff --git a/Makefile.am b/Makefile.am
new file mode 100644 (file)
index 0000000..d962963
--- /dev/null
@@ -0,0 +1,87 @@
+AUTOMAKE_OPTIONS = subdir-objects
+DEPDIR = .deps-util
+
+EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def             \
+                                                                       \
+       geninit.sh                                                      \
+                                                                       \
+       gnulib/progname.h gnulib/fnmatch_loop.c gnulib/alloca.h         \
+       gnulib/error.h gnulib/fnmatch.h gnulib/getopt.h                 \
+       gnulib/getopt_int.h gnulib/gettext.h gnulib/progname.h          \
+                                                                       \
+       util/mkisofs/mkisofs.h util/mkisofs/iso9660.h                   \
+       util/mkisofs/include/prototyp.h util/mkisofs/defaults.h         \
+       util/mkisofs/match.h util/mkisofs/exclude.h                     \
+       util/mkisofs/msdos_partition.h util/mkisofs/include/fctldefs.h  \
+       util/mkisofs/include/mconfig.h util/mkisofs/include/statdefs.h
+
+SUBDIRS = . grub-core po docs
+
+include $(top_srcdir)/grub-core/Makefile.vars
+
+CFLAGS_PROGRAM = $(HOST_CFLAGS) $(CFLAGS_GNULIB)
+LDFLAGS_PROGRAM = $(HOST_LDFLAGS) $(LDFLAGS_GNULIB) $(LIBINTL)
+CPPFLAGS_PROGRAM = $(HOST_CPPFLAGS) $(CPPFLAGS_GNULIB)
+CCASFLAGS_PROGRAM = $(HOST_CCASFLAGS) $(CCASFLAGS_GNULIB)
+
+CFLAGS_LIBRARY = $(CFLAGS_PROGRAM)
+CPPFLAGS_LIBRARY = $(CPPFLAGS_PROGRAM)
+CCASFLAGS_LIBRARY = $(CCASFLAGS_PROGRAM)
+
+AM_CFLAGS =
+AM_LDFLAGS =
+AM_CPPFLAGS = $(CPPFLAGS_GRUB) -DGRUB_FILE=\"$(subst $(top_srcdir)/,,$<)\"
+AM_CCASFLAGS = -DASM_FILE=1
+
+# XXX Use Automake's LEX & YACC support
+grub_script.tab.c grub_script.tab.h: $(top_srcdir)/grub-core/script/parser.y
+       $(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/grub-core/script/parser.y
+CLEANFILES += grub_script.tab.c grub_script.tab.h
+
+# For the lexer.
+grub_script.yy.c grub_script.yy.h: $(top_srcdir)/grub-core/script/yylex.l
+       $(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/grub-core/script/yylex.l
+CLEANFILES += grub_script.yy.c grub_script.yy.h
+
+# For libutil.a
+libutil_a_init.lst: grub_script.tab.h grub_script.yy.h $(libutil_a_SOURCES)
+       rm -f $@
+       $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutil_a_CPPFLAGS) $(CPPFLAGS) \
+         -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ \
+         | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
+CLEANFILES += libutil_a_init.lst
+
+libutil_a_init.c: libutil_a_init.lst $(top_srcdir)/geninit.sh
+       rm -f $@; sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
+CLEANFILES += libutil_a_init.c
+
+if COND_GRUB_MKFONT
+if COND_HAVE_FONT_SOURCE
+pkgdata_DATA = unicode.pf2 ascii.pf2 ascii.h
+endif
+endif
+
+unicode.pf2: $(FONT_SOURCE) grub-mkfont
+       $(builddir)/grub-mkfont -o $@ $(FONT_SOURCE)
+CLEANFILES += unicode.pf2
+
+# Arrows and lines are needed to draw the menu, so always include them
+UNICODE_ARROWS=0x2190-0x2193
+UNICODE_LINES=0x2501-0x251B
+
+ascii.pf2: $(FONT_SOURCE) grub-mkfont
+       $(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
+CLEANFILES += ascii.pf2
+
+ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
+       $(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
+CLEANFILES += ascii.bitmaps
+
+ascii.h: ascii.bitmaps grub-bin2h
+       $(builddir)/grub-bin2h ascii_bitmaps < $< > $@
+       cp $@ $(top_builddir)/grub-core/include
+CLEANFILES += ascii.h $(top_builddir)/grub-core/include/ascii.h
+
+platform_HEADERS = config.h
+
+include $(srcdir)/modules.am
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644 (file)
index 822a087..0000000
+++ /dev/null
@@ -1,564 +0,0 @@
-# -*- makefile -*-
-#
-# Copyright (C) 1994,1995,1996,1997,1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
-#
-# This Makefile.in is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-### The configure script will replace these variables.
-
-SHELL = /bin/sh
-
-@SET_MAKE@
-
-transform = @program_transform_name@
-
-srcdir = @srcdir@
-builddir = @builddir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datarootdir = @datarootdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-localedir = @localedir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-pkgdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
-pkglibdir =  $(libdir)/`echo @PACKAGE_TARNAME@/$(target_cpu)-$(platform) | sed '$(transform)'`
-
-# Internationalization library.
-LIBINTL = @LIBINTL@
-TARGET_NO_MODULES = @TARGET_NO_MODULES@
-
-# Util library.
-LIBUTIL = @LIBUTIL@
-
-XGETTEXT = @XGETTEXT@
-MSGMERGE = @MSGMERGE@
-MSGFMT = @MSGFMT@
-
-LINGUAS = $(shell for i in $(srcdir)/po/*.po ; do \
-                       if test -e $$i ; then echo $$i ; fi ; \
-               done | sed -e "s,.*/po/\(.*\)\.po$$,\1,")
-
-PACKAGE = @PACKAGE@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
-host_os = @host_os@
-host_kernel = @host_kernel@
-host_cpu = @host_cpu@
-
-target_cpu = @target_cpu@
-platform = @platform@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-MKDIR_P = @MKDIR_P@
-
-mkinstalldirs = $(srcdir)/mkinstalldirs
-
-LIBS = @LIBS@ $(LIBINTL) $(LIBUTIL)
-
-CC = @CC@
-CFLAGS = @CFLAGS@
-POSIX_CFLAGS = -I$(srcdir)/lib/posix_wrap 
-GNULIB_UTIL_CFLAGS = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))" -I$(srcdir)/gnulib
-GNULIB_CFLAGS = $(GNULIB_UTIL_CFLAGS) $(POSIX_CFLAGS)
-ASFLAGS = @ASFLAGS@
-LDFLAGS = @LDFLAGS@ $(LIBS)
-CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
-        -DGRUB_LIBDIR=\"$(pkglibdir)\" -DLOCALEDIR=\"$(localedir)\"
-TARGET_CC = @TARGET_CC@
-TARGET_CFLAGS = -ffreestanding @TARGET_CFLAGS@
-TARGET_ASFLAGS = -nostdinc -fno-builtin @TARGET_ASFLAGS@
-TARGET_MODULE_FORMAT = @TARGET_MODULE_FORMAT@
-TARGET_APPLE_CC = @TARGET_APPLE_CC@
-OBJCONV = @OBJCONV@
-TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(builddir)/include \
-       -Wall -W
-TARGET_LDFLAGS = -nostdlib -static-libgcc @TARGET_LDFLAGS@
-TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
-TARGET_IMG_LDFLAGS = -nostdlib @TARGET_IMG_LDFLAGS@
-TARGET_IMG_CFLAGS = @TARGET_IMG_CFLAGS@
-TARGET_OBJ2ELF = @TARGET_OBJ2ELF@
-kernel_img_LDFLAGS = -lgcc
-EXEEXT = @EXEEXT@
-OBJCOPY = @OBJCOPY@
-STRIP = @STRIP@
-NM = @NM@
-RUBY = @RUBY@
-MAKEINFO = @MAKEINFO@
-ifeq (, $(MAKEINFO))
-MAKEINFO = true
-endif
-HELP2MAN = @HELP2MAN@
-ifeq (, $(HELP2MAN))
-HELP2MAN = true
-else
-HELP2MAN := LANG=C $(HELP2MAN) --no-info --source=FSF
-endif
-AWK = @AWK@
-LIBCURSES = @LIBCURSES@
-LIBUSB = @LIBUSB@
-LIBSDL = @LIBSDL@
-LIBPCIACCESS = @LIBPCIACCESS@
-LEX = @LEX@
-YACC = @YACC@
-FONT_SOURCE = @FONT_SOURCE@
-
-# Options.
-enable_grub_emu_usb = @enable_grub_emu_usb@
-enable_grub_emu_sdl = @enable_grub_emu_sdl@
-enable_grub_emu_pci = @enable_grub_emu_pci@
-enable_grub_fstest = @enable_grub_fstest@
-enable_grub_pe2elf = @enable_grub_pe2elf@
-enable_grub_mkfont = @enable_grub_mkfont@
-freetype_cflags = @freetype_cflags@
-freetype_libs = @freetype_libs@
-enable_efiemu = @enable_efiemu@
-
-### General variables.
-
-RMKFILES = $(wildcard $(srcdir)/conf/*.rmk)
-
-MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
-
-PKGLIB = $(pkglib_IMAGES) $(pkglib_MODULES) $(pkglib_PROGRAMS) \
-       $(pkglib_DATA) $(pkglib_BUILDDIR)
-PKGDATA = $(pkgdata_DATA)
-PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES)
-SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(grub-mkconfig_SCRIPTS) \
-       $(lib_SCRIPTS)
-INFOS = $(info_INFOS)
-
-CLEANFILES =
-MOSTLYCLEANFILES =
-DISTCLEANFILES = config.status config.cache config.log config.h \
-       Makefile stamp-h stamp-h1 include/grub/cpu include/grub/machine \
-       gensymlist.sh genkernsyms.sh build_env.mk \
-       docs/grub.info docs/version.texi docs/stamp-vti
-
-MAINTAINER_CLEANFILES = $(srcdir)/configure $(srcdir)/aclocal.m4 \
-       $(MKFILES) $(srcdir)/config.guess \
-       $(srcdir)/config.sub $(srcdir)/install-sh $(srcdir)/missing \
-       $(srcdir)/DISTLIST $(srcdir)/config.h.in $(srcdir)/stamp-h.in $(INFOS)
-
-# The default target.
-all: all-local
-
-### Include an arch-specific Makefile.
-$(addprefix $(srcdir)/,$(MKFILES)): %.mk: %.rmk genmk.rb
-       if test "x$(RUBY)" = x; then \
-         touch $@; \
-       else \
-         $(RUBY) $(srcdir)/genmk.rb < $< > $@; \
-       fi
-
-ifeq ($(platform), emu)
-include $(srcdir)/conf/any-emu.mk
-else
-include $(srcdir)/conf/$(target_cpu)-$(platform).mk
-# For tests.
-include $(srcdir)/conf/tests.mk
-# For external modules.
--include $(wildcard $(GRUB_CONTRIB)/*/conf/common.mk)
-endif
-
-ifeq ($(TARGET_NO_MODULES), yes)
-       TARGET_CFLAGS += -DGRUB_TARGET_NO_MODULES=1
-       CFLAGS += -DGRUB_TARGET_NO_MODULES=1
-endif
-
-### General targets.
-
-CLEANFILES += $(pkglib_DATA) $(pkgdata_DATA) po/*.mo
-ifneq ($(TARGET_NO_MODULES), yes)
-pkglib_DATA += moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
-endif
-moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep.awk
-       cat $(DEFSYMFILES) /dev/null \
-         | $(AWK) -f $(srcdir)/genmoddep.awk $(UNDSYMFILES) > $@ \
-         || (rm -f $@; exit 1)
-
-command.lst: $(COMMANDFILES)
-       cat $^ /dev/null | sort > $@
-
-fs.lst: $(FSFILES)
-       cat $^ /dev/null | sort > $@
-
-partmap.lst: $(PARTMAPFILES)
-       cat $^ /dev/null | sort > $@
-
-handler.lst: $(HANDLERFILES)
-       cat $^ /dev/null | sort > $@
-
-terminal.lst: $(TERMINALFILES)
-       cat $^ /dev/null | sort > $@
-
-parttool.lst: $(PARTTOOLFILES)
-       cat $^ /dev/null | sort | uniq > $@
-
-video.lst: $(VIDEOFILES)
-       cat $^ /dev/null | sort | uniq > $@
-
-crypto.lst: lib/libgcrypt-grub/cipher/crypto.lst
-       cp $^ $@
-
-ifneq (true, $(MAKEINFO))
-info_INFOS += docs/grub.info
-endif
-
-MOSTLYCLEANFILES += vti.tmp
-MAINTAINER_CLEANFILES += docs/stamp-vti docs/version.texi
-docs/version.texi: docs/stamp-vti
-docs/stamp-vti: docs/grub.texi configure.ac
-       $(MKDIR_P) docs
-       (set `$(SHELL) $(srcdir)/docs/mdate-sh $<`; \
-       echo "@set UPDATED $$1 $$2 $$3"; \
-       echo "@set UPDATED-MONTH $$2 $$3"; \
-       echo "@set EDITION $(PACKAGE_VERSION)"; \
-       echo "@set VERSION $(PACKAGE_VERSION)") > vti.tmp
-       @cmp -s vti.tmp $(builddir)/docs/version.texi \
-         || (echo "Updating $(builddir)/docs/version.texi"; \
-             cp vti.tmp $(builddir)/docs/version.texi)
-       -@rm -f vti.tmp
-       @cp $(builddir)/docs/version.texi $@
-
-# Use --force until such time as the documentation is cleaned up.
-docs/grub.info: docs/grub.texi docs/version.texi docs/fdl.texi
-       $(MKDIR_P) docs
-       -$(MAKEINFO) -P $(builddir)/docs --no-split --force $< -o $@
-
-ifeq (, $(FONT_SOURCE))
-else
-
-ifeq ($(enable_grub_mkfont),yes)
-
-pkgdata_DATA += unicode.pf2 ascii.pf2 ascii.h
-CLEANFILES += ascii.bitmaps
-
-# Arrows and lines are needed to draw the menu, so we always include them
-UNICODE_ARROWS=0x2190-0x2193
-UNICODE_LINES=0x2501-0x251B
-
-unicode.pf2: $(FONT_SOURCE) grub-mkfont
-       $(builddir)/grub-mkfont -o $@ $(FONT_SOURCE)
-
-ascii.pf2: $(FONT_SOURCE) grub-mkfont
-       $(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
-
-ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
-       $(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
-
-ascii.h: ascii.bitmaps grub-bin2h
-       $(builddir)/grub-bin2h ascii_bitmaps < $< > $@
-
-TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1
-endif
-endif
-
-# Used for building modules externally
-pkglib_BUILDDIR += build_env.mk
-build_env.mk: Makefile
-       (\
-       echo "TARGET_CC=$(TARGET_CC)" ; \
-       echo "TARGET_CFLAGS=$(TARGET_CFLAGS)" ; \
-       echo "TARGET_ASFLAGS=$(TARGET_ASFLAGS)" ; \
-       echo "TARGET_CPPFLAGS=$(TARGET_CPPFLAGS) -I$(pkglibdir) -I$(includedir)" ; \
-       echo "STRIP=$(STRIP)" ; \
-       echo "OBJCONV=$(OBJCONV)" ; \
-       echo "TARGET_MODULE_FORMAT=$(TARGET_MODULE_FORMAT)" ; \
-       echo "TARGET_APPLE_CC=$(TARGET_APPLE_CC)" ; \
-       echo "COMMON_ASFLAGS=$(COMMON_ASFLAGS)" ; \
-       echo "COMMON_CFLAGS=$(COMMON_CFLAGS)" ; \
-       echo "COMMON_LDFLAGS=$(COMMON_LDFLAGS)"\
-       ) > $@
-pkglib_BUILDDIR += config.h grub_script.tab.h
-
-all-local: $(PROGRAMS) $(GRUB_EMU) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES) $(foreach lang, $(LINGUAS), po/$(lang).mo)
-
-install: install-local
-
-install-local: all
-       $(SHELL) $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-       rm -f $(DESTDIR)$(pkglibdir)/*
-       @list='$(PKGLIB)'; \
-       for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,'`"; \
-         $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkglibdir)/$$dest; \
-       done
-       $(SHELL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-       @list='$(PKGDATA)'; \
-       for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,'`"; \
-         $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkgdatadir)/$$dest; \
-       done
-       $(SHELL) $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-       @list='$(bin_UTILITIES) $(GRUB_EMU)'; for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-         $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-         $(HELP2MAN) --section=1 -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
-       done
-       $(SHELL) $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
-       @list='$(sbin_UTILITIES)'; for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-         $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-         $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
-       done
-       @list='$(bin_SCRIPTS)'; for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-         $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-         $(HELP2MAN) --section=1 -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
-       done
-       @list='$(sbin_SCRIPTS)'; for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-         $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-         $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
-       done
-       $(SHELL) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
-       @list='$(grub-mkconfig_SCRIPTS)'; for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-         $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
-       done
-       @list='$(grub-mkconfig_DATA)'; for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-         $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
-       done
-       $(SHELL) $(mkinstalldirs) $(DESTDIR)$(libdir)/grub
-       @list='$(lib_SCRIPTS)'; \
-       for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,'`"; \
-         $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \
-       done
-       @langs='$(LINGUAS)'; \
-       for lang in $$langs; do \
-         $(SHELL) $(mkinstalldirs) $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES; \
-         file="po/$$lang.mo"; \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         $(INSTALL_DATA) $$dir$$file $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
-       done
-       $(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
-       @list='$(info_INFOS)'; \
-       for file in $$list; do \
-         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-         dest="`echo $$file | sed 's,.*/,,'`"; \
-         $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(infodir); \
-         if (install-info --version && \
-              install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-           install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$dest" || :; \
-         fi; \
-       done
-
-install-strip:
-       $(MAKE) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" install
-
-uninstall:
-       @list='$(PKGLIB)'; \
-       for file in $$list; do \
-         dest="`echo $$file | sed 's,.*/,,'`"; \
-         rm -f $(DESTDIR)$(pkglibdir)/$$dest; \
-       done
-       @list='$(PKGDATA)'; \
-       for file in $$list; do \
-         dest="`echo $$file | sed 's,.*/,,'`"; \
-         rm -f $(DESTDIR)$(pkgdatadir)/$$dest; \
-       done
-       @list='$(bin_UTILITIES) $(bin_SCRIPTS) $(GRUB_EMU)'; for file in $$list; do \
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-         rm -f $(DESTDIR)$(bindir)/$$dest; \
-         rm -f $(DESTDIR)$(mandir)/man1/$$dest.1; \
-       done
-       @list='$(sbin_UTILITIES) $(sbin_SCRIPTS)'; for file in $$list; do \
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-         rm -f $(DESTDIR)$(sbindir)/$$dest; \
-         rm -f $(DESTDIR)$(mandir)/man8/$$dest.8; \
-       done
-       @list='$(grub-mkconfig_SCRIPTS) $(grub-mkconfig_DATA)'; for file in $$list; do \
-         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-         rm -f $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
-       done
-       @list='$(lib_SCRIPTS)'; \
-       for file in $$list; do \
-         dest="`echo $$file | sed 's,.*/,,'`"; \
-         rm -f $(DESTDIR)$(libdir)/grub/$$dest; \
-       done
-       @list='$(info_INFOS)'; \
-       for file in $$list; do \
-         dest="`echo $$file | sed 's,.*/,,'`"; \
-         if (install-info --version && \
-              install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-           if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$dest"; then \
-             :; \
-           else \
-             test ! -f "$(DESTDIR)$(infodir)/$$dest" || exit 1; \
-           fi; \
-         fi; \
-         rm -f $(DESTDIR)$(infodir)/$$dest; \
-       done
-
-clean: $(CLEAN_IMAGE_TARGETS) $(CLEAN_MODULE_TARGETS) $(CLEAN_UTILITY_TARGETS)
-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-mostlyclean: clean $(MOSTLYCLEAN_IMAGE_TARGETS) $(MOSTLYCLEAN_MODULE_TARGETS) $(MOSTLYCLEAN_UTILITY_TARGETS)
-       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-distclean: mostlyclean
-       -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-       -rm -rf $(srcdir)/autom4te.cache
-
-maintainer-clean: distclean
-       -test -z "$(MAINTAINER_CLEANFILES)" || rm -f $(MAINTAINER_CLEANFILES)
-       -rmdir $(srcdir)/lib/libgcrypt-grub/cipher
-       -rmdir $(srcdir)/lib/libgcrypt-grub
-
-info:
-
-dvi:
-
-distdir=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-
-DISTLIST: gendistlist.sh
-       $(SHELL) $(srcdir)/gendistlist.sh > $(srcdir)/DISTLIST
-
-distdir: DISTLIST
-       -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
-       $(SHELL) $(mkinstalldirs) $(distdir)
-       for i in `cat $(srcdir)/DISTLIST`; do \
-         dir=`echo "$$i" | sed 's:/[^/]*$$::'`; \
-         if test -d $(srcdir)/$$dir; then \
-           $(SHELL) $(mkinstalldirs) $(distdir)/$$dir; \
-         fi; \
-         cp -p $(srcdir)/$$i $(distdir)/$$i || exit 1; \
-       done
-       chmod -R a+r $(distdir)
-
-GZIP_ENV = --best
-
-dist: distdir
-       tar chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-       -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
-
-distcheck: dist
-       -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
-       GZIP=$(GZIP_ENV) gzip -cd $(distdir).tar.gz | tar xf -
-       chmod -R a-w $(distdir)
-       chmod a+w $(distdir)
-       mkdir $(distdir)/=build
-       mkdir $(distdir)/=inst
-       chmod a-w $(distdir)
-       dc_instdir=`CDPATH=: && cd $(distdir)/=inst && pwd` \
-         && cd $(distdir)/=build \
-         && $(SHELL) ../configure --srcdir=.. --prefix=$$dc_instdir \
-         && $(MAKE) all dvi check install && $(MAKE) uninstall \
-         && (test `find $$dc_instdir -type f -print | wc -l` -le 1 \
-            || (echo "Error: files left after uninstall" 1>&2; \
-                exit 1)) \
-         && $(MAKE) dist && $(MAKE) distclean \
-         && rm -f $(distdir).tar.gz \
-         && (test `find . -type f -print | wc -l` -eq 0 \
-            || (echo "Error: files left after distclean" 1>&2; \
-                exit 1))
-       -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
-       @echo "$(distdir).tar.gz is ready for distribution" | \
-         sed 'h;s/./=/g;p;x;p;x'
-
-check: all $(UNIT_TESTS) $(FUNCTIONAL_TESTS) $(SCRIPTED_TESTS)
-       @list="$(UNIT_TESTS)"; \
-       set -e; \
-       for file in $$list; do \
-         $(builddir)/$$file; \
-       done
-       @list="$(FUNCTIONAL_TESTS)"; \
-       set -e; \
-       for file in $$list; do \
-         mod=`basename $$file .mod`; \
-         echo "insmod functional_test; insmod $$mod; functional_test" \
-           | $(builddir)/grub-shell; \
-       done
-       @list="$(SCRIPTED_TESTS)"; \
-       set -e; \
-       for file in $$list; do \
-         $(builddir)/$$file; \
-       done
-
-.SUFFIX:
-.SUFFIX: .c .o .S .d
-
-# Regenerate configure and Makefile automatically.
-$(srcdir)/aclocal.m4: configure.ac acinclude.m4
-       cd $(srcdir) && aclocal
-
-$(srcdir)/configure: configure.ac aclocal.m4
-       cd $(srcdir) && autoconf
-
-$(srcdir)/config.h.in: stamp-h.in
-$(srcdir)/stamp-h.in: configure.ac aclocal.m4
-       cd $(srcdir) && autoheader
-       echo timestamp > $(srcdir)/stamp-h.in
-
-config.h: stamp-h
-stamp-h: config.h.in config.status
-       $(SHELL) ./config.status
-
-Makefile: Makefile.in config.status
-       $(SHELL) ./config.status
-
-config.status: configure
-       $(SHELL) ./config.status --recheck
-
-gensymlist.sh: gensymlist.sh.in config.status
-       $(SHELL) ./config.status
-
-genkernsyms.sh: genkernsyms.sh.in config.status
-       $(SHELL) ./config.status
-
-$(srcdir)/po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell
-       cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o po/$(PACKAGE).pot -f po/POTFILES --keyword=_ --keyword=N_
-       cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o po/$(PACKAGE).pot -f po/POTFILES-shell -j --language=Shell
-
-$(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): po/$(PACKAGE).pot
-       $(MSGMERGE) -U $@ $^
-
-po/%.mo: po/%.po
-       $(MKDIR_P) $$(dirname $@)
-       $(MSGFMT) -c --statistics -o $@ $^
-
-.PHONY: all install install-strip uninstall clean mostlyclean distclean
-.PHONY: maintainer-clean info dvi dist check
-
-# Prevent an overflow.
-.NOEXPORT:
-
-.DELETE_ON_ERROR:
index eb251f9..5358d45 100755 (executable)
@@ -2,22 +2,33 @@
 
 set -e
 
-aclocal
-autoconf
-autoheader
+ln -sf ../NEWS             grub-core/
+ln -sf ../README           grub-core/
+ln -sf ../INSTALL          grub-core/
+ln -sf ../AUTHORS          grub-core/
+ln -sf ../COPYING          grub-core/
+ln -sf ../ABOUT-NLS        grub-core/
+ln -sf ../ChangeLog        grub-core/
+ln -sf ../aclocal.m4       grub-core/
+ln -sf ../acinclude.m4     grub-core/
+ln -sf ../config.rpath     grub-core/
+ln -sf ../gentpl.py        grub-core/
+ln -sf ../configure.common grub-core/
 
-# FIXME: automake doesn't like that there's no Makefile.am
-automake -a -c -f || true
+ln -sf grub-core/include .
+ln -sf grub-core/gnulib .
+ln -sf grub-core/lib .
 
-echo timestamp > stamp-h.in
+python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am
+
+(cd grub-core && python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl)
+(cd grub-core && autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am)
 
-python util/import_gcry.py lib/libgcrypt/ .
+(cd grub-core && echo timestamp > stamp-h.in)
+(cd grub-core && python import_gcry.py lib/libgcrypt/ .)
 
-for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
-  if test -e $rmk ; then
-    ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`
-  fi
-done
-sh gendistlist.sh > DISTLIST
+echo timestamp > stamp-h.in
+autoreconf -vi
 
 exit 0
index 4e1dd41..10c5275 100644 (file)
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
+# Copyright (C) 2010  Free Software Foundation, Inc.
 #
 # This configure.ac is free software; the author
 # gives unlimited permission to copy and/or distribute it,
@@ -23,782 +23,50 @@ dnl which specifies the system running GRUB, such as firmware.
 dnl This is necessary because the target type in autoconf does not
 dnl describe such a system very well.
 dnl
-dnl The current strategy is to use variables with no prefix (such as
-dnl CC, CFLAGS, etc.) for the host type as well as the build type,
-dnl because GRUB does not need to use those variables for the build
-dnl type, so there is no conflict. Variables with the prefix "TARGET_"
-dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
-dnl type.
-
+dnl The current strategy is to build utilities using host
+dnl cross-compiler and grub core and modules using target
+dnl cross-compiler.  For this we use nested packages approach, where
+dnl top-level package grub utilities is built with HOSTCC and nested
+dnl package (in grub-core directory) builds with TARGETCC.
 
+# NOTE: grub-core/configure.ac must also be updated.
 AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
-AM_INIT_AUTOMAKE()
-AC_PREREQ(2.60)
-AC_CONFIG_SRCDIR([include/grub/dl.h])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR([.])
 
 # Checks for host and target systems.
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-# Program name transformations
-AC_ARG_PROGRAM
-
-# Optimization flag.  Allow user to override.
-if test "x$TARGET_CFLAGS" = x; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -Os"
-fi
-
-case "$target_cpu" in
-  i[[3456]]86) target_cpu=i386 ;;
-  amd64)       target_cpu=x86_64 ;;
-  sparc)       target_cpu=sparc64 ;;
-  mipsel|mips64el)
-                target_cpu=mips;    
-               TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; 
-               CFLAGS="$CFLAGS -DGRUB_CPU_MIPSEL=1";
-               ;;
-  mips|mips64)
-                target_cpu=mips;    
-               TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1"; 
-               CFLAGS="$CFLAGS -DGRUB_CPU_MIPS=1";
-               ;;
-esac
-
-# Specify the platform (such as firmware).
-AC_ARG_WITH([platform],
-            AS_HELP_STRING([--with-platform=PLATFORM],
-                           [select the host platform [[guessed]]]))
-
-# Guess the platform if not specified.
-if test "x$with_platform" = x; then
-  case "$target_cpu"-"$target_vendor" in
-    i386-apple) platform=efi ;;
-    i386-*) platform=pc ;;
-    x86_64-apple) platform=efi ;;
-    x86_64-*) platform=pc ;;
-    powerpc-*) platform=ieee1275 ;;
-    powerpc64-*) platform=ieee1275 ;;
-    sparc64-*) platform=ieee1275 ;;
-    mips-*) platform=yeeloong ;;
-    *) AC_MSG_ERROR([unsupported CPU: "$target_cpu"]) ;;
-  esac
-else
-  platform="$with_platform"
-fi
-
-# Adjust CPU unless target was explicitly specified.
-if test -z "$target_alias"; then
-  case "$target_cpu"-"$platform" in
-    x86_64-efi) ;;
-    x86_64-emu) ;;
-    x86_64-*) target_cpu=i386 ;;
-    powerpc64-ieee1275) target_cpu=powerpc ;;
-  esac
-fi
-
-# Check if the platform is supported, make final adjustments.
-case "$target_cpu"-"$platform" in
-  i386-efi) ;;
-  x86_64-efi) ;;
-  i386-pc) ;;
-  i386-multiboot) ;;
-  i386-coreboot) ;;
-  i386-linuxbios) platform=coreboot ;;
-  i386-ieee1275) ;;
-  i386-qemu) ;;
-  powerpc-ieee1275) ;;
-  sparc64-ieee1275) ;;
-  mips-qemu-mips) ;;
-  mips-yeeloong) ;;
-  *-emu) ;;
-  *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
-esac
-
-case "$target_cpu" in
-  i386 | powerpc) target_m32=1 ;;
-  x86_64 | sparc64) target_m64=1 ;;
-esac
-
-case "$host_os" in
-  mingw32*) host_os=cygwin ;;
-esac
-
-# This normalizes the names, and creates a new variable ("host_kernel")
-# while at it, since the mapping is not always 1:1 (e.g. different OSes
-# using the same kernel type).
-case "$host_os" in
-  gnu*)                                host_kernel=hurd ;;
-  linux*)                      host_kernel=linux ;;
-  freebsd* | kfreebsd*-gnu)    host_kernel=kfreebsd ;;
-  netbsd*)                     host_kernel=netbsd ;;
-  cygwin)                      host_kernel=windows ;;
-esac
-
-case "$platform" in
-  coreboot)    machine_CFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
-  multiboot)   machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
-  efi)         machine_CFLAGS="-DGRUB_MACHINE_EFI=1" ;;
-  ieee1275)    machine_CFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
-  qemu)                machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
-  pc)          machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
-  emu)         machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)    machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-mips)   machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-esac
-case "$target_cpu" in
-  mips)        machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
-  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
-esac
-
-CFLAGS="$CFLAGS $machine_CFLAGS"
-TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
-TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
-
-AC_SUBST(host_cpu)
-AC_SUBST(host_os)
-AC_SUBST(host_kernel)
-
-AC_SUBST(target_cpu)
-AC_SUBST(platform)
-
-#
-# Checks for build programs.
-#
-
-# Although cmp is listed in the GNU Coding Standards as a command which
-# can used directly, OpenBSD lacks cmp in the default installation.
-AC_CHECK_PROGS([CMP], [cmp])
-if test "x$CMP" = x; then
-  AC_MSG_ERROR([cmp is not found])
-fi
-
-AC_CHECK_PROGS([YACC], [bison])
-if test "x$YACC" = x; then
-  AC_MSG_ERROR([bison is not found])
-fi
-
-for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz /usr/share/fonts/unifont/unifont.pcf.gz; do
-  if test -e $file ; then
-    AC_SUBST([FONT_SOURCE], [$file])
-    break
-  fi
-done
-
-AC_PROG_INSTALL
-AC_PROG_AWK
-AC_PROG_LEX
-AC_PROG_MAKE_SET
-AC_PROG_MKDIR_P
-
-if test "x$LEX" = x; then
-  AC_MSG_ERROR([flex is not found])
-else
-  version=`$LEX --version | $AWK '{ split($NF,x,"."); print x[[1]]*10000+x[[2]]*100+x[[3]]; }'`
-  if test -n "$version" -a "$version" -ge 20535; then
-    :
-  else
-    AC_MSG_ERROR([flex is too old. GRUB requires 2.5.35 or above])
-  fi
-fi
-
-# These are not a "must".
-AC_PATH_PROG(RUBY, ruby)
-AC_PATH_PROG(MAKEINFO, makeinfo)
-
-#
-# Checks for host programs.
-#
-
-AC_PROG_CC
-# Must be GCC.
-test "x$GCC" = xyes || AC_MSG_ERROR([GCC is required])
-
-AC_GNU_SOURCE
-AM_GNU_GETTEXT([external])
-AC_SYS_LARGEFILE
-
-# Identify characteristics of the host architecture.
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(void *)
-AC_CHECK_SIZEOF(long)
-
-grub_apple_cc
-if test x$grub_cv_apple_cc = xyes ; then
-  CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions"
-  ASFLAGS="$ASFLAGS -DAPPLE_CC=1"
-fi
-
-if test "x$cross_compiling" = xyes; then
-  AC_MSG_WARN([cannot generate manual pages while cross compiling])
-else
-  AC_PATH_PROG(HELP2MAN, help2man)
-fi
-
-# Check for functions.
-AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
-
-# For grub-mkisofs
-AC_HEADER_MAJOR
-AC_HEADER_DIRENT
-AC_CHECK_FUNCS(memmove sbrk strdup lstat getuid getgid)
-AC_CHECK_HEADERS(sys/mkdev.h sys/sysmacros.h malloc.h termios.h sys/types.h)
-AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h limits.h)
-
-# For opendisk() and getrawpartition() on NetBSD.
-# Used in util/deviceiter.c and in util/hostdisk.c.
-AC_CHECK_HEADER([util.h], [
-  AC_CHECK_LIB([util], [opendisk], [
-    LIBUTIL="-lutil"
-    AC_DEFINE(HAVE_OPENDISK, 1, [Define if opendisk() in -lutil can be used])
-  ])
-  AC_CHECK_LIB([util], [getrawpartition], [
-    LIBUTIL="-lutil"
-    AC_DEFINE(HAVE_GETRAWPARTITION, 1, [Define if getrawpartition() in -lutil can be used])
-  ])
-])
-AC_SUBST([LIBUTIL])
-
-#
-# Check for target programs.
-#
-
-# Find tools for the target.
-if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
-  tmp_ac_tool_prefix="$ac_tool_prefix"
-  ac_tool_prefix=$target_alias-
-
-  AC_CHECK_TOOLS(TARGET_CC, [gcc egcs cc],
-                 [AC_MSG_ERROR([none of gcc, egcs and cc is found. set TARGET_CC manually.])])
-  AC_CHECK_TOOL(OBJCOPY, objcopy)
-  AC_CHECK_TOOL(STRIP, strip)
-  AC_CHECK_TOOL(NM, nm)
-
-  ac_tool_prefix="$tmp_ac_tool_prefix"
-else
-  if test "x$TARGET_CC" = x; then
-    TARGET_CC=$CC
-  fi
-  AC_CHECK_TOOL(OBJCOPY, objcopy)
-  AC_CHECK_TOOL(STRIP, strip)
-  AC_CHECK_TOOL(NM, nm)
-fi
-AC_SUBST(TARGET_CC)
-
-
-# Test the C compiler for the target environment.
-tmp_CC="$CC"
-tmp_CFLAGS="$CFLAGS"
-tmp_LDFLAGS="$LDFLAGS"
-tmp_CPPFLAGS="$CPPFLAGS"
-tmp_LIBS="$LIBS"
-CC="$TARGET_CC"
-CFLAGS="$TARGET_CFLAGS"
-CPPFLAGS="$TARGET_CPPFLAGS"
-LDFLAGS="$TARGET_LDFLAGS"
-LIBS=""
-
-# debug flags.
-TARGET_CFLAGS="$TARGET_CFLAGS -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes \
-               -Wundef -Wstrict-prototypes -g"
-
-# Force no alignment to save space on i386.
-if test "x$target_cpu" = xi386; then
-  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
-    CFLAGS="$CFLAGS -falign-loops=1"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-        [grub_cv_cc_falign_loop=yes],
-       [grub_cv_cc_falign_loop=no])
-  ])
-
-  if test "x$grub_cv_cc_falign_loop" = xyes; then
-    TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
-  else
-    TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
-  fi
-
-  # Some toolchains enable these features by default, but they need
-  # registers that aren't set up properly in GRUB.
-  TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow"
-fi
-
-# By default, GCC 4.4 generates .eh_frame sections containing unwind
-# information in some cases where it previously did not. GRUB doesn't need
-# these and they just use up vital space. Restore the old compiler
-# behaviour.
-AC_CACHE_CHECK([whether -fno-dwarf2-cfi-asm works], [grub_cv_cc_fno_dwarf2_cfi_asm], [
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-dwarf2-cfi-asm"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-      [grub_cv_cc_fno_dwarf2_cfi_asm=yes],
-      [grub_cv_cc_fno_dwarf2_cfi_asm=no])
-  CFLAGS="$SAVE_CFLAGS"
-])
-
-if test "x$grub_cv_cc_fno_dwarf2_cfi_asm" = xyes; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -fno-dwarf2-cfi-asm"
-fi
-
-grub_apple_target_cc
-if test x$grub_cv_apple_target_cc = xyes ; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -DAPPLE_CC=1 -fnested-functions"
-  CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions"
-  TARGET_ASFLAGS="$TARGET_ASFLAGS -DAPPLE_CC=1"
-  TARGET_APPLE_CC=1
-  AC_CHECK_PROG([OBJCONV], [objconv], [objconv], [])
-  if test "x$OBJCONV" = x ; then
-     AC_CHECK_PROG([OBJCONV], [objconv], [./objconv], [], [.])
-  fi
-  if test "x$OBJCONV" = x ; then
-    AC_MSG_ERROR([objconv not found which is required when building with apple compiler])
-  fi
-  TARGET_IMG_LDSCRIPT=
-  TARGET_IMG_CFLAGS="-static"
-  TARGET_IMG_LDFLAGS='-nostdlib -static -Wl,-preload -Wl,-segalign,20 -Wl,-image_base,'
-  TARGET_IMG_LDFLAGS_AC='-nostdlib -static -Wl,-preload -Wl,-segalign,20 -Wl,-image_base,'
-else
-  TARGET_APPLE_CC=0
-# Use linker script if present, otherwise use builtin -N script.
-if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
-  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
-  TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}  -Wl,-Ttext,"
-  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc  -Wl,-Ttext,"
-else
-  TARGET_IMG_LDSCRIPT=
-  TARGET_IMG_LDFLAGS='-Wl,-N  -Wl,-Ttext,'
-  TARGET_IMG_LDFLAGS_AC='-Wl,-N  -Wl,-Ttext,'
-fi
-TARGET_IMG_CFLAGS=
-fi
-
-AC_SUBST(TARGET_IMG_LDSCRIPT)
-AC_SUBST(TARGET_IMG_LDFLAGS)
-AC_SUBST(TARGET_IMG_CFLAGS)
-
-# For platforms where ELF is not the default link format.
-AC_MSG_CHECKING([for command to convert module to ELF format])
-case "${host_os}" in
-  cygwin) TARGET_OBJ2ELF='grub-pe2elf';
-# FIXME: put proper test here
-  AC_DEFINE([NEED_REGISTER_FRAME_INFO], 1,
-           [Define to 1 if GCC generates calls to __register_frame_info()])
-  ;;
-  *) ;;
-esac
-AC_SUBST(TARGET_OBJ2ELF)
-AC_MSG_RESULT([$TARGET_OBJ2ELF])
-
-
-if test "x$target_m32" = x1; then
-  # Force 32-bit mode.
-  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
-  TARGET_ASFLAGS="$TARGET_CFLAGS -m32"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
-  TARGET_MODULE_FORMAT="elf32"
-fi
-
-if test "x$target_m64" = x1; then
-  # Force 64-bit mode.
-  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
-  TARGET_ASFLAGS="$TARGET_ASFLAGS -m64"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
-  TARGET_MODULE_FORMAT="elf64"
-fi
-
-if test "$target_cpu"-"$platform" = x86_64-efi; then
-  # Use large model to support 4G memory
-  AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
-    SAVED_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -m64 -mcmodel=large"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-                     [grub_cv_cc_mcmodel=yes],
-                     [grub_cv_cc_mcmodel=no])
-  ])
-  if test "x$grub_cv_cc_mcmodel" = xno; then
-    AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.])
-  else
-    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
-  fi
-
-  # EFI writes to stack below %rsp, we must not use the red zone
-  AC_CACHE_CHECK([whether option -mno-red-zone works], grub_cv_cc_no_red_zone, [
-    CFLAGS="$CFLAGS -m64 -mno-red-zone"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-                     [grub_cv_cc_no_red_zone=yes],
-                     [grub_cv_cc_no_red_zone=no])
-  ])
-  if test "x$grub_cv_cc_no_red_zone" = xno; then
-    AC_MSG_ERROR([-mno-red-zone not supported, upgrade your gcc])
-  fi
-
-  TARGET_CFLAGS="$TARGET_CFLAGS -mno-red-zone"
-fi
-
-#
-# Compiler features.
-#
-
-# Need __enable_execute_stack() for nested function trampolines?
-grub_CHECK_ENABLE_EXECUTE_STACK
-
-# Position independent executable.
-grub_CHECK_PIE
-[# Need that, because some distributions ship compilers that include
-# `-fPIE' in the default specs.
-if [ x"$pie_possible" = xyes ]; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
-fi]
-
-# Smashing stack protector.
-grub_CHECK_STACK_PROTECTOR
-# Need that, because some distributions ship compilers that include
-# `-fstack-protector' in the default specs.
-if test "x$ssp_possible" = xyes; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector"
-fi
-grub_CHECK_STACK_ARG_PROBE
-# Cygwin's GCC uses alloca() to probe the stackframe on static
-# stack allocations above some threshold.
-if test x"$sap_possible" = xyes; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -mno-stack-arg-probe"
-fi
-
-AC_ARG_ENABLE([werror],
-             [AS_HELP_STRING([--disable-werror],
-                             [do not use -Werror when building GRUB])])
-if test x"$enable_werror" != xno ; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -Werror"
-fi
-
-AC_SUBST(TARGET_CFLAGS)
-AC_SUBST(TARGET_MODULE_FORMAT)
-AC_SUBST(OBJCONV)
-AC_SUBST(TARGET_APPLE_CC)
-AC_SUBST(TARGET_ASFLAGS)
-AC_SUBST(TARGET_CPPFLAGS)
-AC_SUBST(TARGET_LDFLAGS)
-
-# Set them to their new values for the tests below.
-CC="$TARGET_CC"
-if test "x$TARGET_APPLE_CC" = x1 ; then
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
-else
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wno-error"
-fi
-CPPFLAGS="$TARGET_CPPFLAGS"
-LDFLAGS="$TARGET_LDFLAGS"
-LIBS=-lgcc
-
-grub_ASM_USCORE
-if test x$grub_cv_asm_uscore = xyes; then
-CFLAGS="$CFLAGS -Wl,--defsym,_abort=_main"
-else
-CFLAGS="$CFLAGS -Wl,--defsym,abort=main"
-fi
-
-# Check for libgcc symbols
-AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
-
-if test "x$TARGET_APPLE_CC" = x1 ; then
-CFLAGS="$TARGET_CFLAGS -nostdlib"
-else
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100"
-fi
-LIBS=""
-
-# Defined in aclocal.m4.
-grub_PROG_TARGET_CC
-if test "x$TARGET_APPLE_CC" != x1 ; then
-grub_PROG_OBJCOPY_ABSOLUTE
-fi
-grub_PROG_LD_BUILD_ID_NONE
-if test "x$target_cpu" = xi386; then
-  if test "$platform" != emu && test "x$TARGET_APPLE_CC" != x1 ; then
-    if test ! -z "$TARGET_IMG_LDSCRIPT"; then
-      # Check symbols provided by linker script.
-      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000 -Wl,--defsym,___main=0x8100"
-    fi
-    grub_CHECK_BSS_START_SYMBOL
-    grub_CHECK_END_SYMBOL
-  fi
-  CFLAGS="$TARGET_CFLAGS"
-  grub_I386_ASM_PREFIX_REQUIREMENT
-  grub_I386_ASM_ADDR32
-  grub_I386_ASM_ABSOLUTE_WITHOUT_ASTERISK
-else
-  AC_DEFINE([NESTED_FUNC_ATTR], [], [Catch gcc bug])
-fi
-
-AH_BOTTOM([#if defined(__i386__) && !defined(GRUB_UTIL)
-#define NESTED_FUNC_ATTR __attribute__ ((__regparm__ (1)))
-#else
-#define NESTED_FUNC_ATTR
-#endif])
-
-AC_ARG_ENABLE([efiemu],
-             [AS_HELP_STRING([--enable-efiemu],
-                             [build and install the efiemu runtimes (default=guessed)])])
-if test x"$enable_efiemu" = xno ; then
-  efiemu_excuse="explicitly disabled"
-fi
-if test x"$efiemu_excuse" = x ; then
-  AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
-    CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-                     [grub_cv_cc_efiemu=yes],
-                     [grub_cv_cc_efiemu=no])
-  ])
-  if test x$grub_cv_cc_efiemu = xno; then
-     efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
-  fi
-fi
-if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
-  AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
-fi
-if test x"$efiemu_excuse" = x ; then
-enable_efiemu=yes
-else
-enable_efiemu=no
-fi
-AC_SUBST([enable_efiemu])
-
-if test "$platform" != emu; then
-AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
-  SAVED_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
-int va_arg_func (int fixed, va_list args);]], [[]])],
-      [grub_cv_cc_isystem=yes],
-      [grub_cv_cc_isystem=no])
-  CPPFLAGS="$SAVED_CPPFLAGS"
-])
-
-if test x"$grub_cv_cc_isystem" = xyes ; then
-  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
-fi
-fi
-
-# Restore the flags.
-CC="$tmp_CC"
-CFLAGS="$tmp_CFLAGS"
-CPPFLAGS="$tmp_CPPFLAGS"
-LDFLAGS="$tmp_LDFLAGS"
-LIBS="$tmp_LIBS"
-
-#
-# Check for options.
-#
-
-# Memory manager debugging.
-AC_ARG_ENABLE([mm-debug],
-             AS_HELP_STRING([--enable-mm-debug],
-                             [include memory manager debugging]),
-              [AC_DEFINE([MM_DEBUG], [1],
-                         [Define to 1 if you enable memory manager debugging.])])
-
-AC_ARG_ENABLE([grub-emu-usb],
-             [AS_HELP_STRING([--enable-grub-emu-usb],
-                             [build and install the `grub-emu' debugging utility with USB support (default=guessed)])])
-
-AC_ARG_ENABLE([grub-emu-sdl],
-             [AS_HELP_STRING([--enable-grub-emu-sdl],
-                             [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])])
-
-AC_ARG_ENABLE([grub-emu-pci],
-             [AS_HELP_STRING([--enable-grub-emu-pci],
-                             [build and install the `grub-emu' debugging utility with PCI support (potentially dangerous) (default=no)])])
-
-AC_ARG_ENABLE([grub-emu-modules],
-             [AS_HELP_STRING([--enable-grub-emu-modules],
-                             [Support module loading in `grub-emu' debugging utility (default=no)])])
-
-if test "$platform" = emu; then
-  missing_ncurses=
-[# Check for curses libraries.]
-  AC_CHECK_LIB([ncurses], [wgetch], [LIBCURSES="-lncurses"],
-    [AC_CHECK_LIB([curses], [wgetch], [LIBCURSES="-lcurses"],
-      [missing_ncurses=[true]])])
-  AC_SUBST([LIBCURSES])
-[if [ x"$missing_ncurses" = x ]; then ]
-  [# Check for headers.]
-  AC_CHECK_HEADERS([ncurses/curses.h], [],
-    [AC_CHECK_HEADERS([ncurses.h], [],
-      [AC_CHECK_HEADERS([curses.h], [],
-       [missing_ncurses=[true]])])])
-[fi]
-if test x"$missing_ncurses" = xtrue ; then
-  AC_MSG_ERROR([grub-emu can't be compiled without ncurses])
-fi
-
-if test x"$enable_grub_emu_modules" = xyes ; then
-  TARGET_NO_MODULES=no
-else
-  TARGET_NO_MODULES=yes
-fi
-AC_SUBST(TARGET_NO_MODULES)
-
-if test "$TARGET_NO_MODULES" = yes ; then
-  # Do not convert modules, otherwise linkage may fail (Cygwin only).
-  # FIXME: Should be checked above before TARGET_OBJ2ELF is set first.
-  TARGET_OBJ2ELF=
-fi
-
-if test x"$enable_grub_emu_usb" = xno ; then
-  grub_emu_usb_excuse="explicitly disabled"
-fi
-
-if test x"$enable_grub_emu_pci" = xyes ; then
-   grub_emu_usb_excuse="conflicts with PCI support"
-fi
-
-[if [ x"$grub_emu_usb_excuse" = x ]; then
-    # Check for libusb libraries.]
-AC_CHECK_LIB([usb], [usb_claim_interface], [LIBUSB="-lusb"],
-    [grub_emu_usb_excuse=["need libusb library"]])
-    AC_SUBST([LIBUSB])
-[fi]
-[if [ x"$grub_emu_usb_excuse" = x ]; then
-    # Check for headers.]
-    AC_CHECK_HEADERS([usb.h], [],
-      [grub_emu_usb_excuse=["need libusb headers"]])
-[fi]
-if test x"$enable_grub_emu_usb" = xyes && test x"$grub_emu_usb_excuse" != x ; then
-  AC_MSG_ERROR([USB support for grub-emu was explicitly requested but can't be compiled])
-fi
-if test x"$grub_emu_usb_excuse" = x ; then
-enable_grub_emu_usb=yes
-else
-enable_grub_emu_usb=no
-fi
-
-if test x"$enable_grub_emu_sdl" = xno ; then
-  grub_emu_sdl_excuse="explicitely disabled"
-fi
-[if [ x"$grub_emu_sdl_excuse" = x ]; then
-    # Check for libSDL libraries.]
-AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"],
-    [grub_emu_sdl_excuse=["libSDL libraries are required to build \`grub-emu' with SDL support"]])
-    AC_SUBST([LIBSDL])
-[fi]
-
-[if [ x"$grub_emu_sdl_excuse" = x ]; then
-    # Check for headers.]
-    AC_CHECK_HEADERS([SDL/SDL.h], [],
-      [grub_emu_sdl_excuse=["libSDL header file is required to build \`grub-emu' with SDL support"]])
-[fi]
-
-if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then
-  AC_MSG_ERROR([SDL support for grub-emu was explicitely requested but can't be compiled])
-fi
-if test x"$grub_emu_sdl_excuse" = x ; then
-enable_grub_emu_sdl=yes
-else
-enable_grub_emu_sdl=no
-fi
-
-if test x"$enable_grub_emu_pci" != xyes ; then
-   grub_emu_pci_excuse="not enabled"
-fi
-
-if test x"$enable_grub_emu_usb" = xyes ; then
-   grub_emu_pci_excuse="conflicts with USB support"
-fi
-
-[if [ x"$grub_emu_pci_excuse" = x ]; then
-      # Check for libpci libraries.]
-   AC_CHECK_LIB([pciaccess], [pci_system_init], [LIBPCIACCESS="-lpciaccess"],
-      [grub_emu_pci_excuse=["need libpciaccess library"]])
-    AC_SUBST([LIBPCIACCESS])
-[fi]
-[if [ x"$grub_emu_pci_excuse" = x ]; then
-    # Check for headers.]
-    AC_CHECK_HEADERS([pci/pci.h], [],
-      [grub_emu_pci_excuse=["need libpciaccess headers"]])
-[fi]
-
-if test x"$grub_emu_pci_excuse" = x ; then
-enable_grub_emu_pci=yes
-else
-
-enable_grub_emu_pci=no
-fi
-
-AC_SUBST([enable_grub_emu_sdl])
-AC_SUBST([enable_grub_emu_usb])
-AC_SUBST([enable_grub_emu_pci])
-fi
-
-AC_ARG_ENABLE([grub-fstest],
-             [AS_HELP_STRING([--enable-grub-fstest],
-                             [build and install the `grub-fstest' debugging utility (default=guessed)])])
-if test x"$enable_grub_fstest" = xno ; then
-  grub_fstest_excuse="explicitly disabled"
-fi
-if test x"$grub_fstest_excuse" = x ; then
-enable_grub_fstest=yes
-else
-enable_grub_fstest=no
-fi
-AC_SUBST([enable_grub_fstest])
-
-AC_ARG_ENABLE([grub-mkfont],
-             [AS_HELP_STRING([--enable-grub-mkfont],
-                             [build and install the `grub-mkfont' utility (default=guessed)])])
-if test x"$enable_grub_mkfont" = xno ; then
-  grub_mkfont_excuse="explicitly disabled"
-fi
-
-if test x"$grub_mkfont_excuse" = x ; then
-  # Check for freetype libraries.
-  AC_CHECK_PROGS([FREETYPE], [freetype-config])
-  if test "x$FREETYPE" = x ; then
-    grub_mkfont_excuse=["need freetype2 library"]
-  fi
-  freetype_cflags=`freetype-config --cflags`
-  freetype_libs=`freetype-config --libs`
-fi
-
-if test x"$grub_mkfont_excuse" = x ; then
-  # Check for freetype libraries.
-  SAVED_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $freetype_cflags"
-  AC_CHECK_HEADERS([ft2build.h], [],
-       [grub_mkfont_excuse=["need freetype2 headers"]])
-  CPPFLAGS="$SAVED_CPPFLAGS"
-fi
-
-if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then
-  AC_MSG_ERROR([grub-mkfont was explicitly requested but can't be compiled])
-fi
-if test x"$grub_mkfont_excuse" = x ; then
-enable_grub_mkfont=yes
-else
-enable_grub_mkfont=no
-fi
-AC_SUBST([enable_grub_mkfont])
-AC_SUBST([freetype_cflags])
-AC_SUBST([freetype_libs])
+AM_INIT_AUTOMAKE()
+AC_PREREQ(2.60)
+AC_CONFIG_SRCDIR([grub-core/include/grub/dl.h])
+AC_CONFIG_HEADER([config.h])
 
-AC_SUBST(ASFLAGS)
+m4_include([configure.common])
 
 # Output files.
 grub_CHECK_LINK_DIR
 if test x"$link_dir" = xyes ; then
-  AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
+  AC_CONFIG_LINKS([include/grub/cpu:grub-core/include/grub/$target_cpu])
   if test "$platform" != emu ; then
-    AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
+    AC_CONFIG_LINKS([include/grub/machine:grub-core/include/grub/$target_cpu/$platform])
   fi
 else
   mkdir -p include/grub 2>/dev/null
   rm -rf include/grub/cpu
-  cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
+  cp -rp $srcdir/grub-core/include/grub/$target_cpu include/grub/cpu 2>/dev/null
   if test "$platform" != emu ; then
     rm -rf include/grub/machine
-    cp -rp $srcdir/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
+    cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
   fi
 fi
-AC_CONFIG_FILES([Makefile gensymlist.sh genkernsyms.sh])
+
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([po/Makefile])
+AC_CONFIG_FILES([docs/Makefile])
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
+
+AC_CONFIG_SUBDIRS([grub-core])
 AC_OUTPUT
 [
 echo "*******************************************************"
@@ -820,11 +88,6 @@ echo PCI support for grub-emu: Yes
 else
 echo PCI support for grub-emu: No "($grub_emu_pci_excuse)"
 fi
-if [ x"$TARGET_NO_MODULES" = xno ]; then
-echo Module support for grub-emu: Yes
-else
-echo Module support for grub-emu: No
-fi
 fi
 if [ x"$enable_mm_debug" = xyes ]; then
 echo With memory debugging: Yes
diff --git a/configure.common b/configure.common
new file mode 100644 (file)
index 0000000..31bac77
--- /dev/null
@@ -0,0 +1,804 @@
+# -*- autoconf -*-
+
+# Process this file with autoconf to produce a configure script.
+
+# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
+#
+# This configure.ac is free software; the author
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# This file is shared between grub-core and util configure scripts.
+
+# Program name transformations
+AC_ARG_PROGRAM
+
+# Optimization flag.  Allow user to override.
+if test "x$CFLAGS" = x; then
+  CFLAGS="$CFLAGS -Os"
+fi
+
+# Default HOST_CPPFLAGS
+CPPFLAGS=''
+HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/include"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/gnulib"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_LIBDIR=\\\"\$(pkglibdir)\\\""
+HOST_CPPFLAGS="$HOST_CPPFLAGS -DLOCALEDIR=\\\"\$(localedir)\\\""
+
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -Wall -W"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include"
+
+case "$target_cpu" in
+  i[[3456]]86) target_cpu=i386 ;;
+  amd64)       target_cpu=x86_64 ;;
+  sparc)       target_cpu=sparc64 ;;
+  mipsel|mips64el)
+                target_cpu=mips;
+               cpu_CPPFLAGS="-DGRUB_CPU_MIPSEL=1";
+               ;;
+  mips|mips64)
+                target_cpu=mips;
+               cpu_CPPFLAGS="-DGRUB_CPU_MIPS=1";
+               ;;
+esac
+
+# Specify the platform (such as firmware).
+AC_ARG_WITH([platform],
+            AS_HELP_STRING([--with-platform=PLATFORM],
+                           [select the host platform [[guessed]]]))
+
+# Guess the platform if not specified.
+if test "x$with_platform" = x; then
+  case "$target_cpu"-"$target_vendor" in
+    i386-apple) platform=efi ;;
+    i386-*) platform=pc ;;
+    x86_64-apple) platform=efi ;;
+    x86_64-*) platform=pc ;;
+    powerpc-*) platform=ieee1275 ;;
+    powerpc64-*) platform=ieee1275 ;;
+    sparc64-*) platform=ieee1275 ;;
+    mips-*) platform=yeeloong ;;
+    *) AC_MSG_ERROR([unsupported CPU: "$target_cpu"]) ;;
+  esac
+else
+  platform="$with_platform"
+fi
+
+# Adjust CPU unless target was explicitly specified.
+if test -z "$target_alias"; then
+  case "$target_cpu"-"$platform" in
+    x86_64-efi) ;;
+    x86_64-emu) ;;
+    x86_64-*) target_cpu=i386 ;;
+    powerpc64-ieee1275) target_cpu=powerpc ;;
+  esac
+fi
+
+# Check if the platform is supported, make final adjustments.
+case "$target_cpu"-"$platform" in
+  i386-efi) ;;
+  x86_64-efi) ;;
+  i386-pc) ;;
+  i386-multiboot) ;;
+  i386-coreboot) ;;
+  i386-linuxbios) platform=coreboot ;;
+  i386-ieee1275) ;;
+  i386-qemu) ;;
+  powerpc-ieee1275) ;;
+  sparc64-ieee1275) ;;
+  mips-qemu-mips) ;;
+  mips-yeeloong) ;;
+  *-emu) ;;
+  *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
+esac
+
+case "$target_cpu" in
+  i386 | powerpc) target_m32=1 ;;
+  x86_64 | sparc64) target_m64=1 ;;
+esac
+
+case "$host_os" in
+  mingw32*) host_os=cygwin ;;
+esac
+
+# This normalizes the names, and creates a new variable ("host_kernel")
+# while at it, since the mapping is not always 1:1 (e.g. different OSes
+# using the same kernel type).
+case "$host_os" in
+  gnu*)                                host_kernel=hurd ;;
+  linux*)                      host_kernel=linux ;;
+  freebsd* | kfreebsd*-gnu)    host_kernel=kfreebsd ;;
+  netbsd*)                     host_kernel=netbsd ;;
+  cygwin)                      host_kernel=windows ;;
+esac
+
+case "$platform" in
+  coreboot)    machine_CPPFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
+  multiboot)   machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
+  efi)         machine_CPPFLAGS="-DGRUB_MACHINE_EFI=1" ;;
+  ieee1275)    machine_CPPFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
+  qemu)                machine_CPPFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
+  pc)          machine_CPPFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
+  emu)         machine_CPPFLAGS="-DGRUB_MACHINE_EMU=1" ;;
+  yeeloong)    machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)   machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+esac
+case "$target_cpu" in
+  i386)         cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_I386";;
+  x86_64)       cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_X86_64";;
+  powerpc)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_POWERPC";;
+  mips)        machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS=1" ;; # cpu_CPPFLAGS handled above
+  sparc64)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_SPARC64";
+                machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+esac
+
+HOST_CPPFLAGS="$HOST_CPPFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
+
+AC_SUBST(host_cpu)
+AC_SUBST(host_os)
+AC_SUBST(host_kernel)
+
+AC_SUBST(target_cpu)
+AC_SUBST(platform)
+
+#
+# Checks for build programs.
+#
+
+# Although cmp is listed in the GNU Coding Standards as a command which
+# can used directly, OpenBSD lacks cmp in the default installation.
+AC_CHECK_PROGS([CMP], [cmp])
+if test "x$CMP" = x; then
+  AC_MSG_ERROR([cmp is not found])
+fi
+
+for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz /usr/share/fonts/unifont/unifont.pcf.gz; do
+  if test -e $file ; then
+    FONT_SOURCE=$file
+    HOST_CPPFLAGS="$HOST_CPPFLAGS -DUSE_ASCII_FAILBACK=1"
+    TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DUSE_ASCII_FAILBACK=1"
+    break
+  fi
+done
+
+AC_PROG_RANLIB
+AC_PROG_INSTALL
+AC_PROG_AWK
+AC_PROG_LEX
+AC_PROG_YACC
+AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
+
+if test "x$LEX" = x; then
+  AC_MSG_ERROR([flex is not found])
+else
+  version=`$LEX --version | $AWK '{ split($NF,x,"."); print x[[1]]*10000+x[[2]]*100+x[[3]]; }'`
+  if test -n "$version" -a "$version" -ge 20535; then
+    :
+  else
+    AC_MSG_ERROR([flex is too old. GRUB requires 2.5.35 or above])
+  fi
+fi
+
+# These are not a "must".
+AC_PATH_PROG(MAKEINFO, makeinfo)
+
+#
+# Checks for host programs.
+#
+
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AS
+
+# Must be GCC.
+test "x$GCC" = xyes || AC_MSG_ERROR([GCC is required])
+
+AC_GNU_SOURCE
+AM_GNU_GETTEXT([external])
+AC_SYS_LARGEFILE
+
+# Identify characteristics of the host architecture.
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(long)
+
+grub_apple_cc
+if test x$grub_cv_apple_cc = xyes ; then
+  HOST_CPPFLAGS="$HOST_CPPFLAGS -DAPPLE_CC=1"
+  HOST_CFLAGS="$HOST_CFLAGS -fnested-functions"
+fi
+
+if test "x$cross_compiling" = xyes; then
+  AC_MSG_WARN([cannot generate manual pages while cross compiling])
+else
+  AC_PATH_PROG(HELP2MAN, help2man)
+fi
+
+# Check for functions.
+AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
+
+# For grub-mkisofs
+AC_HEADER_MAJOR
+AC_HEADER_DIRENT
+AC_CHECK_FUNCS(memmove sbrk strdup lstat getuid getgid)
+AC_CHECK_HEADERS(sys/mkdev.h sys/sysmacros.h malloc.h termios.h sys/types.h)
+AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h limits.h)
+
+# For opendisk() and getrawpartition() on NetBSD.
+# Used in util/deviceiter.c and in util/hostdisk.c.
+AC_CHECK_HEADER([util.h], [
+  AC_CHECK_LIB([util], [opendisk], [
+    LIBUTIL="-lutil"
+    AC_DEFINE(HAVE_OPENDISK, 1, [Define if opendisk() in -lutil can be used])
+  ])
+  AC_CHECK_LIB([util], [getrawpartition], [
+    LIBUTIL="-lutil"
+    AC_DEFINE(HAVE_GETRAWPARTITION, 1, [Define if getrawpartition() in -lutil can be used])
+  ])
+])
+AC_SUBST([LIBUTIL])
+
+#
+# Check for host and build compilers.
+#
+HOST_CC=$CC
+AC_CHECK_PROGS(BUILD_CC, [gcc egcs cc],
+                 [AC_MSG_ERROR([none of gcc, egcs and cc is found. set BUILD_CC manually.])])
+
+#
+# Check for target programs.
+#
+
+# Find tools for the target.
+if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
+  tmp_ac_tool_prefix="$ac_tool_prefix"
+  ac_tool_prefix=$target_alias-
+
+  AC_CHECK_TOOLS(TARGET_CC, [gcc egcs cc],
+                 [AC_MSG_ERROR([none of gcc, egcs and cc is found. set TARGET_CC manually.])])
+  AC_CHECK_TOOL(OBJCOPY, objcopy)
+  AC_CHECK_TOOL(STRIP, strip)
+  AC_CHECK_TOOL(NM, nm)
+
+  ac_tool_prefix="$tmp_ac_tool_prefix"
+else
+  if test "x$TARGET_CC" = x; then
+    TARGET_CC=$CC
+  fi
+  AC_CHECK_TOOL(OBJCOPY, objcopy)
+  AC_CHECK_TOOL(STRIP, strip)
+  AC_CHECK_TOOL(NM, nm)
+fi
+AC_SUBST(HOST_CC)
+AC_SUBST(BUILD_CC)
+AC_SUBST(TARGET_CC)
+
+# Test the C compiler for the target environment.
+tmp_CC="$CC"
+tmp_CFLAGS="$CFLAGS"
+tmp_LDFLAGS="$LDFLAGS"
+tmp_CPPFLAGS="$CPPFLAGS"
+tmp_LIBS="$LIBS"
+CC="$TARGET_CC"
+CFLAGS="$TARGET_CFLAGS"
+CPPFLAGS="$TARGET_CPPFLAGS"
+LDFLAGS="$TARGET_LDFLAGS"
+LIBS=""
+
+# debug flags.
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g"
+TARGET_CCASFLAGS="$TARGET_CCASFLAGS -g"
+
+# Force no alignment to save space on i386.
+if test "x$target_cpu" = xi386; then
+  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
+    CFLAGS="$CFLAGS -falign-loops=1"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+        [grub_cv_cc_falign_loop=yes],
+       [grub_cv_cc_falign_loop=no])
+  ])
+
+  if test "x$grub_cv_cc_falign_loop" = xyes; then
+    TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
+  else
+    TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
+  fi
+
+  # Some toolchains enable these features by default, but they need
+  # registers that aren't set up properly in GRUB.
+  TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow"
+fi
+
+# By default, GCC 4.4 generates .eh_frame sections containing unwind
+# information in some cases where it previously did not. GRUB doesn't need
+# these and they just use up vital space. Restore the old compiler
+# behaviour.
+AC_CACHE_CHECK([whether -fno-dwarf2-cfi-asm works], [grub_cv_cc_fno_dwarf2_cfi_asm], [
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -fno-dwarf2-cfi-asm"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+      [grub_cv_cc_fno_dwarf2_cfi_asm=yes],
+      [grub_cv_cc_fno_dwarf2_cfi_asm=no])
+  CFLAGS="$SAVE_CFLAGS"
+])
+
+if test "x$grub_cv_cc_fno_dwarf2_cfi_asm" = xyes; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -fno-dwarf2-cfi-asm"
+fi
+
+grub_apple_target_cc
+if test x$grub_cv_apple_target_cc = xyes ; then
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DAPPLE_CC=1"
+  TARGET_CFLAGS="$TARGET_CFLAGS -fnested-functions"
+
+  CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions"
+  TARGET_APPLE_CC=1
+  AC_CHECK_PROG([OBJCONV], [objconv], [objconv], [])
+  if test "x$OBJCONV" = x ; then
+     AC_CHECK_PROG([OBJCONV], [objconv], [./objconv], [], [.])
+  fi
+  if test "x$OBJCONV" = x ; then
+    AC_MSG_ERROR([objconv not found which is required when building with apple compiler])
+  fi
+  TARGET_IMG_LDSCRIPT=
+  TARGET_IMG_CFLAGS="-static"
+  TARGET_IMG_LDFLAGS='-nostdlib -static -Wl,-preload -Wl,-segalign,20 -Wl,-image_base,'
+  TARGET_IMG_LDFLAGS_AC='-nostdlib -static -Wl,-preload -Wl,-segalign,20 -Wl,-image_base,'
+else
+  TARGET_APPLE_CC=0
+# Use linker script if present, otherwise use builtin -N script.
+if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
+  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
+  TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}  -Wl,-Ttext,"
+  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc  -Wl,-Ttext,"
+else
+  TARGET_IMG_LDSCRIPT=
+  TARGET_IMG_LDFLAGS='-Wl,-N  -Wl,-Ttext,'
+  TARGET_IMG_LDFLAGS_AC='-Wl,-N  -Wl,-Ttext,'
+fi
+TARGET_IMG_CFLAGS=
+fi
+
+# For platforms where ELF is not the default link format.
+AC_MSG_CHECKING([for command to convert module to ELF format])
+case "${host_os}" in
+  cygwin) TARGET_OBJ2ELF='grub-pe2elf';
+# FIXME: put proper test here
+  AC_DEFINE([NEED_REGISTER_FRAME_INFO], 1,
+           [Define to 1 if GCC generates calls to __register_frame_info()])
+  ;;
+  *) ;;
+esac
+AC_MSG_RESULT([$TARGET_OBJ2ELF])
+
+if test "x$target_m32" = x1; then
+  # Force 32-bit mode.
+  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
+  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
+  TARGET_MODULE_FORMAT="elf32"
+fi
+
+if test "x$target_m64" = x1; then
+  # Force 64-bit mode.
+  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
+  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
+  TARGET_MODULE_FORMAT="elf64"
+fi
+
+if test "$target_cpu"-"$platform" = x86_64-efi; then
+  # Use large model to support 4G memory
+  AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
+    SAVED_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -m64 -mcmodel=large"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+                     [grub_cv_cc_mcmodel=yes],
+                     [grub_cv_cc_mcmodel=no])
+  ])
+  if test "x$grub_cv_cc_mcmodel" = xno; then
+    AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.])
+  else
+    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
+  fi
+
+  # EFI writes to stack below %rsp, we must not use the red zone
+  AC_CACHE_CHECK([whether option -mno-red-zone works], grub_cv_cc_no_red_zone, [
+    CFLAGS="$CFLAGS -m64 -mno-red-zone"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+                     [grub_cv_cc_no_red_zone=yes],
+                     [grub_cv_cc_no_red_zone=no])
+  ])
+  if test "x$grub_cv_cc_no_red_zone" = xno; then
+    AC_MSG_ERROR([-mno-red-zone not supported, upgrade your gcc])
+  fi
+
+  TARGET_CFLAGS="$TARGET_CFLAGS -mno-red-zone"
+fi
+
+#
+# Compiler features.
+#
+
+# Need __enable_execute_stack() for nested function trampolines?
+grub_CHECK_ENABLE_EXECUTE_STACK
+
+# Position independent executable.
+grub_CHECK_PIE
+[# Need that, because some distributions ship compilers that include
+# `-fPIE' in the default specs.
+if [ x"$pie_possible" = xyes ]; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
+fi]
+
+# Smashing stack protector.
+grub_CHECK_STACK_PROTECTOR
+# Need that, because some distributions ship compilers that include
+# `-fstack-protector' in the default specs.
+if test "x$ssp_possible" = xyes; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector"
+fi
+grub_CHECK_STACK_ARG_PROBE
+# Cygwin's GCC uses alloca() to probe the stackframe on static
+# stack allocations above some threshold.
+if test x"$sap_possible" = xyes; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -mno-stack-arg-probe"
+fi
+
+AC_ARG_ENABLE([werror],
+             [AS_HELP_STRING([--disable-werror],
+                             [do not use -Werror when building GRUB])])
+if test x"$enable_werror" != xno ; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -Werror"
+fi
+
+AC_SUBST(TARGET_MODULE_FORMAT)
+AC_SUBST(OBJCONV)
+AC_SUBST(TARGET_APPLE_CC)
+
+AC_SUBST(TARGET_CFLAGS)
+AC_SUBST(TARGET_LDFLAGS)
+AC_SUBST(TARGET_CPPFLAGS)
+AC_SUBST(TARGET_CCASFLAGS)
+
+AC_SUBST(HOST_CFLAGS)
+AC_SUBST(HOST_LDFLAGS)
+AC_SUBST(HOST_CPPFLAGS)
+AC_SUBST(HOST_CCASFLAGS)
+
+# Set them to their new values for the tests below.
+CC="$TARGET_CC"
+if test "x$TARGET_APPLE_CC" = x1 ; then
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
+else
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wno-error"
+fi
+CPPFLAGS="$TARGET_CPPFLAGS"
+LDFLAGS="$TARGET_LDFLAGS"
+LIBS=-lgcc
+
+grub_ASM_USCORE
+if test x$grub_cv_asm_uscore = xyes; then
+CFLAGS="$CFLAGS -Wl,--defsym,_abort=_main"
+else
+CFLAGS="$CFLAGS -Wl,--defsym,abort=main"
+fi
+
+# Check for libgcc symbols
+AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
+
+if test "x$TARGET_APPLE_CC" = x1 ; then
+CFLAGS="$TARGET_CFLAGS -nostdlib"
+else
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100"
+fi
+LIBS=""
+
+# Defined in aclocal.m4.
+grub_PROG_TARGET_CC
+if test "x$TARGET_APPLE_CC" != x1 ; then
+grub_PROG_OBJCOPY_ABSOLUTE
+fi
+grub_PROG_LD_BUILD_ID_NONE
+if test "x$target_cpu" = xi386; then
+  if test "$platform" != emu && test "x$TARGET_APPLE_CC" != x1 ; then
+    if test ! -z "$TARGET_IMG_LDSCRIPT"; then
+      # Check symbols provided by linker script.
+      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000 -Wl,--defsym,___main=0x8100"
+    fi
+    grub_CHECK_BSS_START_SYMBOL
+    grub_CHECK_END_SYMBOL
+  fi
+  CFLAGS="$TARGET_CFLAGS"
+  grub_I386_ASM_PREFIX_REQUIREMENT
+  grub_I386_ASM_ADDR32
+  grub_I386_ASM_ABSOLUTE_WITHOUT_ASTERISK
+else
+  AC_DEFINE([NESTED_FUNC_ATTR], [], [Catch gcc bug])
+fi
+
+AH_BOTTOM([#if defined(__i386__) && !defined(GRUB_UTIL)
+#define NESTED_FUNC_ATTR __attribute__ ((__regparm__ (1)))
+#else
+#define NESTED_FUNC_ATTR
+#endif])
+
+AC_ARG_ENABLE([efiemu],
+             [AS_HELP_STRING([--enable-efiemu],
+                             [build and install the efiemu runtimes (default=guessed)])])
+if test x"$enable_efiemu" = xno ; then
+  efiemu_excuse="explicitly disabled"
+fi
+if test x"$efiemu_excuse" = x ; then
+  AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
+    CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+                     [grub_cv_cc_efiemu=yes],
+                     [grub_cv_cc_efiemu=no])
+  ])
+  if test x$grub_cv_cc_efiemu = xno; then
+     efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
+  fi
+fi
+if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
+  AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
+fi
+if test x"$efiemu_excuse" = x ; then
+enable_efiemu=yes
+else
+enable_efiemu=no
+fi
+AC_SUBST([enable_efiemu])
+
+if test "$platform" != emu; then
+AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
+  SAVED_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+int va_arg_func (int fixed, va_list args);]], [[]])],
+      [grub_cv_cc_isystem=yes],
+      [grub_cv_cc_isystem=no])
+  CPPFLAGS="$SAVED_CPPFLAGS"
+])
+
+if test x"$grub_cv_cc_isystem" = xyes ; then
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+fi
+fi
+
+# Restore the flags.
+CC="$tmp_CC"
+CFLAGS="$tmp_CFLAGS"
+CPPFLAGS="$tmp_CPPFLAGS"
+LDFLAGS="$tmp_LDFLAGS"
+LIBS="$tmp_LIBS"
+
+#
+# Check for options.
+#
+
+# Memory manager debugging.
+AC_ARG_ENABLE([mm-debug],
+             AS_HELP_STRING([--enable-mm-debug],
+                             [include memory manager debugging]),
+              [AC_DEFINE([MM_DEBUG], [1],
+                         [Define to 1 if you enable memory manager debugging.])])
+
+AC_ARG_ENABLE([grub-emu-usb],
+             [AS_HELP_STRING([--enable-grub-emu-usb],
+                             [build and install the `grub-emu' debugging utility with USB support (default=guessed)])])
+
+AC_ARG_ENABLE([grub-emu-sdl],
+             [AS_HELP_STRING([--enable-grub-emu-sdl],
+                             [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])])
+
+AC_ARG_ENABLE([grub-emu-pci],
+             [AS_HELP_STRING([--enable-grub-emu-pci],
+                             [build and install the `grub-emu' debugging utility with PCI support (potentially dangerous) (default=no)])])
+
+if test "$platform" = emu; then
+  missing_ncurses=
+[# Check for curses libraries.]
+  AC_CHECK_LIB([ncurses], [wgetch], [LIBCURSES="-lncurses"],
+    [AC_CHECK_LIB([curses], [wgetch], [LIBCURSES="-lcurses"],
+      [missing_ncurses=[true]])])
+  AC_SUBST([LIBCURSES])
+[if [ x"$missing_ncurses" = x ]; then ]
+  [# Check for headers.]
+  AC_CHECK_HEADERS([ncurses/curses.h], [],
+    [AC_CHECK_HEADERS([ncurses.h], [],
+      [AC_CHECK_HEADERS([curses.h], [],
+       [missing_ncurses=[true]])])])
+[fi]
+if test x"$missing_ncurses" = xtrue ; then
+  AC_MSG_ERROR([grub-emu can't be compiled without ncurses])
+fi
+
+if test x"$enable_grub_emu_usb" = xno ; then
+  grub_emu_usb_excuse="explicitly disabled"
+fi
+
+if test x"$enable_grub_emu_pci" = xyes ; then
+   grub_emu_usb_excuse="conflicts with PCI support"
+fi
+
+[if [ x"$grub_emu_usb_excuse" = x ]; then
+    # Check for libusb libraries.]
+AC_CHECK_LIB([usb], [usb_claim_interface], [LIBUSB="-lusb"],
+    [grub_emu_usb_excuse=["need libusb library"]])
+    AC_SUBST([LIBUSB])
+[fi]
+[if [ x"$grub_emu_usb_excuse" = x ]; then
+    # Check for headers.]
+    AC_CHECK_HEADERS([usb.h], [],
+      [grub_emu_usb_excuse=["need libusb headers"]])
+[fi]
+if test x"$enable_grub_emu_usb" = xyes && test x"$grub_emu_usb_excuse" != x ; then
+  AC_MSG_ERROR([USB support for grub-emu was explicitly requested but can't be compiled])
+fi
+if test x"$grub_emu_usb_excuse" = x ; then
+enable_grub_emu_usb=yes
+else
+enable_grub_emu_usb=no
+fi
+
+if test x"$enable_grub_emu_sdl" = xno ; then
+  grub_emu_sdl_excuse="explicitely disabled"
+fi
+[if [ x"$grub_emu_sdl_excuse" = x ]; then
+    # Check for libSDL libraries.]
+AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"],
+    [grub_emu_sdl_excuse=["libSDL libraries are required to build \`grub-emu' with SDL support"]])
+    AC_SUBST([LIBSDL])
+[fi]
+
+[if [ x"$grub_emu_sdl_excuse" = x ]; then
+    # Check for headers.]
+    AC_CHECK_HEADERS([SDL/SDL.h], [],
+      [grub_emu_sdl_excuse=["libSDL header file is required to build \`grub-emu' with SDL support"]])
+[fi]
+
+if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then
+  AC_MSG_ERROR([SDL support for grub-emu was explicitely requested but can't be compiled])
+fi
+if test x"$grub_emu_sdl_excuse" = x ; then
+enable_grub_emu_sdl=yes
+else
+enable_grub_emu_sdl=no
+fi
+
+if test x"$enable_grub_emu_pci" != xyes ; then
+   grub_emu_pci_excuse="not enabled"
+fi
+
+if test x"$enable_grub_emu_usb" = xyes ; then
+   grub_emu_pci_excuse="conflicts with USB support"
+fi
+
+[if [ x"$grub_emu_pci_excuse" = x ]; then
+      # Check for libpci libraries.]
+   AC_CHECK_LIB([pciaccess], [pci_system_init], [LIBPCIACCESS="-lpciaccess"],
+      [grub_emu_pci_excuse=["need libpciaccess library"]])
+    AC_SUBST([LIBPCIACCESS])
+[fi]
+[if [ x"$grub_emu_pci_excuse" = x ]; then
+    # Check for headers.]
+    AC_CHECK_HEADERS([pci/pci.h], [],
+      [grub_emu_pci_excuse=["need libpciaccess headers"]])
+[fi]
+
+if test x"$grub_emu_pci_excuse" = x ; then
+enable_grub_emu_pci=yes
+else
+
+enable_grub_emu_pci=no
+fi
+
+AC_SUBST([enable_grub_emu_sdl])
+AC_SUBST([enable_grub_emu_usb])
+AC_SUBST([enable_grub_emu_pci])
+fi
+
+AC_ARG_ENABLE([grub-fstest],
+             [AS_HELP_STRING([--enable-grub-fstest],
+                             [build and install the `grub-fstest' debugging utility (default=guessed)])])
+if test x"$enable_grub_fstest" = xno ; then
+  grub_fstest_excuse="explicitly disabled"
+fi
+if test x"$grub_fstest_excuse" = x ; then
+enable_grub_fstest=yes
+else
+enable_grub_fstest=no
+fi
+AC_SUBST([enable_grub_fstest])
+
+AC_ARG_ENABLE([grub-mkfont],
+             [AS_HELP_STRING([--enable-grub-mkfont],
+                             [build and install the `grub-mkfont' utility (default=guessed)])])
+if test x"$enable_grub_mkfont" = xno ; then
+  grub_mkfont_excuse="explicitly disabled"
+fi
+
+if test x"$grub_mkfont_excuse" = x ; then
+  # Check for freetype libraries.
+  AC_CHECK_PROGS([FREETYPE], [freetype-config])
+  if test "x$FREETYPE" = x ; then
+    grub_mkfont_excuse=["need freetype2 library"]
+  fi
+  freetype_cflags=`freetype-config --cflags`
+  freetype_libs=`freetype-config --libs`
+fi
+
+if test x"$grub_mkfont_excuse" = x ; then
+  # Check for freetype libraries.
+  SAVED_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $freetype_cflags"
+  AC_CHECK_HEADERS([ft2build.h], [],
+       [grub_mkfont_excuse=["need freetype2 headers"]])
+  CPPFLAGS="$SAVED_CPPFLAGS"
+fi
+
+if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then
+  AC_MSG_ERROR([grub-mkfont was explicitly requested but can't be compiled])
+fi
+if test x"$grub_mkfont_excuse" = x ; then
+enable_grub_mkfont=yes
+else
+enable_grub_mkfont=no
+fi
+AC_SUBST([enable_grub_mkfont])
+AC_SUBST([freetype_cflags])
+AC_SUBST([freetype_libs])
+
+AC_SUBST([FONT_SOURCE])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xpc],
+           [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xcoreboot],
+           [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
+AS_IF([test x$target_cpu = xmips -a x$platform = xyeeloong],
+           [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x80200000)])
+AS_IF([test x$target_cpu = xpowerpc -a x$platform = xieee1275],
+           [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x200000)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xqemu],
+           [AC_SUBST([GRUB_BOOT_MACHINE_LINK_ADDR], 0xffe00)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xieee1275],
+           [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x10000)])
+AS_IF([test x$TARGET_APPLE_CC = x1],
+           [AC_SUBST([USE_APPLE_CC_FIXES], yes)])
+
+#
+# Automake conditionals
+#
+
+AM_CONDITIONAL([COND_emu], [test x$platform = xemu])
+AM_CONDITIONAL([COND_i386_pc], [test x$target_cpu = xi386 -a x$platform = xpc])
+AM_CONDITIONAL([COND_i386_efi], [test x$target_cpu = xi386 -a x$platform = xefi])
+AM_CONDITIONAL([COND_i386_coreboot], [test x$target_cpu = xi386 -a x$platform = xcoreboot])
+AM_CONDITIONAL([COND_i386_ieee1275], [test x$target_cpu = xi386 -a x$platform = xieee1275])
+AM_CONDITIONAL([COND_i386_qemu], [test x$target_cpu = xi386 -a x$platform = xqemu])
+AM_CONDITIONAL([COND_x86_64_efi], [test x$target_cpu = xx86_64 -a x$platform = xefi])
+AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform = xyeeloong])
+AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
+AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
+AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
+
+AM_CONDITIONAL([COND_MAN_PAGES], [test x$cross_compiling = xno -a x$HELP2MAN != x])
+AM_CONDITIONAL([COND_GRUB_EMU_USB], [test x$enable_grub_emu_usb = xyes])
+AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
+AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
+AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
+AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
+AM_CONDITIONAL([COND_GRUB_FSTEST], [test x$enable_grub_fstest = xyes])
+AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
+
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644 (file)
index 0000000..ab65a8d
--- /dev/null
@@ -0,0 +1,6 @@
+AUTOMAKE_OPTIONS = subdir-objects
+AM_MAKEINFOFLAGS = --force --no-split --no-validate
+
+info_TEXINFOS = grub.texi
+grub_TEXINFOS = fdl.texi
+
index 43d2d16..f081012 100644 (file)
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-lst="$1"
-shift
-
-header=`echo "${lst}" | sed -e "s/\.lst$/.h/g"`
-
 cat <<EOF
 /* This file is automatically generated by geninit.sh. DO NOT EDIT! */
 /*
@@ -36,22 +31,24 @@ cat <<EOF
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <$header>
+#include <grub/emu/misc.h>
 
 EOF
 
+for mod in "$@"; do
+    echo "extern void grub_${mod}_init (void);"
+    echo "extern void grub_${mod}_fini (void);"
+done
+
 cat <<EOF
 void
 grub_init_all (void)
 {
 EOF
 
-while read line; do
-  file=`echo $line | cut -f1 -d:`
-  if echo $@ | grep $file >/dev/null; then
-    echo $line | sed -e 's/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/  grub_\1_init ();/'
-  fi
-done < ${lst}
+for mod in "$@"; do
+    echo "grub_${mod}_init ();"
+done
 
 cat <<EOF
 }
@@ -63,12 +60,9 @@ grub_fini_all (void)
 {
 EOF
 
-while read line; do
-  file=`echo $line | cut -f1 -d:`
-  if echo $@ | grep $file >/dev/null; then
-    echo $line | sed -e 's/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/  grub_\1_fini ();/'
-  fi
-done < ${lst}
+for mod in "$@"; do
+    echo "grub_${mod}_fini ();"
+done
 
 cat <<EOF
 }
diff --git a/geninitheader.sh b/geninitheader.sh
deleted file mode 100644 (file)
index 5ad1428..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2005,2007  Free Software Foundation, Inc.
-#
-# This gensymlist.sh is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-lst="$1"
-shift
-
-cat <<EOF
-/* This file is automatically generated by gensymlist.sh. DO NOT EDIT! */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-EOF
-
-cat <<EOF
-void grub_init_all (void);
-void grub_fini_all (void);
-EOF
-
-grep -v '^#' "${lst}" | sed -n '/GRUB_MOD_INIT *([a-zA-Z0-9_]*)/{s/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/void grub_\1_init (void);/;p;}'
-grep -v '^#' "${lst}" | sed -n '/GRUB_MOD_INIT *([a-zA-Z0-9_]*)/{s/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/void grub_\1_fini (void);/;p;}'
diff --git a/genkernsyms.sh.in b/genkernsyms.sh.in
deleted file mode 100644 (file)
index c5c63b2..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2002,2006,2008  Free Software Foundation, Inc.
-#
-# This gensymlist.sh is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-### The configure script will replace these variables.
-
-: ${srcdir=@srcdir@}
-: ${CC=@TARGET_CC@}
-
-u=
-grep "^#define HAVE_ASM_USCORE" config.h >/dev/null 2>&1 && u="_"
-
-$CC @TARGET_CFLAGS@ -DGRUB_SYMBOL_GENERATOR=1 -E -I. -Iinclude -I"$srcdir/include" $* \
-  | grep -v '^#' \
-  | sed -n \
-        -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$u"'\1 kernel/;p;}' \
-        -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$u"'\1 kernel/;p;}' \
-  | sort -u
diff --git a/genmk.rb b/genmk.rb
deleted file mode 100644 (file)
index e62dbd4..0000000
--- a/genmk.rb
+++ /dev/null
@@ -1,475 +0,0 @@
-#! /usr/bin/ruby -w
-#
-# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
-#
-# This genmk.rb is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-module Enumerable
-  def collect_with_index
-    ret = []
-    self.each_with_index do |item, index|
-      ret.push(yield(item, index))
-    end
-    ret
-  end
-end
-
-class String
-  def to_var
-    self.gsub(/[^a-zA-Z0-9_@]/, '_')
-  end
-
-  def suffix(str)
-    self.sub(/\.[^\.]*$/, '') + '.' + str
-  end
-
-  def to_obj
-    self.sub(/\.[^\.]*$/, '').to_var + '.o'
-  end
-end
-
-class Image
-  def initialize(dir, name)
-    @dir = dir
-    @name = name
-    @rule_count = 0
-  end
-  attr_reader :dir, :name
-
-  def rule(sources)
-    prefix = @name.to_var
-    @rule_count += 1
-    exe = @name.suffix('exec')
-    objs = sources.collect do |src|
-      raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
-      prefix + '-' + src.to_obj
-    end
-    objs_str = objs.join(' ')
-    deps = objs.collect {|obj| obj.suffix('d')}
-    deps_str = deps.join(' ')
-
-"
-clean-image-#{@name}.#{@rule_count}:
-       rm -f #{@name} #{exe} #{objs_str}
-
-CLEAN_IMAGE_TARGETS += clean-image-#{@name}.#{@rule_count}
-
-mostlyclean-image-#{@name}.#{@rule_count}:
-       rm -f #{deps_str}
-
-MOSTLYCLEAN_IMAGE_TARGETS += mostlyclean-image-#{@name}.#{@rule_count}
-
-ifneq ($(TARGET_APPLE_CC),1)
-#{@name}: #{exe}
-       $(OBJCOPY) -O $(#{prefix}_FORMAT) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@
-else
-ifneq (#{exe},kernel.exec)
-#{@name}: #{exe} ./grub-macho2img
-       ./grub-macho2img $< $@
-else
-#{@name}: #{exe} ./grub-macho2img
-       ./grub-macho2img --bss $< $@
-endif
-endif
-
-#{exe}: #{objs_str}
-       $(TARGET_CC) -o $@ $^ $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
-
-" + objs.collect_with_index do |obj, i|
-      src = sources[i]
-      fake_obj = File.basename(src).suffix('o')
-      dep = deps[i]
-      flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
-      extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
-      dir = File.dirname(src)
-
-      "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-       $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
--include #{dep}
-
-"
-    end.join('')
-  end
-end
-
-# Use PModule instead Module, to avoid name conflicting.
-class PModule
-  def initialize(dir, name)
-    @dir = dir
-    @name = name
-    @rule_count = 0
-  end
-  attr_reader :dir, :name
-
-  def rule(sources)
-    prefix = @name.to_var
-    @rule_count += 1
-    objs = sources.collect do |src|
-      raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
-      prefix + '-' + src.to_obj
-    end
-    objs_str = objs.join(' ')
-    deps = objs.collect {|obj| obj.suffix('d')}
-    deps_str = deps.join(' ')
-    pre_obj = 'pre-' + @name.suffix('o')
-    mod_src = 'mod-' + @name.suffix('c')
-    mod_obj = mod_src.suffix('o')
-    defsym = 'def-' + @name.suffix('lst')
-    undsym = 'und-' + @name.suffix('lst')
-    mod_name = File.basename(@name, '.mod')
-    symbolic_name = mod_name.sub(/\.[^\.]*$/, '')
-
-"
-clean-module-#{@name}.#{@rule_count}:
-       rm -f #{@name} #{mod_obj} #{mod_src} #{pre_obj} #{objs_str} #{undsym}
-
-CLEAN_MODULE_TARGETS += clean-module-#{@name}.#{@rule_count}
-
-clean-module-#{@name}-symbol.#{@rule_count}:
-       rm -f #{defsym}
-
-CLEAN_MODULE_TARGETS += clean-module-#{@name}-symbol.#{@rule_count}
-DEFSYMFILES += #{defsym}
-mostlyclean-module-#{@name}.#{@rule_count}:
-       rm -f #{deps_str}
-
-MOSTLYCLEAN_MODULE_TARGETS += mostlyclean-module-#{@name}.#{@rule_count}
-UNDSYMFILES += #{undsym}
-
-ifeq ($(TARGET_NO_MODULES), yes)
-#{@name}: #{pre_obj} $(TARGET_OBJ2ELF)
-       -rm -f $@
-       $(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{pre_obj}
-       if test ! -z \"$(TARGET_OBJ2ELF)\"; then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-       if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; fi
-else
-ifneq ($(TARGET_APPLE_CC),1)
-#{@name}: #{pre_obj} #{mod_obj} $(TARGET_OBJ2ELF)
-       -rm -f $@
-       $(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{pre_obj} #{mod_obj}
-       if test ! -z \"$(TARGET_OBJ2ELF)\"; then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-       if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; fi
-else
-#{@name}: #{pre_obj} #{mod_obj} $(TARGET_OBJ2ELF)
-       -rm -f $@
-       -rm -f $@.bin
-       $(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@.bin #{pre_obj} #{mod_obj}
-       $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -ew2030 -ew2050 -nu -nd $@.bin $@
-       -rm -f $@.bin
-endif
-endif
-
-#{pre_obj}: $(#{prefix}_DEPENDENCIES) #{objs_str}
-       -rm -f $@
-       $(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{objs_str}
-
-#{mod_obj}: #{mod_src}
-       $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(#{prefix}_CFLAGS) -DGRUB_FILE=\\\"#{mod_src}\\\" -c -o $@ $<
-
-#{mod_src}: $(builddir)/moddep.lst $(srcdir)/genmodsrc.sh
-       sh $(srcdir)/genmodsrc.sh '#{mod_name}' $< > $@ || (rm -f $@; exit 1)
-
-ifneq ($(TARGET_APPLE_CC),1)
-#{defsym}: #{pre_obj}
-       $(NM) -g --defined-only -P -p $< | sed 's/^\\([^ ]*\\).*/\\1 #{mod_name}/' > $@
-else
-#{defsym}: #{pre_obj}
-       $(NM) -g -P -p $< | grep -E '^[a-zA-Z0-9_]* [TDS]'  | sed 's/^\\([^ ]*\\).*/\\1 #{mod_name}/' > $@
-endif
-
-#{undsym}: #{pre_obj}
-       echo '#{mod_name}' > $@
-       $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-" + objs.collect_with_index do |obj, i|
-      src = sources[i]
-      fake_obj = File.basename(src).suffix('o')
-      extra_target = obj.sub(/\.[^\.]*$/, '') + '-extra'
-      command = 'cmd-' + obj.suffix('lst')
-      fs = 'fs-' + obj.suffix('lst')
-      partmap = 'partmap-' + obj.suffix('lst')
-      handler = 'handler-' + obj.suffix('lst')
-      terminal = 'terminal-' + obj.suffix('lst')
-      parttool = 'parttool-' + obj.suffix('lst')
-      video = 'video-' + obj.suffix('lst')
-      dep = deps[i]
-      flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
-      extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
-      dir = File.dirname(src)
-
-      "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-       $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
--include #{dep}
-
-clean-module-#{extra_target}.#{@rule_count}:
-       rm -f #{command} #{fs} #{partmap} #{handler} #{parttool} #{video} #{terminal}
-
-CLEAN_MODULE_TARGETS += clean-module-#{extra_target}.#{@rule_count}
-
-COMMANDFILES += #{command}
-FSFILES += #{fs}
-PARTTOOLFILES += #{parttool}
-PARTMAPFILES += #{partmap}
-HANDLERFILES += #{handler}
-TERMINALFILES += #{terminal}
-VIDEOFILES += #{video}
-
-#{command}: #{src} $(#{src}_DEPENDENCIES) gencmdlist.sh
-       set -e; \
-         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-         | sh $(srcdir)/gencmdlist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{fs}: #{src} $(#{src}_DEPENDENCIES) genfslist.sh
-       set -e; \
-         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-         | sh $(srcdir)/genfslist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{parttool}: #{src} $(#{src}_DEPENDENCIES) genparttoollist.sh
-       set -e; \
-         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-         | sh $(srcdir)/genparttoollist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{partmap}: #{src} $(#{src}_DEPENDENCIES) genpartmaplist.sh
-       set -e; \
-         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-         | sh $(srcdir)/genpartmaplist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{handler}: #{src} $(#{src}_DEPENDENCIES) genhandlerlist.sh
-       set -e; \
-         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-         | sh $(srcdir)/genhandlerlist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{terminal}: #{src} $(#{src}_DEPENDENCIES) genterminallist.sh
-       set -e; \
-         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-         | sh $(srcdir)/genterminallist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{video}: #{src} $(#{src}_DEPENDENCIES) genvideolist.sh
-       set -e; \
-         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-         | sh $(srcdir)/genvideolist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-"
-    end.join('')
-  end
-end
-
-class Utility
-  def initialize(dir, name)
-    @dir = dir
-    @name = name
-    @rule_count = 0
-  end
-  def print_tail()
-    prefix = @name.to_var
-    print "#{@name}: $(#{prefix}_DEPENDENCIES) $(#{prefix}_OBJECTS)
-       $(CC) -o $@ $(#{prefix}_OBJECTS) $(LDFLAGS) $(#{prefix}_LDFLAGS)
-
-"
-  end
-  attr_reader :dir, :name
-
-  def rule(sources)
-    prefix = @name.to_var
-    @rule_count += 1
-    objs = sources.collect do |src|
-      raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
-      prefix + '-' + src.to_obj
-    end
-    objs_str = objs.join(' ');
-    deps = objs.collect {|obj| obj.suffix('d')}
-    deps_str = deps.join(' ');
-
-    "
-clean-utility-#{@name}.#{@rule_count}:
-       rm -f #{@name}$(EXEEXT) #{objs_str}
-
-CLEAN_UTILITY_TARGETS += clean-utility-#{@name}.#{@rule_count}
-
-mostlyclean-utility-#{@name}.#{@rule_count}:
-       rm -f #{deps_str}
-
-MOSTLYCLEAN_UTILITY_TARGETS += mostlyclean-utility-#{@name}.#{@rule_count}
-
-#{prefix}_OBJECTS += #{objs_str}
-
-" + objs.collect_with_index do |obj, i|
-      src = sources[i]
-      fake_obj = File.basename(src).suffix('o')
-      dep = deps[i]
-      dir = File.dirname(src)
-
-      "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-       $(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(#{prefix}_CFLAGS) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
--include #{dep}
-
-"
-    end.join('')
-  end
-end
-
-class Program
-  def initialize(dir, name)
-    @dir = dir
-    @name = name
-  end
-  attr_reader :dir, :name
-
-  def print_tail()
-    prefix = @name.to_var
-    print "CLEANFILES += #{@name} $(#{prefix}_OBJECTS)
-ifeq ($(#{prefix}_RELOCATABLE),yes)
-#{@name}: $(#{prefix}_DEPENDENCIES) $(#{prefix}_OBJECTS)
-       $(TARGET_CC) -Wl,-r,-d -o $@ $(#{prefix}_OBJECTS) $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
-       if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K start -R .note -R .comment $@; fi
-else
-#{@name}: $(#{prefix}_DEPENDENCIES) $(#{prefix}_OBJECTS)
-       $(TARGET_CC) -o $@ $(#{prefix}_OBJECTS) $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
-       if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) -R .rel.dyn -R .reginfo -R .note -R .comment $@; fi
-endif
-
-"
-  end
-
-  def rule(sources)
-    prefix = @name.to_var
-    objs = sources.collect do |src|
-      raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
-      prefix + '-' + src.to_obj
-    end
-    deps = objs.collect {|obj| obj.suffix('d')}
-    deps_str = deps.join(' ');
-
-    "MOSTLYCLEANFILES += #{deps_str}
-
-" + objs.collect_with_index do |obj, i|
-      src = sources[i]
-      fake_obj = File.basename(src).suffix('o')
-      dep = deps[i]
-      flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
-      extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
-      dir = File.dirname(src)
-
-      "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-       $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
-
--include #{dep}
-
-#{prefix}_OBJECTS += #{obj}
-"
-    end.join('')
-  end
-end
-
-class Script
-  def initialize(dir, name)
-    @dir = dir
-    @name = name
-  end
-  attr_reader :dir, :name
-
-  def rule(sources)
-    if sources.length != 1
-      raise "only a single source file must be specified for a script"
-    end
-    src = sources[0]
-    if /\.in$/ !~ src
-      raise "unknown source file `#{src}'"
-    end
-
-    "CLEANFILES += #{@name}
-
-#{@name}: #{src} $(#{src}_DEPENDENCIES) config.status
-       ./config.status --file=-:#{src} | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
-       chmod +x $@
-
-"
-  end
-end
-
-images = []
-utils = []
-pmodules = []
-programs = []
-scripts = []
-
-l = gets
-print l
-print "# Generated by genmk.rb, please don't edit!\n"
-
-cont = false
-str = nil
-while l = gets
-  if cont
-    str += l
-  else
-    str = l
-  end
-
-  print l
-  cont = (/\\$/ =~ l)
-  unless cont
-    str.gsub!(/\\\n/, ' ')
-
-    if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ str
-      var, args = $1, $2
-
-      if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/
-       prefix, type = $1, $2
-
-       case type
-       when 'IMAGES'
-         images += args.split(/\s+/).collect do |img|
-           Image.new(prefix, img)
-         end
-
-       when 'MODULES'
-         pmodules += args.split(/\s+/).collect do |pmod|
-           PModule.new(prefix, pmod)
-         end
-
-       when 'UTILITIES'
-         utils += args.split(/\s+/).collect do |util|
-           Utility.new(prefix, util)
-         end
-
-       when 'PROGRAMS'
-         programs += args.split(/\s+/).collect do |prog|
-           Program.new(prefix, prog)
-         end
-
-       when 'SCRIPTS'
-         scripts += args.split(/\s+/).collect do |script|
-           Script.new(prefix, script)
-         end
-
-       when 'SOURCES'
-         if img = images.detect() {|i| i.name.to_var == prefix}
-           print img.rule(args.split(/\s+/))
-         elsif pmod = pmodules.detect() {|m| m.name.to_var == prefix}
-           print pmod.rule(args.split(/\s+/))
-         elsif util = utils.detect() {|u| u.name.to_var == prefix}
-           print util.rule(args.split(/\s+/))
-         elsif program = programs.detect() {|u| u.name.to_var == prefix}
-           print program.rule(args.split(/\s+/))
-         elsif script = scripts.detect() {|s| s.name.to_var == prefix}
-           print script.rule(args.split(/\s+/))
-         end
-       end
-      end
-
-    end
-
-  end
-
-end
-utils.each {|util| util.print_tail()}
-programs.each {|program| program.print_tail()}
-
diff --git a/gentpl.py b/gentpl.py
new file mode 100644 (file)
index 0000000..214b58a
--- /dev/null
+++ b/gentpl.py
@@ -0,0 +1,460 @@
+#! /usr/bin/python
+
+#
+# This is the python script used to generate Makefile.tpl
+#
+
+GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
+                   "i386_ieee1275", "x86_64_efi", "mips_yeeloong", "sparc64_ieee1275",
+                   "powerpc_ieee1275" ]
+
+GROUPS = {}
+GROUPS["i386"]    = [ "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot", "i386_ieee1275" ]
+GROUPS["x86_64"]  = [ "x86_64_efi" ]
+GROUPS["mips"]    = [ "mips_yeeloong" ]
+GROUPS["sparc64"] = [ "sparc64_ieee1275" ]
+GROUPS["powerpc"] = [ "powerpc_ieee1275" ]
+GROUPS["x86"]     = GROUPS["i386"] + GROUPS["x86_64"]
+GROUPS["x86_efi"] = [ "i386_efi", "x86_64_efi" ]
+GROUPS["common"]  = GRUB_PLATFORMS[:]
+GROUPS["nonemu"]  = GRUB_PLATFORMS[:]
+GROUPS["nonemu"].remove("emu")
+
+#
+# Create platform => groups reverse map, where groups covering that
+# platform are ordered by their sizes
+#
+RMAP = {}
+for platform in GRUB_PLATFORMS:
+    # initialize with platform itself as a group
+    RMAP[platform] = [ platform ]
+
+    for k in GROUPS.keys():
+        v = GROUPS[k]
+        # skip groups that don't cover this platform
+        if platform not in v: continue
+
+        bigger = []
+        smaller = []
+        # partition currently known groups based on their size
+        for group in RMAP[platform]:
+            if group in GRUB_PLATFORMS: smaller.append(group)
+            elif len(GROUPS[group]) < len(v): smaller.append(group)
+            else: bigger.append(group)
+        # insert in the middle
+        RMAP[platform] = smaller + [ k ] + bigger
+
+#
+# Global variables
+#
+GVARS = []
+
+def gvar_add(var, value):
+    if var not in GVARS:
+        GVARS.append(var)
+    return var + " += " + value + "\n"
+
+def global_variable_initializers():
+    r = ""
+    for var in GVARS:
+        r += var + " ?= \n"
+    return r
+
+#
+# Per PROGRAM/SCRIPT variables 
+#
+
+def var_set(var, value):
+    return var + "  = " + value + "\n"
+
+def var_add(var, value):
+    return var + " += " + value + "\n"
+
+#
+# Autogen constructs
+#
+
+def if_tag(tag, closure):
+    return "[+ IF " + tag + " +]" + closure() + "[+ ENDIF +]"
+
+def if_tag_defined(tag, closure):
+    return "[+ IF " + tag + " defined +]" + closure() + "[+ ENDIF +]"
+
+def for_tag(tag, closure):
+    return "[+ FOR ." + tag + " +]" + closure() + "[+ ENDFOR +]"
+
+def collect_values(tag, prefix=""):
+    return for_tag(tag, lambda: prefix + "[+ ." + tag + " +] ")
+
+def each_group(platform, suffix, closure):
+    r = None
+    for group in RMAP[platform]:
+        if r == None:
+            r = "[+ IF ." + group + suffix + " +]"
+        else:
+            r += "[+ ELIF ." + group + suffix + " +]"
+            
+        r += closure(group)
+
+    if r:
+        r += "[+ ELSE +]"
+        r += closure(None)
+        r += "[+ ENDIF +]"
+    else:
+        r = closure(None)
+
+    return r
+
+def each_platform(closure):
+    r = ""
+    for platform in GRUB_PLATFORMS:
+        for group in RMAP[platform]:
+            if group == RMAP[platform][0]:
+                r += "[+ IF ." + group + " defined +]"
+            else:
+                r += "[+ ELIF ." + group + " defined +]"
+
+            r += "if COND_" + platform + "\n"
+            r += closure(platform)
+            r += "endif\n"
+        r += "[+ ENDIF +]"
+    return r
+
+def canonical_name():   return "[+ % name `echo -n %s | sed -e 's/[^0-9A-Za-z@_]/_/g'` +]"
+def canonical_module(): return canonical_name() + "_module"
+def canonical_kernel(): return canonical_name() + "_exec"
+def canonical_image(): return canonical_name() + "_image"
+
+def shared_sources(prefix=""):        return collect_values("shared", prefix)
+def shared_nodist_sources(prefix=""): return collect_values("nodist_shared", prefix)
+
+def default_sources(prefix=""):        return collect_values("source", prefix)
+def default_nodist_sources(prefix=""): return collect_values("nodist", prefix)
+def default_ldadd():     return collect_values("ldadd")
+def default_cflags():    return collect_values("cflags")
+def default_ldflags():   return collect_values("ldflags")
+def default_cppflags():  return collect_values("cppflags")
+def default_ccasflags(): return collect_values("ccasflags")
+
+def group_sources(group, prefix=""):        return collect_values(group, prefix) if group else default_sources(prefix)
+def group_nodist_sources(group, prefix=""): return collect_values(group + "_nodist", prefix) if group else default_nodist_sources(prefix)
+
+def platform_sources(platform, prefix=""):        return each_group(platform, "", lambda g: collect_values(g, prefix) if g else default_sources(prefix))
+def platform_nodist_sources(platform, prefix=""): return each_group(platform, "_nodist", lambda g: collect_values(g + "_nodist", prefix) if g else default_nodist_sources(prefix))
+
+def platform_ldadd(platform):     return each_group(platform, "_ldadd", lambda g: collect_values(g + "_ldadd") if g else default_ldadd())
+def platform_cflags(platform):    return each_group(platform, "_cflags", lambda g: collect_values(g + "_cflags") if g else default_cflags())
+def platform_ldflags(platform):   return each_group(platform, "_ldflags", lambda g: collect_values(g + "_ldflags") if g else default_ldflags())
+def platform_cppflags(platform):  return each_group(platform, "_cppflags", lambda g: collect_values(g + "_cppflags") if g else default_cppflags())
+def platform_ccasflags(platform): return each_group(platform, "_ccasflags", lambda g: collect_values(g + "_ccasflags") if g else default_ccasflags())
+def platform_format(platform):    return each_group(platform, "_format", lambda g: collect_values(g + "_format") if g else "binary")
+
+def module(platform):
+    r  = gvar_add("noinst_PROGRAMS", "[+ name +].module")
+    r += gvar_add("MODULE_FILES", "[+ name +].module")
+
+    r += var_set(canonical_module() + "_SOURCES", platform_sources(platform) + "## platform sources")
+    r += var_add(canonical_module() + "_SOURCES", shared_sources() + "## shared sources")
+    r += var_set("nodist_" + canonical_module() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
+    r += var_add("nodist_" + canonical_module() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
+    r += var_set(canonical_module() + "_LDADD", platform_ldadd(platform))
+    r += var_set(canonical_module() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_MODULE) " + platform_cflags(platform))
+    r += var_set(canonical_module() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_MODULE) " + platform_ldflags(platform))
+    r += var_set(canonical_module() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_MODULE) " + platform_cppflags(platform))
+    r += var_set(canonical_module() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform))
+
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_module() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_module() + "_SOURCES)")
+
+    r += gvar_add("DEF_FILES", "def-[+ name +].lst")
+    r += gvar_add("UND_FILES", "und-[+ name +].lst")
+    r += gvar_add("MOD_FILES", "[+ name +].mod")
+    r += gvar_add("platform_DATA", "[+ name +].mod")
+    r += gvar_add("CLEANFILES", "def-[+ name +].lst und-[+ name +].lst mod-[+ name +].c mod-[+ name +].o [+ name +].mod")
+
+    r += gvar_add("COMMAND_FILES", "command-[+ name +].lst")
+    r += gvar_add("FS_FILES", "fs-[+ name +].lst")
+    r += gvar_add("VIDEO_FILES", "video-[+ name +].lst")
+    r += gvar_add("PARTMAP_FILES", "partmap-[+ name +].lst")
+    r += gvar_add("HANDLER_FILES", "handler-[+ name +].lst")
+    r += gvar_add("PARTTOOL_FILES", "parttool-[+ name +].lst")
+    r += gvar_add("TERMINAL_FILES", "terminal-[+ name +].lst")
+    r += gvar_add("CLEANFILES", "command-[+ name +].lst fs-[+ name +].lst")
+    r += gvar_add("CLEANFILES", "handler-[+ name +].lst terminal-[+ name +].lst")
+    r += gvar_add("CLEANFILES", "video-[+ name +].lst partmap-[+ name +].lst parttool-[+ name +].lst")
+
+    r += """
+[+ name +].pp: $(""" + canonical_module() + """_SOURCES) $(nodist_""" + canonical_module() + """_SOURCES)
+       $(TARGET_CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(""" + canonical_module() + """_CPPFLAGS) $(CPPFLAGS) $^ > $@ || (rm -f $@; exit 1)
+
+def-[+ name +].lst: [+ name +].module
+       if test x$(USE_APPLE_CC_FIXES) = xyes; then \
+         $(NM) -g -P -p $< | grep -E '^[a-zA-Z0-9_]* [TDS]' | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@; \
+       else \
+         $(NM) -g --defined-only -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@; \
+       fi
+
+und-[+ name +].lst: [+ name +].module
+       $(NM) -u -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@
+
+mod-[+ name +].c: [+ name +].module $(top_builddir)/moddep.lst $(top_srcdir)/genmodsrc.sh
+       sh $(top_srcdir)/genmodsrc.sh [+ name +] $(top_builddir)/moddep.lst > $@ || (rm -f $@; exit 1)
+
+mod-[+ name +].o: mod-[+ name +].c
+       $(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS_MODULE) $(CPPFLAGS) $(CFLAGS_MODULE) $(CFLAGS) -c -o $@ $<
+
+[+ name +].mod: [+ name +].module mod-[+ name +].o
+       if test x$(USE_APPLE_CC_FIXES) = xyes; then \
+         $(CCLD) $(LDFLAGS_MODULE) $(LDFLAGS) -o $@.bin $^; \
+         $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@; \
+         rm -f $@.bin; \
+       else \
+         $(CCLD) -o $@ $(LDFLAGS_MODULE) $(LDFLAGS) $^; \
+         if test ! -z '$(TARGET_OBJ2ELF)'; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
+         $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; \
+       fi
+
+command-[+ name +].lst: [+ name +].pp $(top_srcdir)/gencmdlist.sh
+       cat $< | sh $(top_srcdir)/gencmdlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+fs-[+ name +].lst: [+ name +].pp $(top_srcdir)/genfslist.sh
+       cat $< | sh $(top_srcdir)/genfslist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+video-[+ name +].lst: [+ name +].pp $(top_srcdir)/genvideolist.sh
+       cat $< | sh $(top_srcdir)/genvideolist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+partmap-[+ name +].lst: [+ name +].pp $(top_srcdir)/genpartmaplist.sh
+       cat $< | sh $(top_srcdir)/genpartmaplist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+parttool-[+ name +].lst: [+ name +].pp $(top_srcdir)/genparttoollist.sh
+       cat $< | sh $(top_srcdir)/genparttoollist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+handler-[+ name +].lst: [+ name +].pp $(top_srcdir)/genhandlerlist.sh
+       cat $< | sh $(top_srcdir)/genhandlerlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+terminal-[+ name +].lst: [+ name +].pp $(top_srcdir)/genterminallist.sh
+       cat $< | sh $(top_srcdir)/genterminallist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+"""
+    return r
+
+def rule(target, source, cmd):
+    if cmd[0] == "\n":
+        return "\n" + target + ": " + source + cmd.replace("\n", "\n\t") + "\n"
+    else:
+        return "\n" + target + ": " + source + "\n\t" + cmd.replace("\n", "\n\t") + "\n"
+
+def image_nostrip(platform):
+    return if_tag_defined("image_nostrip." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", "cp $< $@"))
+
+def image_strip(platform):
+    return if_tag_defined("image_strip." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", "$(STRIP) -o $@ -R .rel.dyn -R .reginfo -R .note -R .comment $<"))
+
+def image_strip_keep_kernel(platform):
+    return if_tag_defined("image_strip_keep_kernel." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", "$(STRIP) -o $@ --strip-unneeded -K start -R .note -R .comment $<"))
+
+def image_strip_macho2img(platform):
+    return if_tag_defined("image_strip_macho2img." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", """
+if test "x$(TARGET_APPLE_CC)" = x1; then \
+  $(MACHO2IMG) --bss $< $@ || exit 1; \
+else \
+  $(STRIP) -o $@ -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< || exit 1; \
+fi
+"""))
+
+def kernel(platform):
+    r  = gvar_add("noinst_PROGRAMS", "[+ name +].exec")
+    r += var_set(canonical_kernel() + "_SOURCES", platform_sources(platform))
+    r += var_add(canonical_kernel() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + canonical_kernel() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
+    r += var_add("nodist_" + canonical_kernel() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
+    r += var_set(canonical_kernel() + "_LDADD", platform_ldadd(platform))
+    r += var_set(canonical_kernel() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_KERNEL) " + platform_cflags(platform))
+    r += var_set(canonical_kernel() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_KERNEL) " + platform_ldflags(platform))
+    r += var_set(canonical_kernel() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) " + platform_cppflags(platform))
+    r += var_set(canonical_kernel() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_KERNEL) " + platform_ccasflags(platform))
+
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_kernel() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_kernel() + "_SOURCES)")
+
+    r += gvar_add("platform_DATA", "[+ name +].img")
+    r += image_nostrip(platform)
+    r += image_strip(platform)
+    r += image_strip_keep_kernel(platform)
+    r += image_strip_macho2img(platform)
+    return r
+
+def image(platform):
+    r  = gvar_add("noinst_PROGRAMS", "[+ name +].image")
+    r += var_set(canonical_image() + "_SOURCES", platform_sources(platform))
+    r += var_add(canonical_image() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + canonical_image() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
+    r += var_add("nodist_" + canonical_image() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
+    r += var_set(canonical_image() + "_LDADD", platform_ldadd(platform))
+    r += var_set(canonical_image() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_IMAGE) " + platform_cflags(platform))
+    r += var_set(canonical_image() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_IMAGE) " + platform_ldflags(platform))
+    r += var_set(canonical_image() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_IMAGE) " + platform_cppflags(platform))
+    r += var_set(canonical_image() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_IMAGE) " + platform_ccasflags(platform))
+
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_image() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_image() + "_SOURCES)")
+
+    r += gvar_add("platform_DATA", "[+ name +].img")
+    r += rule("[+ name +].img", "[+ name +].image", """
+if test x$(USE_APPLE_CC_FIXES) = xyes; then \
+  $(MACHO2IMG) $< $@; \
+else \
+  $(OBJCOPY) -O """ + platform_format(platform) + """ --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@; \
+fi
+""")
+    return r
+
+def library(platform):
+    r  = gvar_add("noinst_LIBRARIES", "[+ name +]")
+    r += var_set(canonical_name() + "_SOURCES", platform_sources(platform))
+    r += var_add(canonical_name() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + canonical_name() + "_SOURCES", platform_nodist_sources(platform))
+    r += var_add("nodist_" + canonical_name() + "_SOURCES", shared_nodist_sources())
+    r += var_set(canonical_name() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_LIBRARY) " + platform_cflags(platform))
+    r += var_set(canonical_name() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) " + platform_cppflags(platform))
+    r += var_set(canonical_name() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) " + platform_ccasflags(platform))
+
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_name() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_name() + "_SOURCES)")
+
+    return r
+
+def installdir(default="bin"):
+    return "[+ IF installdir +][+ installdir +][+ ELSE +]" + default + "[+ ENDIF +]"
+
+def manpage():
+    r  = "if COND_MAN_PAGES\n"
+    r += "man_MANS += [+ name +].[+ mansection +]\n"
+    r += rule("[+ name +].[+ mansection +]", "", """
+$(MAKE) $(AM_MAKEFLAGS) [+ name +]
+chmod a+x [+ name +]
+$(HELP2MAN) --section=[+ mansection +] -o $@ ./[+ name +]
+""")
+    r += gvar_add("CLEANFILES", "[+ name +].[+ mansection +]")
+    r += "endif\n"
+    return r
+
+def program(platform, test=False):
+    if test:
+        r = gvar_add("check_PROGRAMS", "[+ name +]")
+    else:
+        r  = gvar_add(installdir() + "_PROGRAMS", "[+ name +]")
+
+    r += var_set(canonical_name() + "_SOURCES", platform_sources(platform))
+    r += var_add(canonical_name() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + canonical_name() + "_SOURCES", platform_nodist_sources(platform))
+    r += var_add("nodist_" + canonical_name() + "_SOURCES", shared_nodist_sources())
+    r += var_set(canonical_name() + "_LDADD", platform_ldadd(platform))
+    r += var_set(canonical_name() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_PROGRAM) " + platform_cflags(platform))
+    r += var_set(canonical_name() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_PROGRAM) " + platform_ldflags(platform))
+    r += var_set(canonical_name() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) " + platform_cppflags(platform))
+    r += var_set(canonical_name() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform))
+
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_name() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_name() + "_SOURCES)")
+
+    if test:
+        r += if_tag_defined("enable", lambda: gvar_add("TESTS", "[+ name +]"))
+    else:
+        r += if_tag("mansection", lambda: manpage())
+
+    return r
+
+def test_program(platform):
+    return program(platform, True)
+
+def data(platform):
+    return gvar_add(installdir() + "_DATA", platform_sources(platform))
+
+def script(platform, test=False):
+    if test:
+        r = gvar_add("check_SCRIPTS", "[+ name +]")
+    else:
+        r  = gvar_add(installdir() + "_SCRIPTS", "[+ name +]")
+
+    r += rule("[+ name +]", "$(top_builddir)/config.status " + platform_sources(platform), """
+$(top_builddir)/config.status --file=-:""" + platform_sources(platform) + """ \
+  | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+chmod a+x [+ name +]
+""")
+
+    r += gvar_add("CLEANFILES", "[+ name +]")
+    r += gvar_add("EXTRA_DIST", platform_sources(platform))
+
+    if test:
+        r += if_tag_defined("enable", lambda: gvar_add("TESTS", "[+ name +]"))
+    else:
+        r += if_tag("mansection", lambda: manpage())
+
+    return r
+
+def test_script(platform):
+    return script(platform, True)
+
+def with_enable_condition(x):
+    return "[+ IF enable +]if [+ enable +]\n" + x + "endif\n[+ ELSE +]" + x + "[+ ENDIF +]"
+
+def module_rules():
+    return for_tag("module", lambda: with_enable_condition(each_platform(lambda p: module(p))))
+
+def kernel_rules():
+    return for_tag("kernel", lambda: with_enable_condition(each_platform(lambda p: kernel(p))))
+
+def image_rules():
+    return for_tag("image", lambda: with_enable_condition(each_platform(lambda p: image(p))))
+
+def library_rules():
+    return for_tag("library", lambda: with_enable_condition(each_platform(lambda p: library(p))))
+
+def program_rules():
+    return for_tag("program", lambda: with_enable_condition(each_platform(lambda p: program(p))))
+
+def script_rules():
+    return for_tag("script", lambda: with_enable_condition(each_platform(lambda p: script(p))))
+
+def data_rules():
+    return for_tag("data", lambda: with_enable_condition(each_platform(lambda p: data(p))))
+
+def test_program_rules():
+    return for_tag("test_program", lambda: with_enable_condition(each_platform(lambda p: test_program(p))))
+
+def test_script_rules():
+    return for_tag("test_script", lambda: with_enable_condition(each_platform(lambda p: test_script(p))))
+
+print "[+ AutoGen5 template +]\n"
+a = module_rules()
+b = kernel_rules()
+c = image_rules()
+d = library_rules()
+e = program_rules()
+f = script_rules()
+g = data_rules()
+h = test_program_rules()
+i = test_script_rules()
+z = global_variable_initializers()
+
+print z # initializer for all vars
+print a
+print b
+print c
+print d
+print e
+print f
+print g
+print h
+print i
+
+print """.PRECIOUS: modules.am
+$(srcdir)/modules.am: $(srcdir)/modules.def $(top_srcdir)/Makefile.tpl
+       autogen -T $(top_srcdir)/Makefile.tpl $(srcdir)/modules.def | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
+       mv $@.new $@
+
+.PRECIOUS: $(top_srcdir)/Makefile.tpl
+$(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
+       python $(top_srcdir)/gentpl.py | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
+       mv $@.new $@
+"""
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
new file mode 100644 (file)
index 0000000..1f26576
--- /dev/null
@@ -0,0 +1,155 @@
+AUTOMAKE_OPTIONS = subdir-objects
+SUBDIRS = po
+DEPDIR = .deps-core
+
+include $(top_srcdir)/Makefile.extra-dist
+include $(top_srcdir)/Makefile.vars
+
+LDADD_KERNEL = -lgcc
+CFLAGS_KERNEL = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+LDFLAGS_KERNEL = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N -static-libgcc
+CPPFLAGS_KERNEL = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_KERNEL = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_MODULE = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+LDFLAGS_MODULE = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-r,-d
+CPPFLAGS_MODULE = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_MODULE = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_IMAGE = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -fno-builtin
+LDFLAGS_IMAGE = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-S
+CPPFLAGS_IMAGE = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_IMAGE = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_LIBRARY = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -fno-builtin
+CPPFLAGS_LIBRARY = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_LIBRARY = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_PROGRAM = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM)
+LDFLAGS_PROGRAM = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM)
+CPPFLAGS_PROGRAM = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_PROGRAM = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+AM_CFLAGS = 
+AM_LDFLAGS =
+AM_CPPFLAGS = $(CPPFLAGS_GRUB) -DGRUB_FILE=\"$(subst $(top_srcdir)/,,$<)\"
+AM_CCASFLAGS = -DASM_FILE=1
+
+# gentrigtables
+gentrigtables: $(top_srcdir)/gentrigtables.c
+       $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(CPPFLAGS) -lm $<
+CLEANFILES += gentrigtables
+
+# trigtables.c
+trigtables.c: gentrigtables.c configure.ac
+       $(MAKE) $(AM_MAKEFLAGS) gentrigtables
+       $(top_builddir)/gentrigtables > $@
+CLEANFILES += trigtables.c
+
+# XXX Use Automake's LEX & YACC support
+# See Recording Dependencies Manually in automake doc for below rules
+script/sh_module-lexer.$(OBJEXT):grub_script.tab.h
+grub_script.tab.c grub_script.tab.h: $(top_srcdir)/script/parser.y
+       $(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/script/parser.y
+CLEANFILES += grub_script.tab.c grub_script.tab.h
+
+# For the lexer.
+# See Recording Dependencies Manually in automake doc for below rules
+script/sh_module-lexer.$(OBJEXT):grub_script.yy.h
+grub_script.yy.c grub_script.yy.h: $(top_srcdir)/script/yylex.l
+       $(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/script/yylex.l
+CLEANFILES += grub_script.yy.c grub_script.yy.h
+
+include $(srcdir)/modules.am
+include $(srcdir)/Makefile.kernel
+
+# .lst files
+platform_DATA += moddep.lst
+platform_DATA += fs.lst
+platform_DATA += command.lst
+platform_DATA += partmap.lst
+platform_DATA += handler.lst
+platform_DATA += terminal.lst
+platform_DATA += parttool.lst
+platform_DATA += video.lst
+platform_DATA += crypto.lst
+CLEANFILES += moddep.lst
+CLEANFILES += fs.lst
+CLEANFILES += command.lst
+CLEANFILES += partmap.lst
+CLEANFILES += handler.lst
+CLEANFILES += terminal.lst
+CLEANFILES += parttool.lst
+CLEANFILES += video.lst
+CLEANFILES += crypto.lst
+
+fs.lst: $(FS_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+command.lst: $(COMMAND_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+partmap.lst: $(PARTMAP_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+handler.lst: $(HANDLER_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+terminal.lst: $(TERMINAL_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+parttool.lst: $(PARTTOOL_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+video.lst: $(VIDEO_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+
+# but, crypto.lst is simply copied
+crypto.lst: $(top_srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
+       cp $^ $@
+
+# generate global module dependencies list
+moddep.lst: kernel_syms.lst genmoddep.awk $(DEF_FILES) $(UND_FILES)
+       cat $(DEF_FILES) kernel_syms.lst /dev/null \
+         | $(AWK) -f $(top_srcdir)/genmoddep.awk $(UND_FILES) > $@ \
+         || (rm -f $@; exit 1)
+
+if COND_i386_pc
+if COND_ENABLE_EFIEMU
+efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
+       -rm -f $@; \
+       if test "x$(TARGET_APPLE_CC)" = x1; then \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -DELF32 -DAPPLE_CC -m32 -Wall -Werror -nostdlib -O2 -c -o $@.bin $< || exit 1; \
+         $(OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
+         rm -f $@.bin; \
+       else \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -DELF32 -m32 -Wall -Werror -nostdlib -O2 -c -o $@ $< || exit 1; \
+         if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
+       fi
+
+efiemu64_c.o: efiemu/runtime/efiemu.c
+       if test "x$(TARGET_APPLE_CC)" = x1; then \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -DELF64 -DAPPLE_CC=1 -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \
+       else \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -DELF64 -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+       fi
+
+efiemu64_s.o: efiemu/runtime/efiemu.S
+       -rm -f $@
+       if test "x$(TARGET_APPLE_CC)" = x1; then \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -DELF64 -DAPPLE_CC=1 -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \
+       else \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -DELF64 -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+       fi
+
+efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
+       -rm -f $@; \
+       if test "x$(TARGET_APPLE_CC)" = x1; then \
+         rm -f $@.bin; \
+         $(TARGET_CC) -m64 -Wl,-r -nostdlib -o $@.bin $^ || exit 1; \
+         $(OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
+         rm -f $@.bin; \
+       else \
+         $(TARGET_CC) -m64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \
+         if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
+       fi
+
+platform_DATA += efiemu32.o efiemu64.o
+CLEANFILES += efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o
+endif
+endif
+
diff --git a/grub-core/Makefile.extra-dist b/grub-core/Makefile.extra-dist
new file mode 100644 (file)
index 0000000..c6516f0
--- /dev/null
@@ -0,0 +1,53 @@
+#
+# Extra files that need to be distributed (in .tar.gz) to build
+# successfully on user site.
+#
+# XXX Remove wildcards;  See 27.3 in automake.info
+#
+
+EXTRA_DIST =
+
+EXTRA_DIST += gentpl.py
+EXTRA_DIST += Makefile.tpl
+EXTRA_DIST += modules.def
+
+EXTRA_DIST += gentrigtables.c
+
+EXTRA_DIST += genmoddep.awk
+EXTRA_DIST += genmodsrc.sh
+EXTRA_DIST += gensymlist.sh
+
+EXTRA_DIST += genemuinit.sh
+EXTRA_DIST += genemuinitheader.sh
+
+EXTRA_DIST += genfslist.sh
+EXTRA_DIST += gencmdlist.sh
+EXTRA_DIST += genvideolist.sh
+EXTRA_DIST += genhandlerlist.sh
+EXTRA_DIST += genpartmaplist.sh
+EXTRA_DIST += genparttoollist.sh
+EXTRA_DIST += genterminallist.sh
+EXTRA_DIST += lib/libgcrypt-grub/cipher/crypto.lst
+
+EXTRA_DIST += script/yylex.l
+EXTRA_DIST += script/parser.y
+
+EXTRA_DIST += lib/relocator.c
+
+EXTRA_DIST += efiemu/loadcore.c
+EXTRA_DIST += efiemu/prepare.c
+
+EXTRA_DIST += loader/machoXX.c
+
+
+EXTRA_DIST += kern/i386/loader.S
+EXTRA_DIST += kern/i386/realmode.S
+EXTRA_DIST += loader/i386/bsdXX.c
+EXTRA_DIST += loader/i386/bsd_pagetable.c
+EXTRA_DIST += loader/i386/multiboot_elfxx.c
+EXTRA_DIST += commands/search.c
+
+EXTRA_DIST += kern/i386/pc/lzma_decode.S
+
+EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
+
diff --git a/grub-core/Makefile.kernel b/grub-core/Makefile.kernel
new file mode 100644 (file)
index 0000000..58e4648
--- /dev/null
@@ -0,0 +1,192 @@
+# -*- makefile -*-
+
+KERNEL_HEADER_FILES =
+KERNEL_HEADER_FILES += include/grub/cache.h
+KERNEL_HEADER_FILES += include/grub/command.h
+KERNEL_HEADER_FILES += include/grub/device.h
+KERNEL_HEADER_FILES += include/grub/disk.h
+KERNEL_HEADER_FILES += include/grub/dl.h
+KERNEL_HEADER_FILES += include/grub/elf.h
+KERNEL_HEADER_FILES += include/grub/elfload.h
+KERNEL_HEADER_FILES += include/grub/env.h
+KERNEL_HEADER_FILES += include/grub/env_private.h
+KERNEL_HEADER_FILES += include/grub/err.h
+KERNEL_HEADER_FILES += include/grub/file.h
+KERNEL_HEADER_FILES += include/grub/fs.h
+KERNEL_HEADER_FILES += include/grub/handler.h
+KERNEL_HEADER_FILES += include/grub/i18n.h
+KERNEL_HEADER_FILES += include/grub/kernel.h
+KERNEL_HEADER_FILES += include/grub/list.h
+KERNEL_HEADER_FILES += include/grub/misc.h
+KERNEL_HEADER_FILES += include/grub/mm.h
+KERNEL_HEADER_FILES += include/grub/net.h
+KERNEL_HEADER_FILES += include/grub/parser.h
+KERNEL_HEADER_FILES += include/grub/partition.h
+KERNEL_HEADER_FILES += include/grub/reader.h
+KERNEL_HEADER_FILES += include/grub/symbol.h
+KERNEL_HEADER_FILES += include/grub/term.h
+KERNEL_HEADER_FILES += include/grub/time.h
+KERNEL_HEADER_FILES += include/grub/types.h
+
+if COND_i386_pc
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/machine/biosdisk.h
+KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += include/grub/machine/vga.h
+KERNEL_HEADER_FILES += include/grub/machine/vbe.h
+KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += include/grub/machine/pxe.h
+KERNEL_HEADER_FILES += include/grub/i386/pit.h
+endif
+
+if COND_i386_efi
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/efi/efi.h
+KERNEL_HEADER_FILES += include/grub/efi/time.h
+KERNEL_HEADER_FILES += include/grub/efi/disk.h
+KERNEL_HEADER_FILES += include/grub/i386/pit.h
+endif
+
+if COND_i386_coreboot
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += include/grub/machine/init.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+endif
+
+if COND_i386_qemu
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += include/grub/machine/init.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+endif
+
+if COND_i386_ieee1275
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+endif
+
+if COND_x86_64_efi
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/efi/efi.h
+KERNEL_HEADER_FILES += include/grub/efi/time.h
+KERNEL_HEADER_FILES += include/grub/efi/disk.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += include/grub/i386/pit.h
+endif
+
+if COND_mips_yeeloong
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += include/grub/cpu/cache.h
+KERNEL_HEADER_FILES += include/grub/bitmap.h
+KERNEL_HEADER_FILES += include/grub/video.h
+KERNEL_HEADER_FILES += include/grub/gfxterm.h
+KERNEL_HEADER_FILES += include/grub/font.h
+KERNEL_HEADER_FILES += include/grub/bitmap_scale.h
+KERNEL_HEADER_FILES += include/grub/bufio.h
+KERNEL_HEADER_FILES += include/grub/pci.h
+KERNEL_HEADER_FILES += include/grub/libgcc.h
+endif
+
+if COND_powerpc_ieee1275
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += include/grub/libgcc.h
+endif
+
+if COND_sparc64_ieee1275
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/libgcc.h
+KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += include/grub/sparc64/ieee1275/ieee1275.h
+endif
+
+if COND_emu
+KERNEL_HEADER_FILES += include/grub/cpu/time.h
+KERNEL_HEADER_FILES += include/grub/cpu/types.h
+KERNEL_HEADER_FILES += include/grub/gzio.h
+KERNEL_HEADER_FILES += include/grub/menu.h
+KERNEL_HEADER_FILES += include/grub/datetime.h
+KERNEL_HEADER_FILES += include/grub/emu/misc.h
+if COND_GRUB_EMU_SDL
+KERNEL_HEADER_FILES += include/grub/sdl.h
+endif
+if COND_GRUB_EMU_USB
+KERNEL_HEADER_FILES += include/grub/libusb.h
+endif
+if COND_GRUB_EMU_PCI
+KERNEL_HEADER_FILES += include/grub/libpciaccess.h
+endif
+endif
+
+symlist.h: config.h $(KERNEL_HEADER_FILES)
+       @list='$^'; \
+       for p in $$list; do \
+         echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \
+       done
+CLEANFILES += symlist.h
+BUILT_SOURCES += symlist.h
+
+symlist.c: symlist.h gensymlist.sh
+       $(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
+       cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+       rm -f symlist.p
+CLEANFILES += symlist.c
+BUILT_SOURCES += symlist.c
+
+noinst_DATA += kernel_syms.lst
+kernel_syms.lst: $(KERNEL_HEADER_FILES) config.h
+       if grep "^#define HAVE_ASM_USCORE" config.h; then u="_"; else u=""; fi
+       $(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
+       cat kernel_syms.input | grep -v '^#' | sed -n \
+         -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+         -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+         | sort -u >$@
+       rm -f kernel_syms.input
+CLEANFILES += kernel_syms.lst
+
+if COND_emu
+kern/emu/grub_emu-main.$(OBJEXT):grub_emu_init.h
+grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h
+kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h
+grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h
+
+grub_emu_init.h: genemuinitheader.sh $(MOD_FILES)
+       rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(NM) > $@
+CLEANFILES += grub_emu_init.h
+
+grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES)
+       rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
+CLEANFILES += grub_emu_init.c
+endif
diff --git a/grub-core/Makefile.vars b/grub-core/Makefile.vars
new file mode 100644 (file)
index 0000000..710a8fd
--- /dev/null
@@ -0,0 +1,80 @@
+# -*- makefile -*-
+
+# Platform specific options
+if COND_i386_pc
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_efi
+  LDFLAGS_PLATFORM = -melf_i386
+endif
+if COND_x86_64_efi
+  LDFLAGS_PLATFORM = -melf_x86_64
+endif
+if COND_i386_qemu
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_coreboot
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_ieee1275
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_mips_yeeloong
+  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+  CCASFLAGS_PLATFORM = -march=mips3
+endif
+if COND_sparc64_ieee1275
+  CFLAGS_PLATFORM = -mno-app-regs
+  LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
+endif
+
+CPPFLAGS_GRUB = -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
+CPPFLAGS_GRUB += -I$(top_srcdir)/include -I$(top_builddir)/include
+
+CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
+CPPFLAGS_GCRY = -I$(top_srcdir)/lib/libgcrypt_wrap
+
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
+CPPFLAGS_GNULIB = -I$(top_srcdir)/gnulib
+
+CFLAGS_MKISOFS = -Wno-all -Werror
+CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
+
+CFLAGS_POSIX = -fno-builtin
+CPPFLAGS_POSIX = -I$(top_srcdir)/lib/posix_wrap
+
+CPPFLAGS_EFIEMU = -I$(top_srcdir)/efiemu/runtime
+
+grubconfdir = $(sysconfdir)/grub.d
+platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
+
+# to calm down automake
+BUILT_SOURCES =
+CLEANFILES =
+COMMAND_FILES =
+DEF_FILES =
+FS_FILES =
+HANDLER_FILES =
+IMG_FILES =
+MOD_FILES =
+MODULE_FILES =
+PARTMAP_FILES =
+PARTTOOL_FILES =
+TERMINAL_FILES =
+TESTS =
+UND_FILES =
+VIDEO_FILES =
+bin_PROGRAMS =
+bin_SCRIPTS =
+check_PROGRAMS =
+check_SCRIPTS =
+grubconf_DATA =
+grubconf_SCRIPTS =
+man_MANS =
+noinst_DATA =
+noinst_LIBRARIES =
+noinst_PROGRAMS =
+pkglib_SCRIPTS =
+platform_DATA =
+sbin_PROGRAMS =
+sbin_SCRIPTS =
similarity index 100%
rename from bus/bonito.c
rename to grub-core/bus/bonito.c
similarity index 98%
rename from util/pci.c
rename to grub-core/bus/emu/pci.c
index 420ae32..d1beb56 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <grub/pci.h>
 #include <grub/dl.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 
 grub_pci_address_t
similarity index 100%
rename from bus/pci.c
rename to grub-core/bus/pci.c
similarity index 100%
rename from util/usb.c
rename to grub-core/bus/usb/emu/usb.c
similarity index 100%
rename from bus/usb/ohci.c
rename to grub-core/bus/usb/ohci.c
similarity index 100%
rename from bus/usb/uhci.c
rename to grub-core/bus/usb/uhci.c
similarity index 100%
rename from bus/usb/usb.c
rename to grub-core/bus/usb/usb.c
similarity index 100%
rename from bus/usb/usbhub.c
rename to grub-core/bus/usb/usbhub.c
similarity index 100%
rename from commands/acpi.c
rename to grub-core/commands/acpi.c
similarity index 100%
rename from commands/boot.c
rename to grub-core/commands/boot.c
similarity index 100%
rename from commands/cat.c
rename to grub-core/commands/cat.c
similarity index 100%
rename from commands/cmp.c
rename to grub-core/commands/cmp.c
similarity index 100%
rename from commands/crc.c
rename to grub-core/commands/crc.c
similarity index 100%
rename from commands/date.c
rename to grub-core/commands/date.c
similarity index 100%
rename from commands/echo.c
rename to grub-core/commands/echo.c
similarity index 100%
rename from commands/halt.c
rename to grub-core/commands/halt.c
similarity index 100%
rename from commands/help.c
rename to grub-core/commands/help.c
similarity index 100%
rename from commands/iorw.c
rename to grub-core/commands/iorw.c
similarity index 100%
rename from commands/ls.c
rename to grub-core/commands/ls.c
similarity index 100%
rename from commands/lspci.c
rename to grub-core/commands/lspci.c
similarity index 100%
rename from commands/memrw.c
rename to grub-core/commands/memrw.c
similarity index 99%
rename from commands/parttool.c
rename to grub-core/commands/parttool.c
index 528cf43..d38a8a9 100644 (file)
@@ -175,7 +175,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
     }
 
   /* Load modules. */
-#if !GRUB_NO_MODULES
+#if defined(GRUB_MACHINE_EMU)
   {
     const char *prefix;
     prefix = grub_env_get ("prefix");
similarity index 100%
rename from commands/probe.c
rename to grub-core/commands/probe.c
similarity index 100%
rename from commands/read.c
rename to grub-core/commands/read.c
similarity index 100%
rename from commands/sleep.c
rename to grub-core/commands/sleep.c
similarity index 100%
rename from commands/test.c
rename to grub-core/commands/test.c
similarity index 100%
rename from commands/true.c
rename to grub-core/commands/true.c
similarity index 100%
rename from conf/any-emu.rmk
rename to grub-core/conf/any-emu.rmk
similarity index 100%
rename from conf/common.rmk
rename to grub-core/conf/common.rmk
similarity index 100%
rename from conf/i386-pc.rmk
rename to grub-core/conf/i386-pc.rmk
similarity index 100%
rename from conf/i386.rmk
rename to grub-core/conf/i386.rmk
similarity index 100%
rename from conf/mips.rmk
rename to grub-core/conf/mips.rmk
similarity index 100%
rename from conf/tests.rmk
rename to grub-core/conf/tests.rmk
similarity index 100%
rename from conf/x86-efi.rmk
rename to grub-core/conf/x86-efi.rmk
diff --git a/grub-core/configure.ac b/grub-core/configure.ac
new file mode 100644 (file)
index 0000000..ac462ea
--- /dev/null
@@ -0,0 +1,91 @@
+# Process this file with autoconf to produce a configure script.
+
+# Copyright (C) 2010  Free Software Foundation, Inc.
+#
+# This configure.ac is free software; the author
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+dnl This configure script is complicated, because GRUB needs to deal
+dnl with three potentially different types:
+dnl
+dnl   build  -- the environment for building GRUB
+dnl   host   -- the environment for running utilities
+dnl   target -- the environment for running GRUB
+dnl
+dnl In addition, GRUB needs to deal with a platform specification
+dnl which specifies the system running GRUB, such as firmware.
+dnl This is necessary because the target type in autoconf does not
+dnl describe such a system very well.
+dnl
+dnl The current strategy is to build utilities using host
+dnl cross-compiler and grub core and modules using target
+dnl cross-compiler.  For this we use nested packages approach, where
+dnl top-level package grub utilities is built with HOSTCC and nested
+dnl package (in grub-core directory) builds with TARGETCC.
+
+# NOTE: ../configure.ac must also be updated.
+AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
+AC_CONFIG_AUX_DIR([.])
+
+# Checks for host and target systems.
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+AM_INIT_AUTOMAKE()
+AC_PREREQ(2.60)
+AC_CONFIG_SRCDIR([include/grub/dl.h])
+AC_CONFIG_HEADER([config.h])
+
+m4_include([configure.common])
+
+TARGET_CPP="$TARGET_CC -E"
+TARGET_CCAS=$TARGET_CC
+
+CC=$TARGET_CC
+CPP=$TARGET_CC
+CCAS=$TARGET_CC
+
+AC_SUBST(TARGET_CC)
+AC_SUBST(TARGET_CPP)
+AC_SUBST(TARGET_CCAS)
+AC_SUBST(TARGET_IMG_LDSCRIPT)
+AC_SUBST(TARGET_IMG_LDFLAGS)
+AC_SUBST(TARGET_IMG_CFLAGS)
+AC_SUBST(TARGET_OBJ2ELF)
+AC_SUBST(TARGET_MODULE_FORMAT)
+AC_SUBST(OBJCONV)
+AC_SUBST(TARGET_APPLE_CC)
+AC_SUBST(ASFLAGS)
+AC_SUBST(TARGET_CFLAGS)
+AC_SUBST(TARGET_ASFLAGS)
+AC_SUBST(TARGET_LDFLAGS)
+AC_SUBST(TARGET_CPPFLAGS)
+
+# Output files.
+grub_CHECK_LINK_DIR
+if test x"$link_dir" = xyes ; then
+  AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
+  if test "$platform" != emu ; then
+    AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
+  fi
+else
+  mkdir -p include/grub 2>/dev/null
+  rm -rf include/grub/cpu
+  cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
+  if test "$platform" != emu ; then
+    rm -rf include/grub/machine
+    cp -rp $srcdir/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
+  fi
+fi
+
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([po/Makefile])
+AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
+
+AC_OUTPUT
similarity index 100%
rename from disk/ata.c
rename to grub-core/disk/ata.c
similarity index 100%
rename from disk/ata_pthru.c
rename to grub-core/disk/ata_pthru.c
similarity index 100%
rename from disk/host.c
rename to grub-core/disk/host.c
similarity index 100%
rename from disk/loopback.c
rename to grub-core/disk/loopback.c
similarity index 100%
rename from disk/lvm.c
rename to grub-core/disk/lvm.c
similarity index 100%
rename from disk/memdisk.c
rename to grub-core/disk/memdisk.c
similarity index 100%
rename from disk/raid.c
rename to grub-core/disk/raid.c
similarity index 100%
rename from disk/scsi.c
rename to grub-core/disk/scsi.c
similarity index 100%
rename from disk/usbms.c
rename to grub-core/disk/usbms.c
similarity index 100%
rename from efiemu/main.c
rename to grub-core/efiemu/main.c
similarity index 100%
rename from efiemu/mm.c
rename to grub-core/efiemu/mm.c
similarity index 100%
rename from efiemu/pnvram.c
rename to grub-core/efiemu/pnvram.c
similarity index 100%
rename from efiemu/prepare.c
rename to grub-core/efiemu/prepare.c
similarity index 100%
rename from efiemu/symbols.c
rename to grub-core/efiemu/symbols.c
similarity index 100%
rename from font/font.c
rename to grub-core/font/font.c
similarity index 100%
rename from font/font_cmd.c
rename to grub-core/font/font_cmd.c
similarity index 100%
rename from fs/affs.c
rename to grub-core/fs/affs.c
similarity index 100%
rename from fs/afs.c
rename to grub-core/fs/afs.c
similarity index 100%
rename from fs/afs_be.c
rename to grub-core/fs/afs_be.c
similarity index 100%
rename from fs/befs.c
rename to grub-core/fs/befs.c
similarity index 100%
rename from fs/befs_be.c
rename to grub-core/fs/befs_be.c
similarity index 100%
rename from fs/cpio.c
rename to grub-core/fs/cpio.c
similarity index 100%
rename from fs/ext2.c
rename to grub-core/fs/ext2.c
similarity index 100%
rename from fs/fat.c
rename to grub-core/fs/fat.c
similarity index 100%
rename from fs/fshelp.c
rename to grub-core/fs/fshelp.c
similarity index 100%
rename from fs/hfs.c
rename to grub-core/fs/hfs.c
similarity index 100%
rename from fs/hfsplus.c
rename to grub-core/fs/hfsplus.c
similarity index 100%
rename from fs/i386/pc/pxe.c
rename to grub-core/fs/i386/pc/pxe.c
similarity index 100%
rename from fs/iso9660.c
rename to grub-core/fs/iso9660.c
similarity index 100%
rename from fs/jfs.c
rename to grub-core/fs/jfs.c
similarity index 100%
rename from fs/minix.c
rename to grub-core/fs/minix.c
similarity index 100%
rename from fs/nilfs2.c
rename to grub-core/fs/nilfs2.c
similarity index 100%
rename from fs/ntfs.c
rename to grub-core/fs/ntfs.c
similarity index 100%
rename from fs/ntfscomp.c
rename to grub-core/fs/ntfscomp.c
similarity index 100%
rename from fs/reiserfs.c
rename to grub-core/fs/reiserfs.c
similarity index 100%
rename from fs/sfs.c
rename to grub-core/fs/sfs.c
similarity index 100%
rename from fs/tar.c
rename to grub-core/fs/tar.c
similarity index 100%
rename from fs/udf.c
rename to grub-core/fs/udf.c
similarity index 100%
rename from fs/ufs.c
rename to grub-core/fs/ufs.c
similarity index 100%
rename from fs/ufs2.c
rename to grub-core/fs/ufs2.c
similarity index 100%
rename from fs/xfs.c
rename to grub-core/fs/xfs.c
similarity index 100%
rename from gencmdlist.sh
rename to grub-core/gencmdlist.sh
similarity index 100%
rename from gendistlist.sh
rename to grub-core/gendistlist.sh
similarity index 100%
rename from genemuinit.sh
rename to grub-core/genemuinit.sh
similarity index 100%
rename from genfslist.sh
rename to grub-core/genfslist.sh
similarity index 93%
rename from genmoddep.awk
rename to grub-core/genmoddep.awk
index 48419a0..6c92e2f 100644 (file)
@@ -18,15 +18,14 @@ BEGIN {
   }
 }
 
-# The first line contains a module name.
-FNR == 1 {
-  module = $1
-  next
-};
-
 # The rest is undefined symbols.
 {
-  if ($1 in symtab) {
+  module = $2
+
+  # skip if empty
+  if ($1 == "" || $2 == "")
+      ;
+  else if ($1 in symtab) {
     modtab[module] = modtab[module] " " symtab[$1];
   }
   else if ($1 != "__gnu_local_gp") {
similarity index 100%
rename from genmodsrc.sh
rename to grub-core/genmodsrc.sh
similarity index 84%
rename from gensymlist.sh.in
rename to grub-core/gensymlist.sh
index 3c3ddfa..0ab56e9 100644 (file)
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002,2006,2007,2008  Free Software Foundation, Inc.
+# Copyright (C) 2002,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # This gensymlist.sh.in is free software; the author
 # gives unlimited permission to copy and/or distribute it,
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-### The configure script will replace these variables.
-
-: ${srcdir=@srcdir@}
-: ${CC=@TARGET_CC@}
-
-
 cat <<EOF
 /* This file is automatically generated by gensymlist.sh. DO NOT EDIT! */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2006,2007,2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2002,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
  *
  *  GRUB is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,7 +31,6 @@ cat <<EOF
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/symbol.h>
 EOF
 
 for i in $*; do
@@ -60,7 +53,7 @@ cat <<EOF
     {
 EOF
 
-$CC @TARGET_CFLAGS@ -DGRUB_SYMBOL_GENERATOR=1 -E -I. -Iinclude -I"$srcdir/include" $* \
+(while read LINE; do echo $LINE; done) \
   | grep -v '^#' \
   | sed -n \
         -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/      {"\1", \1},/;p;}' \
similarity index 93%
rename from gentrigtables.c
rename to grub-core/gentrigtables.c
index 772cd62..bef2b08 100644 (file)
@@ -24,7 +24,8 @@
 #include <stdio.h>
 
 int
-main ()
+main (int argc __attribute__ ((unused)),
+      char **argv __attribute__ ((unused)))
 {
   int i;
 
similarity index 100%
rename from genvideolist.sh
rename to grub-core/genvideolist.sh
similarity index 100%
rename from gfxmenu/model.c
rename to grub-core/gfxmenu/model.c
similarity index 100%
rename from gfxmenu/view.c
rename to grub-core/gfxmenu/view.c
similarity index 100%
rename from gnulib/alloca.h
rename to grub-core/gnulib/alloca.h
similarity index 100%
rename from gnulib/argp-ba.c
rename to grub-core/gnulib/argp-ba.c
similarity index 100%
rename from gnulib/argp-pv.c
rename to grub-core/gnulib/argp-pv.c
similarity index 100%
rename from gnulib/argp.h
rename to grub-core/gnulib/argp.h
similarity index 100%
rename from gnulib/error.c
rename to grub-core/gnulib/error.c
similarity index 100%
rename from gnulib/error.h
rename to grub-core/gnulib/error.h
similarity index 100%
rename from gnulib/fnmatch.c
rename to grub-core/gnulib/fnmatch.c
similarity index 100%
rename from gnulib/fnmatch.h
rename to grub-core/gnulib/fnmatch.h
similarity index 100%
rename from gnulib/getline.c
rename to grub-core/gnulib/getline.c
similarity index 100%
rename from gnulib/getopt.c
rename to grub-core/gnulib/getopt.c
similarity index 100%
rename from gnulib/getopt.h
rename to grub-core/gnulib/getopt.h
similarity index 100%
rename from gnulib/getopt1.c
rename to grub-core/gnulib/getopt1.c
similarity index 100%
rename from gnulib/gettext.h
rename to grub-core/gnulib/gettext.h
similarity index 100%
rename from gnulib/regcomp.c
rename to grub-core/gnulib/regcomp.c
similarity index 100%
rename from gnulib/regex.c
rename to grub-core/gnulib/regex.c
similarity index 100%
rename from gnulib/regex.h
rename to grub-core/gnulib/regex.h
similarity index 100%
rename from gnulib/regexec.c
rename to grub-core/gnulib/regexec.c
similarity index 100%
rename from hello/hello.c
rename to grub-core/hello/hello.c
similarity index 100%
rename from hook/datehook.c
rename to grub-core/hook/datehook.c
similarity index 100%
rename from util/import_gcry.py
rename to grub-core/import_gcry.py
similarity index 90%
rename from include/grub/dl.h
rename to grub-core/include/grub/dl.h
index cfb7c2f..f98539a 100644 (file)
 #include <grub/types.h>
 #include <grub/elf.h>
 
+/*
+ * Macros GRUB_MOD_INIT and GRUB_MOD_FINI are also used by build rules
+ * to collect module names, so we define them only when they are not
+ * defined already.
+ */
+
+#ifndef GRUB_MOD_INIT
 #define GRUB_MOD_INIT(name)    \
 static void grub_mod_init (grub_dl_t mod __attribute__ ((unused))) __attribute__ ((used)); \
 void grub_##name##_init (void); \
@@ -32,7 +39,9 @@ void \
 grub_##name##_init (void) { grub_mod_init (0); } \
 static void \
 grub_mod_init (grub_dl_t mod __attribute__ ((unused)))
+#endif
 
+#ifndef GRUB_MOD_FINI
 #define GRUB_MOD_FINI(name)    \
 static void grub_mod_fini (void) __attribute__ ((used)); \
 void grub_##name##_fini (void); \
@@ -40,6 +49,7 @@ void \
 grub_##name##_fini (void) { grub_mod_fini (); } \
 static void \
 grub_mod_fini (void)
+#endif
 
 #ifdef APPLE_CC
 #define GRUB_MOD_NAME(name)    \
@@ -91,28 +101,8 @@ grub_dl_t grub_dl_load_core (void *addr, grub_size_t size);
 int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);
 void grub_dl_unload_unneeded (void);
 void grub_dl_unload_all (void);
-#if defined (GRUB_UTIL) || defined (GRUB_TARGET_NO_MODULES)
-#define GRUB_NO_MODULES 1
-#else
-#define GRUB_NO_MODULES 0
-#endif
-#if GRUB_NO_MODULES
-static inline int
-grub_dl_ref (grub_dl_t mod)
-{
-  (void) mod;
-  return 0;
-}
-static inline int
-grub_dl_unref (grub_dl_t mod)
-{
-  (void) mod;
-  return 0;
-}
-#else
 int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
 int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
-#endif
 void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
 grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
 grub_err_t grub_dl_register_symbol (const char *name, void *addr,
@@ -121,7 +111,7 @@ grub_err_t grub_dl_register_symbol (const char *name, void *addr,
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
-#if defined (_mips) && ! GRUB_NO_MODULES
+#if defined (_mips)
 #define GRUB_LINKER_HAVE_INIT 1
 void grub_arch_dl_init_linker (void);
 #endif
similarity index 94%
rename from include/grub/util/getroot.h
rename to grub-core/include/grub/emu/getroot.h
index dff7b4d..04a2805 100644 (file)
@@ -28,6 +28,7 @@ enum grub_dev_abstraction_types {
 char *grub_guess_root_device (const char *dir);
 int grub_util_get_dev_abstraction (const char *os_dev);
 char *grub_util_get_grub_dev (const char *os_dev);
+char *grub_make_system_path_relative_to_its_root (const char *path);
 const char *grub_util_check_block_device (const char *blk_dev);
 const char *grub_util_check_char_device (const char *blk_dev);
 
diff --git a/grub-core/include/grub/emu/misc.h b/grub-core/include/grub/emu/misc.h
new file mode 100644 (file)
index 0000000..29c1d4a
--- /dev/null
@@ -0,0 +1,22 @@
+#ifndef GRUB_EMU_MISC_H
+#define GRUB_EMU_MISC_H 1
+
+#include <grub/symbol.h>
+#include <grub/types.h>
+
+extern int verbosity;
+extern const char *program_name;
+
+void grub_init_all (void);
+void grub_fini_all (void);
+
+void * EXPORT_FUNC(xmalloc) (grub_size_t size);
+void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size);
+char * EXPORT_FUNC(xstrdup) (const char *str);
+char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
+
+void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...);
+void EXPORT_FUNC(grub_util_info) (const char *fmt, ...);
+void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((noreturn));
+
+#endif /* GRUB_EMU_MISC_H */
similarity index 93%
rename from include/grub/test.h
rename to grub-core/include/grub/test.h
index 27591cc..336d3b6 100644 (file)
@@ -72,14 +72,14 @@ void grub_test_nonzero (int cond, const char *file,
 
 /* Macro to define a functional test.  */
 #define GRUB_FUNCTIONAL_TEST(name, funp)       \
-  GRUB_MOD_INIT(functional_test_##funp)                \
+  GRUB_MOD_INIT(name)                          \
   {                                            \
-    grub_test_register (name, funp);           \
+    grub_test_register (#name, funp);          \
   }                                            \
                                                \
-  GRUB_MOD_FINI(functional_test_##funp)                \
+  GRUB_MOD_FINI(name)                          \
   {                                            \
-    grub_test_unregister (name);               \
+    grub_test_unregister (#name);              \
   }
 
 #endif /* ! GRUB_TEST_HEADER */
similarity index 85%
rename from include/grub/util/misc.h
rename to grub-core/include/grub/util/misc.h
index 8b78b92..ed71acd 100644 (file)
 
 #define DEFAULT_DEVICE_MAP     DEFAULT_DIRECTORY "/device.map"
 
-extern char *progname;
-extern int verbosity;
-
-void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...);
-void EXPORT_FUNC(grub_util_info) (const char *fmt, ...);
-void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((noreturn));
-
-void *xmalloc (size_t size);
-void *xrealloc (void *ptr, size_t size);
-char *xstrdup (const char *str);
-
 char *grub_util_get_path (const char *dir, const char *file);
 size_t grub_util_get_fp_size (FILE *fp);
 size_t grub_util_get_image_size (const char *path);
@@ -71,8 +60,6 @@ int asprintf (char **buf, const char *fmt, ...);
 
 #endif
 
-char *xasprintf (const char *fmt, ...);
-
 #ifdef __MINGW32__
 
 #define fseeko fseeko64
similarity index 100%
rename from io/bufio.c
rename to grub-core/io/bufio.c
similarity index 100%
rename from io/gzio.c
rename to grub-core/io/gzio.c
similarity index 100%
rename from kern/command.c
rename to grub-core/kern/command.c
similarity index 100%
rename from kern/corecmd.c
rename to grub-core/kern/corecmd.c
similarity index 100%
rename from kern/device.c
rename to grub-core/kern/device.c
similarity index 100%
rename from kern/disk.c
rename to grub-core/kern/disk.c
similarity index 99%
rename from kern/dl.c
rename to grub-core/kern/dl.c
index 19ee132..12391ce 100644 (file)
--- a/kern/dl.c
@@ -469,12 +469,13 @@ grub_dl_resolve_dependencies (grub_dl_t mod, Elf_Ehdr *e)
   return GRUB_ERR_NONE;
 }
 
-#if !GRUB_NO_MODULES
 int
 grub_dl_ref (grub_dl_t mod)
 {
   grub_dl_dep_t dep;
 
+  if (!mod) return 0;
+
   for (dep = mod->dep; dep; dep = dep->next)
     grub_dl_ref (dep->mod);
 
@@ -486,12 +487,13 @@ grub_dl_unref (grub_dl_t mod)
 {
   grub_dl_dep_t dep;
 
+  if (!mod) return 0;
+
   for (dep = mod->dep; dep; dep = dep->next)
     grub_dl_unref (dep->mod);
 
   return --mod->ref_count;
 }
-#endif
 
 static void
 grub_dl_flush_cache (grub_dl_t mod)
similarity index 100%
rename from kern/efi/efi.c
rename to grub-core/kern/efi/efi.c
similarity index 100%
rename from kern/efi/init.c
rename to grub-core/kern/efi/init.c
similarity index 100%
rename from kern/efi/mm.c
rename to grub-core/kern/efi/mm.c
similarity index 100%
rename from kern/elf.c
rename to grub-core/kern/elf.c
diff --git a/grub-core/kern/emu/cache.S b/grub-core/kern/emu/cache.S
new file mode 100644 (file)
index 0000000..087b2b4
--- /dev/null
@@ -0,0 +1,17 @@
+#ifndef GRUB_MACHINE_EMU
+#error "This source is only meant for grub-emu platform"
+#endif
+
+#if GRUB_CPU_I386
+#elif GRUB_CPU_X86_64
+#elif GRUB_CPU_SPARC64
+#include "../sparc64/cache.S"
+#elif GRUB_CPU_MIPS
+#include "../mips/cache.S"
+#elif GRUB_CPU_MIPSEL
+#include "../mips/cache.S"
+#elif GRUB_CPU_POWERPC
+#include "../powerpc/cache.S"
+#else
+#error "No target cpu type is defined"
+#endif
similarity index 99%
rename from util/console.c
rename to grub-core/kern/emu/console.c
index 382fd7f..f7fbc89 100644 (file)
@@ -27,7 +27,7 @@
 # define A_STANDOUT    0
 #endif /* ! A_STANDOUT */
 
-#include <grub/util/console.h>
+#include <grub/emu/console.h>
 #include <grub/term.h>
 #include <grub/types.h>
 
diff --git a/grub-core/kern/emu/dl.c b/grub-core/kern/emu/dl.c
new file mode 100644 (file)
index 0000000..4266376
--- /dev/null
@@ -0,0 +1,19 @@
+#ifndef GRUB_MACHINE_EMU
+#error "This source is only meant for grub-emu platform"
+#endif
+
+#if GRUB_CPU_I386
+#include "../i386/dl.c"
+#elif GRUB_CPU_X86_64
+#include "../x86_64/dl.c"
+#elif GRUB_CPU_SPARC64
+#include "../sparc64/dl.c"
+#elif GRUB_CPU_MIPS
+#include "../mips/dl.c"
+#elif GRUB_CPU_MIPSEL
+#include "../mips/dl.c"
+#elif GRUB_CPU_POWERPC
+#include "../powerpc/dl.c"
+#else
+#error "No target cpu type is defined"
+#endif
diff --git a/grub-core/kern/emu/dummy/dl.c b/grub-core/kern/emu/dummy/dl.c
new file mode 100644 (file)
index 0000000..8e9fabf
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <grub/dl.h>
+
+grub_err_t
+grub_arch_dl_check_header (void *ehdr)
+{
+  (void) ehdr;
+
+  return GRUB_ERR_BAD_MODULE;
+}
+
+grub_err_t
+grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
+{
+  (void) mod;
+  (void) ehdr;
+
+  return GRUB_ERR_BAD_MODULE;
+}
+
+/* int */
+/* grub_dl_ref (grub_dl_t mod) */
+/* {  */
+/*   (void) mod; */
+/*   return 0; */
+/* } */
+
+/* int */
+/* grub_dl_unref (grub_dl_t mod) */
+/* {  */
+/*   (void) mod; */
+/*   return 0; */
+/* } */
diff --git a/grub-core/kern/emu/dummy/symlist.c b/grub-core/kern/emu/dummy/symlist.c
new file mode 100644 (file)
index 0000000..d1445a3
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GRUB is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <grub/kernel.h>
+#include <grub/emu/misc.h>
+
+void
+grub_register_exported_symbols (void)
+{
+}
similarity index 82%
rename from util/getroot.c
rename to grub-core/kern/emu/getroot.c
index 891bd0f..ba357d8 100644 (file)
 #include <unistd.h>
 #include <string.h>
 #include <dirent.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
 
 #ifdef __CYGWIN__
 # include <sys/fcntl.h>
 #include <hurd/fs.h>
 #endif
 
-#include <grub/util/misc.h>
-#include <grub/util/hostdisk.h>
-#include <grub/util/getroot.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/emu/misc.h>
+#include <grub/emu/hostdisk.h>
+#include <grub/emu/getroot.h>
 
 static void
 strip_extra_slashes (char *dir)
@@ -541,3 +547,100 @@ grub_util_check_char_device (const char *blk_dev)
     return 0;
 }
 
+/* This function never prints trailing slashes (so that its output
+   can be appended a slash unconditionally).  */
+char *
+grub_make_system_path_relative_to_its_root (const char *path)
+{
+  struct stat st;
+  char *p, *buf, *buf2, *buf3;
+  uintptr_t offset = 0;
+  dev_t num;
+  size_t len;
+
+  /* canonicalize.  */
+  p = canonicalize_file_name (path);
+
+  if (p == NULL)
+    grub_util_error ("failed to get canonical path of %s", path);
+
+  len = strlen (p) + 1;
+  buf = xstrdup (p);
+  free (p);
+
+  if (stat (buf, &st) < 0)
+    grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
+
+  buf2 = xstrdup (buf);
+  num = st.st_dev;
+
+  /* This loop sets offset to the number of chars of the root
+     directory we're inspecting.  */
+  while (1)
+    {
+      p = strrchr (buf, '/');
+      if (p == NULL)
+       /* This should never happen.  */
+       grub_util_error ("FIXME: no / in buf. (make_system_path_relative_to_its_root)");
+      if (p != buf)
+       *p = 0;
+      else
+       *++p = 0;
+
+      if (stat (buf, &st) < 0)
+       grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
+
+      /* buf is another filesystem; we found it.  */
+      if (st.st_dev != num)
+       {
+         /* offset == 0 means path given is the mount point.
+            This works around special-casing of "/" in Un*x.  This function never
+            prints trailing slashes (so that its output can be appended a slash
+            unconditionally).  Each slash in is considered a preceding slash, and
+            therefore the root directory is an empty string.  */
+         if (offset == 0)
+           {
+             free (buf);
+             free (buf2);
+             return xstrdup ("");
+           }
+         else
+           break;
+       }
+
+      offset = p - buf;
+      /* offset == 1 means root directory.  */
+      if (offset == 1)
+       {
+         /* Include leading slash.  */
+         offset = 0;
+         break;
+       }
+    }
+  free (buf);
+  buf3 = xstrdup (buf2 + offset);
+  free (buf2);
+
+#ifdef __CYGWIN__
+  if (st.st_dev != (DEV_CYGDRIVE_MAJOR << 16))
+    {
+      /* Reached some mount point not below /cygdrive.
+        GRUB does not know Cygwin's emulated mounts,
+        convert to Win32 path.  */
+      grub_util_info ("Cygwin path = %s\n", buf3);
+      char * temp = get_win32_path (buf3);
+      free (buf3);
+      buf3 = temp;
+    }
+#endif
+
+  /* Remove trailing slashes, return empty string if root directory.  */
+  len = strlen (buf3);
+  while (len > 0 && buf3[len - 1] == '/')
+    {
+      buf3[len - 1] = '\0';
+      len--;
+    }
+
+  return buf3;
+}
similarity index 99%
rename from util/hostdisk.c
rename to grub-core/kern/emu/hostdisk.c
index 8be4874..983f101 100644 (file)
@@ -22,8 +22,8 @@
 #include <grub/msdos_partition.h>
 #include <grub/types.h>
 #include <grub/err.h>
-#include <grub/util/misc.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/misc.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/misc.h>
 #include <grub/i18n.h>
 #include <grub/list.h>
similarity index 100%
rename from util/hostfs.c
rename to grub-core/kern/emu/hostfs.c
diff --git a/grub-core/kern/emu/lite.c b/grub-core/kern/emu/lite.c
new file mode 100644 (file)
index 0000000..1f06e39
--- /dev/null
@@ -0,0 +1,16 @@
+#include <config.h>
+#include <grub/emu/misc.h>
+
+/* grub-emu-lite supports dynamic module loading, so it won't have any
+   embedded modules.  */
+void
+grub_init_all(void)
+{
+  return;
+}
+
+void
+grub_fini_all(void)
+{
+  return;
+}
similarity index 90%
rename from util/grub-emu.c
rename to grub-core/kern/emu/main.c
index 8c53b0a..9083e27 100644 (file)
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <time.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <setjmp.h>
 #include <sys/stat.h>
 #include <getopt.h>
 #include <string.h>
 #include <grub/mm.h>
 #include <grub/setjmp.h>
 #include <grub/fs.h>
-#include <grub/util/hostdisk.h>
-#include <grub/dl.h>
-#include <grub/util/console.h>
+#include <grub/emu/hostdisk.h>
+#include <grub/time.h>
+#include <grub/emu/console.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/kernel.h>
 #include <grub/normal.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 #include <grub/env.h>
 #include <grub/partition.h>
 #include <grub/i18n.h>
 
-#define ENABLE_RELOCATABLE 0
 #include "progname.h"
 
+#define ENABLE_RELOCATABLE 0
+
 /* Used for going back to the main function.  */
 static jmp_buf main_env;
 
@@ -53,25 +58,6 @@ grub_arch_modules_addr (void)
   return 0;
 }
 
-#if GRUB_NO_MODULES
-grub_err_t
-grub_arch_dl_check_header (void *ehdr)
-{
-  (void) ehdr;
-
-  return GRUB_ERR_BAD_MODULE;
-}
-
-grub_err_t
-grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
-{
-  (void) mod;
-  (void) ehdr;
-
-  return GRUB_ERR_BAD_MODULE;
-}
-#endif
-
 void
 grub_reboot (void)
 {
@@ -150,10 +136,6 @@ void grub_hostfs_init (void);
 void grub_hostfs_fini (void);
 void grub_host_init (void);
 void grub_host_fini (void);
-#if GRUB_NO_MODULES
-void grub_init_all (void);
-void grub_fini_all (void);
-#endif
 
 int
 main (int argc, char *argv[])
@@ -219,9 +201,8 @@ main (int argc, char *argv[])
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
 
-#if GRUB_NO_MODULES
+  /* Initialize all embedded modules.  */
   grub_init_all ();
-#endif
 
   /* Make sure that there is a root device.  */
   if (! root_dev)
@@ -242,7 +223,7 @@ main (int argc, char *argv[])
   if (strcmp (root_dev, "host") == 0)
     dir = xstrdup (dir);
   else
-    dir = make_system_path_relative_to_its_root (dir);
+    dir = grub_make_system_path_relative_to_its_root (dir);
   prefix = xmalloc (strlen (root_dev) + 2 + strlen (dir) + 1);
   sprintf (prefix, "(%s)%s", root_dev, dir);
   free (dir);
@@ -251,9 +232,7 @@ main (int argc, char *argv[])
   if (setjmp (main_env) == 0)
     grub_main ();
 
-#if GRUB_NO_MODULES
   grub_fini_all ();
-#endif
   grub_hostfs_fini ();
   grub_host_fini ();
 
@@ -261,3 +240,25 @@ main (int argc, char *argv[])
 
   return 0;
 }
+
+#ifdef __MINGW32__
+
+void
+grub_millisleep (grub_uint32_t ms)
+{
+  Sleep (ms);
+}
+
+#else
+
+void
+grub_millisleep (grub_uint32_t ms)
+{
+  struct timespec ts;
+
+  ts.tv_sec = ms / 1000;
+  ts.tv_nsec = (ms % 1000) * 1000000;
+  nanosleep (&ts, NULL);
+}
+
+#endif
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
new file mode 100644 (file)
index 0000000..d8dfc93
--- /dev/null
@@ -0,0 +1,199 @@
+#include <config.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/env.h>
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/i18n.h>
+#include <grub/time.h>
+#include <grub/emu/misc.h>
+
+int verbosity;
+
+void
+grub_util_warn (const char *fmt, ...)
+{
+  va_list ap;
+
+  fprintf (stderr, _("%s: warn:"), program_name);
+  fprintf (stderr, " ");
+  va_start (ap, fmt);
+  vfprintf (stderr, fmt, ap);
+  va_end (ap);
+  fprintf (stderr, ".\n");
+  fflush (stderr);
+}
+
+void
+grub_util_info (const char *fmt, ...)
+{
+  if (verbosity > 0)
+    {
+      va_list ap;
+
+      fprintf (stderr, _("%s: info:"), program_name);
+      fprintf (stderr, " ");
+      va_start (ap, fmt);
+      vfprintf (stderr, fmt, ap);
+      va_end (ap);
+      fprintf (stderr, ".\n");
+      fflush (stderr);
+    }
+}
+
+void
+grub_util_error (const char *fmt, ...)
+{
+  va_list ap;
+
+  fprintf (stderr, _("%s: error:"), program_name);
+  fprintf (stderr, " ");
+  va_start (ap, fmt);
+  vfprintf (stderr, fmt, ap);
+  va_end (ap);
+  fprintf (stderr, ".\n");
+  exit (1);
+}
+
+void *
+grub_malloc (grub_size_t size)
+{
+  return malloc (size);
+}
+
+void *
+grub_zalloc (grub_size_t size)
+{
+  void *ret;
+
+  ret = malloc (size);
+  memset (ret, 0, size);
+  return ret;
+}
+
+void
+grub_free (void *ptr)
+{
+  free (ptr);
+}
+
+void *
+grub_realloc (void *ptr, grub_size_t size)
+{
+  return realloc (ptr, size);
+}
+
+void *
+grub_memalign (grub_size_t align, grub_size_t size)
+{
+  void *p;
+
+#if defined(HAVE_POSIX_MEMALIGN)
+  if (align < sizeof (void *))
+    align = sizeof (void *);
+
+  else if (align % sizeof (void *))
+    grub_fatal ("bad alignment");
+
+  if (posix_memalign (&p, align, size) != 0)
+    p = 0;
+#elif defined(HAVE_MEMALIGN)
+  p = memalign (align, size);
+#else
+  (void) align;
+  (void) size;
+  grub_fatal ("grub_memalign is not supported");
+#endif
+
+  if (! p)
+    grub_fatal ("out of memory");
+
+  return p;
+}
+
+void *
+xmalloc (grub_size_t size)
+{
+  void *p;
+
+  p = grub_malloc (size);
+  if (! p)
+    grub_fatal ("out of memory");
+
+  return p;
+}
+
+void *
+xrealloc (void *ptr, grub_size_t size)
+{
+  ptr = grub_realloc (ptr, size);
+  if (! ptr)
+    grub_fatal ("out of memory");
+
+  return ptr;
+}
+
+char *
+xstrdup (const char *str)
+{
+  size_t len;
+  char *newstr;
+
+  len = grub_strlen (str);
+  newstr = (char *) xmalloc (len + 1);
+  grub_memcpy (newstr, str, len + 1);
+
+  return newstr;
+}
+
+char *
+xasprintf (const char *fmt, ...)
+{ 
+  va_list ap;
+  char *result;
+  
+  va_start (ap, fmt);
+  if (vasprintf (&result, fmt, ap) < 0)
+    { 
+      if (errno == ENOMEM)
+        grub_util_error ("out of memory");
+      return NULL;
+    }
+  
+  return result;
+}
+
+void
+grub_exit (void)
+{
+  exit (1);
+}
+
+grub_uint64_t
+grub_get_time_ms (void)
+{
+  struct timeval tv;
+
+  gettimeofday (&tv, 0);
+
+  return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
+}
+
+grub_uint32_t
+grub_get_rtc (void)
+{
+  struct timeval tv;
+
+  gettimeofday (&tv, 0);
+
+  return (tv.tv_sec * GRUB_TICKS_PER_SECOND
+         + (((tv.tv_sec % GRUB_TICKS_PER_SECOND) * 1000000 + tv.tv_usec)
+            * GRUB_TICKS_PER_SECOND / 1000000));
+}
similarity index 100%
rename from util/time.c
rename to grub-core/kern/emu/time.c
similarity index 100%
rename from kern/env.c
rename to grub-core/kern/env.c
similarity index 100%
rename from kern/err.c
rename to grub-core/kern/err.c
similarity index 100%
rename from kern/file.c
rename to grub-core/kern/file.c
similarity index 100%
rename from kern/fs.c
rename to grub-core/kern/fs.c
similarity index 100%
rename from kern/handler.c
rename to grub-core/kern/handler.c
similarity index 100%
rename from kern/i386/dl.c
rename to grub-core/kern/i386/dl.c
similarity index 100%
rename from kern/i386/halt.c
rename to grub-core/kern/i386/halt.c
similarity index 100%
rename from kern/i386/misc.S
rename to grub-core/kern/i386/misc.S
similarity index 100%
rename from kern/i386/pit.c
rename to grub-core/kern/i386/pit.c
similarity index 100%
rename from kern/i386/tsc.c
rename to grub-core/kern/i386/tsc.c
similarity index 100%
rename from kern/list.c
rename to grub-core/kern/list.c
similarity index 100%
rename from kern/main.c
rename to grub-core/kern/main.c
similarity index 100%
rename from kern/mips/dl.c
rename to grub-core/kern/mips/dl.c
similarity index 100%
rename from kern/mips/init.c
rename to grub-core/kern/mips/init.c
similarity index 100%
rename from kern/misc.c
rename to grub-core/kern/misc.c
similarity index 100%
rename from kern/mm.c
rename to grub-core/kern/mm.c
similarity index 100%
rename from kern/parser.c
rename to grub-core/kern/parser.c
similarity index 100%
rename from kern/partition.c
rename to grub-core/kern/partition.c
similarity index 100%
rename from kern/term.c
rename to grub-core/kern/term.c
similarity index 100%
rename from kern/time.c
rename to grub-core/kern/time.c
similarity index 100%
rename from kern/x86_64/dl.c
rename to grub-core/kern/x86_64/dl.c
similarity index 100%
rename from lib/LzFind.c
rename to grub-core/lib/LzFind.c
similarity index 100%
rename from lib/LzmaDec.c
rename to grub-core/lib/LzmaDec.c
similarity index 100%
rename from lib/LzmaEnc.c
rename to grub-core/lib/LzmaEnc.c
similarity index 100%
rename from lib/arg.c
rename to grub-core/lib/arg.c
similarity index 100%
rename from lib/charset.c
rename to grub-core/lib/charset.c
similarity index 100%
rename from lib/crc.c
rename to grub-core/lib/crc.c
similarity index 100%
rename from lib/crypto.c
rename to grub-core/lib/crypto.c
similarity index 100%
rename from lib/envblk.c
rename to grub-core/lib/envblk.c
similarity index 100%
rename from lib/hexdump.c
rename to grub-core/lib/hexdump.c
similarity index 100%
rename from lib/pbkdf2.c
rename to grub-core/lib/pbkdf2.c
similarity index 98%
rename from lib/posix_wrap/stdlib.h
rename to grub-core/lib/posix_wrap/stdlib.h
index 5ef6159..4c725f6 100644 (file)
@@ -20,6 +20,7 @@
 #define GRUB_POSIX_STDLIB_H    1
 
 #include <grub/mm.h>
+#include <grub/misc.h>
 
 static inline void 
 free (void *ptr)
similarity index 97%
rename from lib/posix_wrap/string.h
rename to grub-core/lib/posix_wrap/string.h
index 7bb6f1e..4224836 100644 (file)
@@ -19,6 +19,8 @@
 #ifndef GRUB_POSIX_STRING_H
 #define GRUB_POSIX_STRING_H    1
 
+#include <grub/misc.h>
+
 static inline grub_size_t
 strlen (const char *s)
 {
similarity index 100%
rename from lib/relocator.c
rename to grub-core/lib/relocator.c
similarity index 100%
rename from loader/aout.c
rename to grub-core/loader/aout.c
similarity index 100%
rename from loader/macho.c
rename to grub-core/loader/macho.c
similarity index 100%
rename from loader/macho32.c
rename to grub-core/loader/macho32.c
similarity index 100%
rename from loader/macho64.c
rename to grub-core/loader/macho64.c
similarity index 100%
rename from loader/machoXX.c
rename to grub-core/loader/machoXX.c
similarity index 100%
rename from loader/xnu.c
rename to grub-core/loader/xnu.c
similarity index 100%
rename from mmap/efi/mmap.c
rename to grub-core/mmap/efi/mmap.c
similarity index 100%
rename from mmap/i386/mmap.c
rename to grub-core/mmap/i386/mmap.c
similarity index 100%
rename from mmap/mmap.c
rename to grub-core/mmap/mmap.c
diff --git a/grub-core/modules.def b/grub-core/modules.def
new file mode 100644 (file)
index 0000000..ae3ede5
--- /dev/null
@@ -0,0 +1,1592 @@
+AutoGen definitions Makefile.tpl;
+
+kernel = {
+  name = kernel;
+
+  emu_ldflags              = '-Wl,-r';
+  x86_efi_ldflags          = '-Wl,-r';
+  i386_pc_ldflags          = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_coreboot_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_qemu_ldflags        = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_ieee1275_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  mips_yeeloong_ldflags    = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  powerpc_ieee1275_ldflags = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+
+  mips_yeeloong_cppflags = '-DUSE_ASCII_FAILBACK';
+  i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+  i386_qemu_ccasflags    = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+
+  mips_ldadd = '-lgcc';
+  powerpc_ldadd = '-lgcc';
+  sparc64_ldadd = '-lgcc';
+
+  nonemu_nodist = symlist.c;
+
+  shared = kern/command.c;
+  shared = kern/corecmd.c;
+  shared = kern/device.c;
+  shared = kern/disk.c;
+  shared = kern/dl.c;
+  shared = kern/env.c;
+  shared = kern/err.c;
+  shared = kern/file.c;
+  shared = kern/fs.c;
+  shared = kern/handler.c;
+  shared = kern/list.c;
+  shared = kern/main.c;
+  shared = kern/misc.c;
+  shared = kern/parser.c;
+  shared = kern/partition.c;
+  shared = kern/rescue_parser.c;
+  shared = kern/rescue_reader.c;
+  shared = kern/term.c;
+
+  i386_pc = kern/i386/pc/startup.S;
+  i386_pc = kern/i386/misc.S;
+  i386_pc = kern/mm.c;
+  i386_pc = kern/time.c;
+  i386_pc = kern/i386/dl.c;
+  i386_pc = kern/i386/pc/init.c;
+  i386_pc = kern/i386/pc/mmap.c;
+  i386_pc = kern/i386/tsc.c;
+  i386_pc = kern/i386/pit.c;
+  i386_pc = kern/generic/rtc_get_time_ms.c;
+  i386_pc = kern/generic/millisleep.c;
+  i386_pc = term/i386/pc/console.c;
+  i386_pc = term/i386/vga_common.c;
+
+  i386_efi = kern/i386/efi/startup.S;
+  i386_efi = kern/mm.c;
+  i386_efi = kern/i386/dl.c;
+  i386_efi = kern/i386/efi/init.c;
+  i386_efi = kern/efi/efi.c;
+  i386_efi = kern/efi/init.c;
+  i386_efi = kern/efi/mm.c;
+  i386_efi = kern/time.c;
+  i386_efi = kern/i386/tsc.c;
+  i386_efi = kern/i386/pit.c;
+  i386_efi = kern/generic/rtc_get_time_ms.c;
+  i386_efi = kern/generic/millisleep.c;
+  i386_efi = term/efi/console.c;
+  i386_efi = disk/efi/efidisk.c;
+
+  i386_coreboot = kern/i386/coreboot/startup.S;
+  i386_coreboot = kern/i386/misc.S;
+  i386_coreboot = kern/i386/coreboot/init.c;
+  i386_coreboot = kern/i386/coreboot/mmap.c;
+  i386_coreboot = kern/i386/halt.c;
+  i386_coreboot = kern/mm.c;
+  i386_coreboot = kern/time.c;
+  i386_coreboot = kern/i386/dl.c;
+  i386_coreboot = kern/i386/tsc.c;
+  i386_coreboot = kern/i386/pit.c;
+  i386_coreboot = kern/generic/rtc_get_time_ms.c;
+  i386_coreboot = kern/generic/millisleep.c;
+  i386_coreboot = term/i386/pc/vga_text.c;
+  i386_coreboot = term/i386/vga_common.c;
+
+  i386_qemu = kern/i386/qemu/startup.S;
+  i386_qemu = kern/i386/misc.S;
+  i386_qemu = kern/i386/coreboot/init.c;
+  i386_qemu = kern/i386/qemu/mmap.c;
+  i386_qemu = kern/i386/halt.c;
+  i386_qemu = kern/mm.c;
+  i386_qemu = kern/time.c;
+  i386_qemu = kern/i386/dl.c;
+  i386_qemu = kern/i386/tsc.c;
+  i386_qemu = kern/i386/pit.c;
+  i386_qemu = kern/generic/rtc_get_time_ms.c;
+  i386_qemu = kern/generic/millisleep.c;
+  i386_qemu = term/i386/pc/vga_text.c;
+  i386_qemu = term/i386/vga_common.c;
+
+  i386_ieee1275 = kern/i386/ieee1275/startup.S;
+  i386_ieee1275 = kern/i386/misc.S;
+  i386_ieee1275 = kern/i386/ieee1275/init.c;
+  i386_ieee1275 = kern/ieee1275/init.c;
+  i386_ieee1275 = kern/ieee1275/mmap.c;
+  i386_ieee1275 = kern/ieee1275/cmain.c;
+  i386_ieee1275 = kern/ieee1275/openfw.c;
+  i386_ieee1275 = kern/mm.c;
+  i386_ieee1275 = kern/i386/dl.c;
+  i386_ieee1275 = kern/time.c;
+  i386_ieee1275 = kern/generic/millisleep.c;
+  i386_ieee1275 = kern/ieee1275/ieee1275.c;
+  i386_ieee1275 = term/ieee1275/ofconsole.c;
+  i386_ieee1275 = disk/ieee1275/ofdisk.c;
+
+  x86_64_efi = kern/x86_64/efi/startup.S;
+  x86_64_efi = kern/x86_64/efi/callwrap.S;
+  x86_64_efi = kern/mm.c;
+  x86_64_efi = kern/x86_64/dl.c;
+  x86_64_efi = kern/i386/efi/init.c;
+  x86_64_efi = kern/efi/efi.c;
+  x86_64_efi = kern/efi/init.c;
+  x86_64_efi = kern/efi/mm.c;
+  x86_64_efi = kern/time.c;
+  x86_64_efi = kern/i386/tsc.c;
+  x86_64_efi = kern/i386/pit.c;
+  x86_64_efi = kern/generic/millisleep.c;
+  x86_64_efi = kern/generic/rtc_get_time_ms.c;
+  x86_64_efi = term/efi/console.c;
+  x86_64_efi = disk/efi/efidisk.c;
+
+  mips_yeeloong = kern/mips/startup.S;
+  mips_yeeloong = kern/mips/init.c;
+  mips_yeeloong = kern/mips/yeeloong/init.c;
+  mips_yeeloong = kern/mm.c;
+  mips_yeeloong = kern/mips/dl.c;
+  mips_yeeloong = kern/generic/millisleep.c;
+  mips_yeeloong = kern/generic/rtc_get_time_ms.c;
+  mips_yeeloong = kern/time.c;
+  mips_yeeloong = kern/mips/cache.S;
+  mips_yeeloong = io/bufio.c;
+  mips_yeeloong = lib/arg.c;
+  mips_yeeloong = commands/extcmd.c;
+  mips_yeeloong = bus/pci.c;
+  mips_yeeloong = bus/bonito.c;
+  mips_yeeloong = font/font_cmd.c;
+  mips_yeeloong = font/font.c;
+  mips_yeeloong = term/at_keyboard.c;
+  mips_yeeloong = term/gfxterm.c;
+  mips_yeeloong = video/video.c;
+  mips_yeeloong = video/fb/video_fb.c;
+  mips_yeeloong = video/fb/fbblit.c;
+  mips_yeeloong = video/fb/fbfill.c;
+  mips_yeeloong = video/fb/fbutil.c;
+  mips_yeeloong = video/bitmap.c;
+  mips_yeeloong = video/bitmap_scale.c;
+  mips_yeeloong = video/sm712.c;
+
+  powerpc_ieee1275 = kern/powerpc/ieee1275/startup.S;
+  powerpc_ieee1275 = kern/ieee1275/cmain.c;
+  powerpc_ieee1275 = kern/ieee1275/ieee1275.c;
+  powerpc_ieee1275 = kern/mm.c;
+  powerpc_ieee1275 = kern/ieee1275/init.c;
+  powerpc_ieee1275 = kern/ieee1275/mmap.c;
+  powerpc_ieee1275 = kern/ieee1275/openfw.c;
+  powerpc_ieee1275 = kern/powerpc/dl.c;
+  powerpc_ieee1275 = kern/generic/millisleep.c;
+  powerpc_ieee1275 = kern/time.c;
+  powerpc_ieee1275 = kern/powerpc/cache.S;
+  powerpc_ieee1275 = term/ieee1275/ofconsole.c;
+  powerpc_ieee1275 = disk/ieee1275/ofdisk.c;
+
+  sparc64_ieee1275 = kern/sparc64/ieee1275/crt0.S;
+  sparc64_ieee1275 = kern/ieee1275/cmain.c;
+  sparc64_ieee1275 = kern/ieee1275/ieee1275.c;
+  sparc64_ieee1275 = kern/mm.c;
+  sparc64_ieee1275 = kern/sparc64/ieee1275/ieee1275.c;
+  sparc64_ieee1275 = kern/sparc64/ieee1275/init.c;
+  sparc64_ieee1275 = kern/ieee1275/mmap.c;
+  sparc64_ieee1275 = kern/ieee1275/openfw.c;
+  sparc64_ieee1275 = kern/sparc64/dl.c;
+  sparc64_ieee1275 = kern/generic/millisleep.c;
+  sparc64_ieee1275 = kern/time.c;
+  sparc64_ieee1275 = kern/sparc64/cache.S;
+  sparc64_ieee1275 = disk/ieee1275/ofdisk.c;
+  sparc64_ieee1275 = term/ieee1275/ofconsole.c;
+
+  emu = kern/emu/misc.c;
+  emu = kern/emu/getroot.c;
+  emu = kern/emu/time.c;
+  emu = kern/emu/hostdisk.c;
+  emu = kern/emu/hostfs.c;
+  emu = kern/emu/console.c;
+  emu = disk/host.c;
+
+  image_nostrip = { emu; };
+  image_strip_keep_kernel = { i386_efi; x86_64_efi; };
+  image_strip = { powerpc_ieee1275; i386_coreboot; i386_ieee1275; };
+  image_strip_macho2img = { mips_yeeloong; i386_pc; i386_qemu; sparc64_ieee1275; };
+};
+
+program = {
+  name = grub-emu;
+  mansection = 1;
+
+  source = kern/emu/main.c;
+  source = kern/emu/dummy/dl.c;
+  source = kern/emu/dummy/symlist.c;
+  source = gnulib/progname.c;
+
+  nodist = grub_emu_init.c;
+
+  cflags = '$(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_GNULIB)';
+
+  ldadd = kernel.exec;
+  ldadd = '$(MODULE_FILES)';
+  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
+
+  emu;
+};
+
+program = {
+  name = grub-emu-lite;
+
+  source = kern/emu/main.c;
+  source = kern/emu/lite.c;
+  source = kern/emu/dl.c;
+  source = kern/emu/cache.S;
+  source = gnulib/progname.c;
+  nodist = symlist.c;
+
+  cflags = '$(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_GNULIB)';
+
+  ldadd = kernel.exec;
+  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
+
+  emu;
+};
+
+module = {
+  name = trig;
+  nodist = trigtables.c;
+  common;
+};
+
+image = {
+  name = boot;
+  i386_pc = boot/i386/pc/boot.S;
+  i386_pc_ldflags = "-Wl,-Ttext=0x7C00";
+
+  i386_qemu = boot/i386/qemu/boot.S;
+  i386_qemu_ldflags = '-Wl,-Ttext,$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+  i386_qemu_ccasflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+
+  sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S;
+  sparc64_ieee1275_format = a.out-sunos-big;
+  sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x4000';
+};
+
+image = {
+  name = cdboot;
+  source = boot/i386/pc/cdboot.S;
+  ldflags = "-Wl,-Ttext=0x7C00";
+
+  i386_pc;
+};
+
+image = {
+  name = pxeboot;
+  source = boot/i386/pc/pxeboot.S;
+  ldflags = '-Wl,-Ttext=0x7C00';
+
+  i386_pc;
+};
+
+image = {
+  name = diskboot;
+  i386_pc = boot/i386/pc/diskboot.S;
+  i386_pc_ldflags = '-Wl,-Ttext=0x8000';
+
+  sparc64_ieee1275 = boot/sparc64/ieee1275/diskboot.S;
+  sparc64_ieee1275_ldflags = '-Wl,-Ttext=0x4200';
+};
+
+image = {
+  name = lnxboot;
+  source = boot/i386/pc/lnxboot.S;
+  ldflags = '-Wl,-Ttext=0x6000';
+
+  i386_pc;
+};
+
+module = {
+  name = libusb;
+  source = bus/usb/emu/usb.c;
+  emu;
+  enable = COND_GRUB_EMU_USB;
+};
+
+module = {
+  name = pci;
+  source = bus/emu/pci.c;
+  source = commands/lspci.c;
+  emu;
+  enable = COND_GRUB_EMU_PCI;
+};
+
+module = {
+  name = usb;
+  source = bus/usb/usb.c;
+  source = bus/usb/usbtrans.c;
+  source = bus/usb/usbhub.c;
+  i386;
+};
+
+module = {
+  name = usb;
+  source = bus/usb/usb.c;
+  emu;
+  enable = COND_GRUB_EMU_USB;
+};
+
+module = {
+  name = uhci;
+  source = bus/usb/uhci.c;
+  x86;
+};
+
+module = {
+  name = ohci;
+  source = bus/usb/ohci.c;
+  x86;
+};
+
+module = {
+  name = pci;
+  source = bus/pci.c;
+  x86;
+};
+
+library = {
+  name = libgnulib.a;
+  source = gnulib/regex.c;
+  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+  common;
+};
+
+module = {
+  name = iorw;
+  source = commands/iorw.c;
+  i386;
+};
+
+module = {
+  name = regexp;
+  source = commands/regexp.c;
+  ldadd = libgnulib.a;
+  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+  common;
+};
+
+module = {
+  name = acpi;
+
+  x86_efi = commands/acpi.c;
+  x86_efi = commands/efi/acpi.c;
+
+  i386_pc = commands/acpi.c;
+  i386_pc = commands/i386/pc/acpi.c;
+};
+
+module = {
+  common;
+  name = blocklist;
+  source = commands/blocklist.c;
+};
+
+module = {
+  common;
+  name = boot;
+  source = commands/boot.c;
+
+  i386_pc = commands/boot.c;
+  i386_pc = lib/i386/pc/biosnum.c;
+};
+
+module = {
+  common;
+  name = cat;
+  source = commands/cat.c;
+};
+
+module = {
+  common;
+  name = cmp;
+  source = commands/cmp.c;
+};
+
+module = {
+  common;
+  name = configfile;
+  source = commands/configfile.c;
+};
+
+module = {
+  name = cpuid;
+  source = commands/i386/cpuid.c;
+
+  x86;
+};
+
+module = {
+  common;
+  name = crc;
+  source = commands/crc.c;
+  source = lib/crc.c;
+};
+
+module = {
+  common;
+  name = date;
+  source = commands/date.c;
+
+  x86;
+  mips;
+};
+
+module = {
+  name = drivemap;
+
+  i386_pc = commands/i386/pc/drivemap.c;
+  i386_pc = commands/i386/pc/drivemap_int13h.S;
+};
+
+module = {
+  common;
+  name = echo;
+  source = commands/echo.c;
+};
+
+module = {
+  common;
+  name = extcmd;
+  source = commands/extcmd.c;
+  source = lib/arg.c;
+};
+
+module = {
+  name = fixvideo;
+  x86_efi = commands/efi/fixvideo.c;
+};
+
+module = {
+  common;
+  name = gptsync;
+  source = commands/gptsync.c;
+};
+
+module = {
+  name = halt;
+  source = commands/halt.c;
+
+  i386_pc = commands/i386/pc/halt.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  common;
+  name = handler;
+  source = commands/handler.c;
+};
+
+module = {
+  common;
+  name = hashsum;
+  source = commands/hashsum.c;
+};
+
+module = {
+  name = hdparm;
+  source = commands/hdparm.c;
+  source = lib/hexdump.c;
+
+  i386_pc;
+};
+
+module = {
+  common;
+  name = help;
+  source = commands/help.c;
+};
+
+module = {
+  common;
+  name = hexdump;
+  source = commands/hexdump.c;
+  source = lib/hexdump.c;
+};
+
+module = {
+  common;
+  name = keystatus;
+  source = commands/keystatus.c;
+};
+
+module = {
+  name = loadbios;
+  x86_efi = commands/efi/loadbios.c;
+};
+
+module = {
+  common;
+  name = loadenv;
+  source = commands/loadenv.c;
+  source = lib/envblk.c;
+};
+
+module = {
+  common;
+  name = ls;
+  source = commands/ls.c;
+};
+
+module = {
+  common;
+  name = lsmmap;
+  source = commands/lsmmap.c;
+
+  i386_pc;
+  i386_qemu;
+  i386_coreboot;
+  i386_ieee1275;
+  mips_yeeloong;
+  powerpc_ieee1275;
+};
+
+module = {
+  name = lspci;
+  source = commands/lspci.c;
+
+  x86;
+  mips;
+};
+
+module = {
+  common;
+  name = memrw;
+  source = commands/memrw.c;
+};
+
+module = {
+  common;
+  name = minicmd;
+  source = commands/minicmd.c;
+};
+
+module = {
+  common;
+  name = parttool;
+  source = commands/parttool.c;
+};
+
+module = {
+  common;
+  name = password;
+  source = commands/password.c;
+};
+
+module = {
+  common;
+  name = password_pbkdf2;
+  source = commands/password_pbkdf2.c;
+};
+
+module = {
+  name = play;
+  source = commands/i386/pc/play.c;
+  i386;
+};
+
+module = {
+  common;
+  name = probe;
+  source = commands/probe.c;
+};
+
+module = {
+  name = pxecmd;
+  i386_pc = commands/i386/pc/pxecmd.c;
+};
+
+module = {
+  common;
+  name = read;
+  source = commands/read.c;
+};
+
+module = {
+  common;
+  name = reboot;
+  source = commands/reboot.c;
+
+  x86; powerpc; sparc64;
+};
+
+module = {
+  common;
+  name = search;
+  source = commands/search_wrap.c;
+};
+
+module = {
+  common;
+  name = search_fs_file;
+  source = commands/search_file.c;
+};
+
+module = {
+  common;
+  name = search_fs_uuid;
+  source = commands/search_uuid.c;
+};
+
+module = {
+  common;
+  name = search_label;
+  source = commands/search_label.c;
+};
+
+module = {
+  name = setpci;
+  source = commands/setpci.c;
+
+  x86;
+};
+
+module = {
+  common;
+  name = sleep;
+  source = commands/sleep.c;
+};
+
+module = {
+  name = suspend;
+  source = commands/ieee1275/suspend.c;
+  i386_ieee1275;
+  powerpc_ieee1275;
+};
+
+module = {
+  common;
+  name = terminal;
+  source = commands/terminal.c;
+};
+
+module = {
+  common;
+  name = test;
+  source = commands/test.c;
+};
+
+module = {
+  common;
+  name = true;
+  source = commands/true.c;
+};
+
+module = {
+  name = usbtest;
+  source = commands/usbtest.c;
+  i386_pc;
+};
+
+module = {
+  name = usbtest;
+  source = commands/usbtest.c;
+  emu;
+  enable = COND_GRUB_EMU_USB;
+};
+
+module = {
+  name = vbeinfo;
+  i386_pc = commands/i386/pc/vbeinfo.c;
+};
+
+module = {
+  name = vbetest;
+  i386_pc = commands/i386/pc/vbetest.c;
+};
+
+module = {
+  common;
+  name = videotest;
+  source = commands/videotest.c;
+};
+
+module = {
+  common;
+  name = xnu_uuid;
+  source = commands/xnu_uuid.c;
+};
+
+module = {
+  common;
+  name = dm_nv;
+  source = disk/dmraid_nvidia.c;
+};
+
+module = {
+  common;
+  name = loopback;
+  source = disk/loopback.c;
+};
+
+module = {
+  common;
+  name = lvm;
+  source = disk/lvm.c;
+};
+
+module = {
+  common;
+  name = mdraid;
+  source = disk/mdraid_linux.c;
+};
+
+module = {
+  common;
+  name = raid;
+  source = disk/raid.c;
+};
+
+module = {
+  common;
+  name = raid5rec;
+  source = disk/raid5_recover.c;
+};
+
+module = {
+  common;
+  name = raid6rec;
+  source = disk/raid6_recover.c;
+};
+
+module = {
+  common;
+  name = scsi;
+  source = disk/scsi.c;
+};
+
+module = {
+  common;
+  name = memdisk;
+  source = disk/memdisk.c;
+};
+
+module = {
+  name = ata;
+  source = disk/ata.c;
+
+  x86;
+  mips;
+};
+
+module = {
+  name = ata_pthru;
+  source = disk/ata_pthru.c;
+
+  x86;
+  mips_yeeloong;
+};
+
+module = {
+  name = biosdisk;
+  i386_pc = disk/i386/pc/biosdisk.c;
+};
+
+module = {
+  name = usbms;
+  source = disk/usbms.c;
+  i386_pc;
+};
+
+module = {
+  name = usbms;
+  source = disk/usbms.c;
+  emu;
+  enable = COND_GRUB_EMU_USB;
+};
+
+module = {
+  name = nand;
+  source = disk/ieee1275/nand.c;
+
+  i386_ieee1275;
+};
+
+module = {
+  name = efiemu;
+  i386_pc = efiemu/main.c;
+  i386_pc = efiemu/i386/loadcore32.c;
+  i386_pc = efiemu/i386/loadcore64.c;
+  i386_pc = efiemu/i386/pc/cfgtables.c;
+  i386_pc = efiemu/mm.c;
+  i386_pc = efiemu/loadcore_common.c;
+  i386_pc = efiemu/symbols.c;
+  i386_pc = efiemu/loadcore32.c;
+  i386_pc = efiemu/loadcore64.c;
+  i386_pc = efiemu/prepare32.c;
+  i386_pc = efiemu/prepare64.c;
+  i386_pc = efiemu/pnvram.c;
+  i386_pc = efiemu/i386/coredetect.c;
+};
+
+module = {
+  name = font;
+  source = font/font.c;
+  source = font/font_cmd.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  common;
+  name = affs;
+  source = fs/affs.c;
+};
+
+module = {
+  common;
+  name = afs;
+  source = fs/afs.c;
+};
+
+module = {
+  common;
+  name = afs_be;
+  source = fs/afs_be.c;
+};
+
+module = {
+  common;
+  name = befs;
+  source = fs/befs.c;
+};
+
+module = {
+  common;
+  name = befs_be;
+  source = fs/befs_be.c;
+};
+
+module = {
+  common;
+  name = cpio;
+  source = fs/cpio.c;
+};
+
+module = {
+  common;
+  name = ext2;
+  source = fs/ext2.c;
+};
+
+module = {
+  common;
+  name = fat;
+  source = fs/fat.c;
+};
+
+module = {
+  common;
+  name = fshelp;
+  source = fs/fshelp.c;
+};
+
+module = {
+  common;
+  name = hfs;
+  source = fs/hfs.c;
+};
+
+module = {
+  common;
+  name = hfsplus;
+  source = fs/hfsplus.c;
+};
+
+module = {
+  common;
+  name = iso9660;
+  source = fs/iso9660.c;
+};
+
+module = {
+  common;
+  name = jfs;
+  source = fs/jfs.c;
+};
+
+module = {
+  common;
+  name = minix;
+  source = fs/minix.c;
+};
+
+module = {
+  common;
+  name = nilfs2;
+  source = fs/nilfs2.c;
+};
+
+module = {
+  common;
+  name = ntfs;
+  source = fs/ntfs.c;
+};
+
+module = {
+  common;
+  name = ntfscomp;
+  source = fs/ntfscomp.c;
+};
+
+module = {
+  common;
+  name = reiserfs;
+  source = fs/reiserfs.c;
+};
+
+module = {
+  common;
+  name = sfs;
+  source = fs/sfs.c;
+};
+
+module = {
+  common;
+  name = tar;
+  source = fs/tar.c;
+};
+
+module = {
+  common;
+  name = udf;
+  source = fs/udf.c;
+};
+
+module = {
+  common;
+  name = ufs1;
+  source = fs/ufs.c;
+};
+
+module = {
+  common;
+  name = ufs2;
+  source = fs/ufs2.c;
+};
+
+module = {
+  common;
+  name = xfs;
+  source = fs/xfs.c;
+};
+
+module = {
+  name = pxe;
+  i386_pc = fs/i386/pc/pxe.c;
+};
+
+module = {
+  name = gettext;
+  source = gettext/gettext.c;
+  common;
+};
+
+module = {
+  common;
+  name = gfxmenu;
+  source = gfxmenu/gfxmenu.c;
+  source = gfxmenu/model.c;
+  source = gfxmenu/view.c;
+  source = gfxmenu/icon_manager.c;
+  source = gfxmenu/theme_loader.c;
+  source = gfxmenu/widget-box.c;
+  source = gfxmenu/gui_canvas.c;
+  source = gfxmenu/gui_circular_progress.c;
+  source = gfxmenu/gui_box.c;
+  source = gfxmenu/gui_label.c;
+  source = gfxmenu/gui_list.c;
+  source = gfxmenu/gui_image.c;
+  source = gfxmenu/gui_progress_bar.c;
+  source = gfxmenu/gui_util.c;
+  source = gfxmenu/gui_string_util.c;
+  source = gfxmenu/named_colors.c;
+};
+
+module = {
+  common;
+  name = hello;
+  source = hello/hello.c;
+};
+
+module = {
+  common;
+  name = gzio;
+  source = io/gzio.c;
+};
+
+module = {
+  name = bufio;
+  source = io/bufio.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  common;
+  name = elf;
+  source = kern/elf.c;
+};
+
+module = {
+  common;
+  name = charset;
+  source = lib/charset.c;
+};
+
+module = {
+  common;
+  name = crypto;
+  source = lib/crypto.c;
+};
+
+module = {
+  common;
+  name = gcry_arcfour;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/arcfour.c;
+};
+
+module = {
+  common;
+  name = gcry_blowfish;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/blowfish.c;
+};
+
+module = {
+  common;
+  name = gcry_camellia;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/camellia.c;
+  source = lib/libgcrypt-grub/cipher/camellia-glue.c;
+};
+
+module = {
+  common;
+  name = gcry_cast5;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/cast5.c;
+};
+
+module = {
+  common;
+  name = gcry_crc;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/crc.c;
+};
+
+module = {
+  common;
+  name = gcry_des;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/des.c;
+};
+
+module = {
+  common;
+  name = gcry_md4;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/md4.c;
+};
+
+module = {
+  common;
+  name = gcry_md5;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/md5.c;
+};
+
+module = {
+  common;
+  name = gcry_rfc2268;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/rfc2268.c;
+};
+
+module = {
+  common;
+  name = gcry_rijndael;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/rijndael.c;
+};
+
+module = {
+  common;
+  name = gcry_rmd160;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/rmd160.c;
+};
+
+module = {
+  common;
+  name = gcry_seed;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/seed.c;
+};
+
+module = {
+  common;
+  name = gcry_serpent;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/serpent.c;
+};
+
+module = {
+  common;
+  name = gcry_sha1;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/sha1.c;
+};
+
+module = {
+  common;
+  name = gcry_sha256;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/sha256.c;
+};
+
+module = {
+  common;
+  name = gcry_sha512;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/sha512.c;
+};
+
+module = {
+  common;
+  name = gcry_tiger;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/tiger.c;
+};
+
+module = {
+  common;
+  name = gcry_twofish;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/twofish.c;
+};
+
+module = {
+  common;
+  name = gcry_whirlpool;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/whirlpool.c;
+};
+
+module = {
+  common;
+  name = pbkdf2;
+  source = lib/pbkdf2.c;
+};
+
+module = {
+  name = relocator;
+  mips = lib/mips/relocator.c;
+  mips = lib/mips/relocator_asm.S;
+  x86 = lib/i386/relocator.c;
+  x86 = lib/i386/relocator_asm.S;
+  x86 = lib/i386/relocator_backward.S;
+};
+
+module = {
+  name = datetime;
+  source = lib/cmos_datetime.c;
+  x86_efi = lib/efi/datetime.c;
+  sparc64_ieee1275 = lib/ieee1275/datetime.c;
+  powerpc_ieee1275 = lib/ieee1275/datetime.c;
+  x86;
+  mips;
+};
+
+module = {
+  name = setjmp;
+  i386 = lib/i386/setjmp.S;
+  x86_64 = lib/x86_64/setjmp.S;
+  mips = lib/mips/setjmp.S;
+  sparc64 = lib/sparc64/setjmp.S;
+  powerpc = lib/powerpc/setjmp.S;
+};
+
+module = {
+  name = aout;
+  source = loader/aout.c;
+  i386_pc;
+  i386_qemu;
+  i386_coreboot;
+  i386_ieee1275;
+};
+
+module = {
+  name = bsd;
+  source = loader/i386/bsd.c;
+  source = loader/i386/bsd32.c;
+  source = loader/i386/bsd64.c;
+  source = loader/i386/bsd_helper.S;
+  source = loader/i386/bsd_trampoline.S;
+  i386_pc;
+  i386_qemu;
+  i386_coreboot;
+};
+
+module = {
+  name = linux16;
+  source = loader/i386/pc/linux.c;
+  i386_pc;
+};
+
+module = {
+  name = multiboot2;
+  cppflags = "-DGRUB_USE_MULTIBOOT2";
+
+  source = loader/multiboot.c;
+  source = loader/multiboot_mbi2.c;
+  x86;
+  mips;
+};
+
+module = {
+  name = multiboot;
+  source = loader/multiboot.c;
+  source = loader/i386/multiboot_mbi.c;
+  x86;
+};
+
+module = {
+  name = linux;
+  i386 = loader/i386/linux.c;
+  i386_efi = loader/i386/efi/linux.c;
+  i386_ieee1275 = loader/i386/ieee1275/linux.c;
+  x86_64_efi = loader/i386/efi/linux.c;
+  x86_64_efi = loader/i386/linux_trampoline.S;
+  mips = loader/mips/linux.c;
+  powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
+  sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
+};
+
+module = {
+  name = xnu;
+  x86_efi = loader/xnu_resume.c;
+  x86_efi = loader/i386/xnu.c;
+  x86_efi = loader/i386/efi/xnu.c;
+  x86_efi = loader/macho32.c;
+  x86_efi = loader/macho64.c;
+  x86_efi = loader/macho.c;
+  x86_efi = loader/xnu.c;
+
+  i386_pc = loader/xnu_resume.c;
+  i386_pc = loader/i386/xnu.c;
+  i386_pc = loader/i386/pc/xnu.c;
+  i386_pc = loader/macho32.c;
+  i386_pc = loader/macho64.c;
+  i386_pc = loader/macho.c;
+  i386_pc = loader/xnu.c;
+};
+
+module = {
+  name = appleldr;
+  x86_efi = loader/efi/appleloader.c;
+};
+
+module = {
+  name = chain;
+  x86_efi = loader/efi/chainloader.c;
+  i386_pc = loader/i386/pc/chainloader.c;
+};
+
+module = {
+  name = mmap;
+  i386_pc = mmap/mmap.c;
+  i386_pc = mmap/i386/uppermem.c;
+  i386_pc = mmap/i386/mmap.c;
+  i386_pc = mmap/i386/pc/mmap.c;
+  i386_pc = mmap/i386/pc/mmap_helper.S;
+
+  x86_efi = mmap/mmap.c;
+  x86_efi = mmap/i386/uppermem.c;
+  x86_efi = mmap/i386/mmap.c;
+  x86_efi = mmap/efi/mmap.c;
+
+  i386_coreboot = mmap/mmap.c;
+  i386_coreboot = mmap/i386/uppermem.c;
+  i386_coreboot = mmap/i386/mmap.c;
+
+  i386_qemu = mmap/mmap.c;
+  i386_qemu = mmap/i386/uppermem.c;
+  i386_qemu = mmap/i386/mmap.c;
+
+  i386_ieee1275 = mmap/mmap.c;
+  i386_ieee1275 = mmap/i386/uppermem.c;
+  i386_ieee1275 = mmap/i386/mmap.c;
+
+  mips_yeeloong = mmap/mmap.c;
+  mips_yeeloong = mmap/mips/yeeloong/uppermem.c;
+};
+
+module = {
+  common;
+  name = normal;
+  source = normal/main.c;
+  source = normal/cmdline.c;
+  source = normal/dyncmd.c;
+  source = normal/auth.c;
+  source = normal/autofs.c;
+  source = normal/handler.c;
+  source = normal/color.c;
+  source = normal/completion.c;
+  source = normal/datetime.c;
+  source = normal/menu.c;
+  source = normal/menu_entry.c;
+  source = normal/menu_text.c;
+  source = normal/misc.c;
+  source = normal/crypto.c;
+  source = normal/term.c;
+  source = normal/context.c;
+};
+
+module = {
+  common;
+  name = part_acorn;
+  source = partmap/acorn.c;
+};
+
+module = {
+  common;
+  name = part_amiga;
+  source = partmap/amiga.c;
+};
+
+module = {
+  common;
+  name = part_apple;
+  source = partmap/apple.c;
+};
+
+module = {
+  common;
+  name = part_gpt;
+  source = partmap/gpt.c;
+};
+
+module = {
+  common;
+  name = part_msdos;
+  source = partmap/msdos.c;
+};
+
+module = {
+  common;
+  name = part_sun;
+  source = partmap/sun.c;
+};
+
+module = {
+  common;
+  name = part_bsd;
+  source = partmap/bsdlabel.c;
+};
+
+module = {
+  common;
+  name = part_sunpc;
+  source = partmap/sunpc.c;
+};
+
+module = {
+  common;
+  name = msdospart;
+  source = parttool/msdospart.c;
+};
+
+module = {
+  common;
+  name = sh;
+  source = script/main.c;
+  source = script/script.c;
+  source = script/execute.c;
+  source = script/function.c;
+  source = script/lexer.c;
+  nodist = grub_script.tab.c;
+  nodist = grub_script.yy.c;
+  nodist = grub_script.tab.h;
+  nodist = grub_script.yy.h;
+  cflags = '$(CFLAGS_POSIX) -Wno-error';
+  cppflags = '$(CPPFLAGS_POSIX)';
+};
+
+module = {
+  name = at_keyboard;
+  source = term/at_keyboard.c;
+  x86;
+};
+
+module = {
+  name = gfxterm;
+  source = term/gfxterm.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  name = serial;
+  source = term/serial.c;
+  mips;
+  i386;
+};
+
+module = {
+  common;
+  name = terminfo;
+  source = term/terminfo.c;
+  source = term/tparm.c;
+};
+
+module = {
+  name = usb_keyboard;
+  source = term/usb_keyboard.c;
+  i386_pc;
+};
+
+module = {
+  name = vga;
+  i386_pc = term/i386/pc/vga.c;
+};
+
+module = {
+  name = vga_text;
+  x86 = term/i386/pc/vga_text.c;
+  x86 = term/i386/vga_common.c;
+};
+
+module = {
+  name = functional_test;
+  source = tests/lib/functional_test.c;
+  source = tests/lib/test.c;
+  common;
+};
+
+module = {
+  name = example_functional_test;
+  source = tests/example_functional_test.c;
+  cflags = -Wno-format;
+  common;
+};
+
+module = {
+  name = bitmap;
+  source = video/bitmap.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  name = bitmap_scale;
+  source = video/bitmap_scale.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  name = efi_gop;
+  x86_efi = video/efi_gop.c;
+};
+
+module = {
+  name = efi_uga;
+  x86_efi = video/efi_uga.c;
+};
+
+module = {
+  common;
+  name = jpeg;
+  source = video/readers/jpeg.c;
+};
+
+module = {
+  common;
+  name = png;
+  source = video/readers/png.c;
+};
+
+module = {
+  common;
+  name = tga;
+  source = video/readers/tga.c;
+};
+
+module = {
+  name = vbe;
+  i386_pc = video/i386/pc/vbe.c;
+};
+
+module = {
+  name = video_fb;
+  source = video/fb/video_fb.c;
+  source = video/fb/fbblit.c;
+  source = video/fb/fbfill.c;
+  source = video/fb/fbutil.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  name = video;
+  source = video/video.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  name = ieee1275_fb;
+  source = video/ieee1275.c;
+  powerpc;
+  sparc64;
+};
+
+module = {
+  name = sdl;
+  source = video/emu/sdl.c;
+  enable = COND_GRUB_EMU_SDL;
+  emu;
+};
+
+module = {
+  name = datehook;
+  source = hook/datehook.c;
+  common;
+};
similarity index 100%
rename from normal/auth.c
rename to grub-core/normal/auth.c
similarity index 100%
rename from normal/autofs.c
rename to grub-core/normal/autofs.c
similarity index 100%
rename from normal/cmdline.c
rename to grub-core/normal/cmdline.c
similarity index 100%
rename from normal/color.c
rename to grub-core/normal/color.c
similarity index 100%
rename from normal/context.c
rename to grub-core/normal/context.c
similarity index 100%
rename from normal/crypto.c
rename to grub-core/normal/crypto.c
similarity index 100%
rename from normal/dyncmd.c
rename to grub-core/normal/dyncmd.c
similarity index 100%
rename from normal/handler.c
rename to grub-core/normal/handler.c
similarity index 100%
rename from normal/main.c
rename to grub-core/normal/main.c
similarity index 100%
rename from normal/menu.c
rename to grub-core/normal/menu.c
similarity index 100%
rename from normal/misc.c
rename to grub-core/normal/misc.c
similarity index 100%
rename from normal/term.c
rename to grub-core/normal/term.c
similarity index 100%
rename from partmap/acorn.c
rename to grub-core/partmap/acorn.c
similarity index 100%
rename from partmap/amiga.c
rename to grub-core/partmap/amiga.c
similarity index 100%
rename from partmap/apple.c
rename to grub-core/partmap/apple.c
similarity index 100%
rename from partmap/gpt.c
rename to grub-core/partmap/gpt.c
similarity index 100%
rename from partmap/msdos.c
rename to grub-core/partmap/msdos.c
similarity index 100%
rename from partmap/sun.c
rename to grub-core/partmap/sun.c
similarity index 100%
rename from partmap/sunpc.c
rename to grub-core/partmap/sunpc.c
diff --git a/grub-core/po/Makefile.am b/grub-core/po/Makefile.am
new file mode 100644 (file)
index 0000000..e69de29
similarity index 100%
rename from po/POTFILES
rename to grub-core/po/POTFILES
similarity index 100%
rename from po/README
rename to grub-core/po/README
similarity index 100%
rename from script/execute.c
rename to grub-core/script/execute.c
similarity index 100%
rename from script/lexer.c
rename to grub-core/script/lexer.c
similarity index 100%
rename from script/main.c
rename to grub-core/script/main.c
similarity index 100%
rename from script/parser.y
rename to grub-core/script/parser.y
similarity index 100%
rename from script/script.c
rename to grub-core/script/script.c
similarity index 100%
rename from script/yylex.l
rename to grub-core/script/yylex.l
similarity index 100%
rename from term/gfxterm.c
rename to grub-core/term/gfxterm.c
similarity index 100%
rename from term/serial.c
rename to grub-core/term/serial.c
similarity index 100%
rename from term/terminfo.c
rename to grub-core/term/terminfo.c
similarity index 100%
rename from term/tparm.c
rename to grub-core/term/tparm.c
similarity index 95%
rename from tests/example_functional_test.c
rename to grub-core/tests/example_functional_test.c
index 6802d2d..5259881 100644 (file)
@@ -32,4 +32,4 @@ example_test (void)
 }
 
 /* Register example_test method as a functional test.  */
-GRUB_FUNCTIONAL_TEST ("example_functional_test", example_test);
+GRUB_FUNCTIONAL_TEST (example_functional_test, example_test);
similarity index 100%
rename from tests/lib/test.c
rename to grub-core/tests/lib/test.c
similarity index 100%
rename from video/bitmap.c
rename to grub-core/video/bitmap.c
similarity index 100%
rename from video/efi_gop.c
rename to grub-core/video/efi_gop.c
similarity index 100%
rename from video/efi_uga.c
rename to grub-core/video/efi_uga.c
similarity index 100%
rename from util/sdl.c
rename to grub-core/video/emu/sdl.c
similarity index 100%
rename from video/ieee1275.c
rename to grub-core/video/ieee1275.c
similarity index 100%
rename from video/sm712.c
rename to grub-core/video/sm712.c
similarity index 100%
rename from video/video.c
rename to grub-core/video/video.c
diff --git a/modules.def b/modules.def
new file mode 100644 (file)
index 0000000..4877533
--- /dev/null
@@ -0,0 +1,497 @@
+AutoGen definitions Makefile.tpl;
+
+library = {
+  name = libutil.a;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+
+  nodist = grub_script.tab.c;
+  nodist = grub_script.yy.c;
+  nodist = libutil_a_init.c;
+
+  source = grub-core/gnulib/error.c;
+  source = grub-core/gnulib/fnmatch.c;
+  source = grub-core/gnulib/getdelim.c;
+  source = grub-core/gnulib/getline.c;
+  source = grub-core/gnulib/getopt1.c;
+  source = grub-core/gnulib/getopt.c;
+  source = grub-core/gnulib/progname.c;
+
+  source = util/misc.c;
+  source = grub-core/kern/misc.c;
+  source = grub-core/kern/emu/misc.c;
+  source = grub-core/kern/emu/hostfs.c;
+  source = grub-core/kern/emu/getroot.c;
+  source = grub-core/kern/emu/hostdisk.c;
+
+  source = grub-core/commands/blocklist.c;
+  source = grub-core/commands/extcmd.c;
+  source = grub-core/commands/ls.c;
+  source = grub-core/disk/dmraid_nvidia.c;
+  source = grub-core/disk/host.c;
+  source = grub-core/disk/loopback.c;
+  source = grub-core/disk/lvm.c;
+  source = grub-core/disk/mdraid_linux.c;
+  source = grub-core/disk/raid5_recover.c;
+  source = grub-core/disk/raid6_recover.c;
+  source = grub-core/disk/raid.c;
+  source = grub-core/fs/affs.c;
+  source = grub-core/fs/afs_be.c;
+  source = grub-core/fs/afs.c;
+  source = grub-core/fs/befs_be.c;
+  source = grub-core/fs/befs.c;
+  source = grub-core/fs/cpio.c;
+  source = grub-core/fs/ext2.c;
+  source = grub-core/fs/fat.c;
+  source = grub-core/fs/fshelp.c;
+  source = grub-core/fs/hfs.c;
+  source = grub-core/fs/hfsplus.c;
+  source = grub-core/fs/iso9660.c;
+  source = grub-core/fs/jfs.c;
+  source = grub-core/fs/minix.c;
+  source = grub-core/fs/nilfs2.c;
+  source = grub-core/fs/ntfs.c;
+  source = grub-core/fs/ntfscomp.c;
+  source = grub-core/fs/reiserfs.c;
+  source = grub-core/fs/sfs.c;
+  source = grub-core/fs/tar.c;
+  source = grub-core/fs/udf.c;
+  source = grub-core/fs/ufs2.c;
+  source = grub-core/fs/ufs.c;
+  source = grub-core/fs/xfs.c;
+  source = grub-core/kern/command.c;
+  source = grub-core/kern/device.c;
+  source = grub-core/kern/disk.c;
+  source = grub-core/kern/env.c;
+  source = grub-core/kern/err.c;
+  source = grub-core/kern/file.c;
+  source = grub-core/kern/fs.c;
+  source = grub-core/kern/handler.c;
+  source = grub-core/kern/list.c;
+  source = grub-core/kern/parser.c;
+  source = grub-core/kern/partition.c;
+  source = grub-core/lib/arg.c;
+  source = grub-core/lib/crc.c;
+  source = grub-core/lib/crypto.c;
+  source = grub-core/lib/envblk.c;
+  source = grub-core/lib/hexdump.c;
+  source = grub-core/lib/libgcrypt-grub/cipher/sha512.c;
+  source = grub-core/lib/LzFind.c;
+  source = grub-core/lib/LzmaEnc.c;
+  source = grub-core/lib/pbkdf2.c;
+  source = grub-core/normal/datetime.c;
+  source = grub-core/normal/misc.c;
+  source = grub-core/partmap/acorn.c;
+  source = grub-core/partmap/amiga.c;
+  source = grub-core/partmap/apple.c;
+  source = grub-core/partmap/gpt.c;
+  source = grub-core/partmap/msdos.c;
+  source = grub-core/partmap/sun.c;
+  source = grub-core/script/function.c;
+  source = grub-core/script/lexer.c;
+  source = grub-core/script/main.c;
+  source = grub-core/script/script.c;
+  common;
+};
+
+program = {
+  name = grub-bin2h;
+  source = util/bin2h.c;
+  ldadd = libutil.a;
+  mansection = 1;
+  common;
+};
+
+program = {
+  name = grub-mkimage;
+  mansection = 1;
+
+  source = util/grub-mkrawimage.c;
+  source = util/resolve.c;
+
+  x86_efi = util/i386/efi/grub-mkimage.c;
+  x86_efi = util/resolve.c;
+
+  ldadd = libutil.a;
+
+  sparc64_ieee1275_cppflags = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  mips_cppflags = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_pc_cppflags = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_qemu_cppflags = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+
+  i386_pc; i386_qemu; mips; sparc64_ieee1275;
+};
+
+program = {
+  name = grub-mkelfimage;
+  mansection = 1;
+  source = util/elf/grub-mkimage.c;
+  source = util/resolve.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-mkisofs;
+  mansection = 1;
+  source = util/mkisofs/eltorito.c;
+  source = util/mkisofs/hash.c;
+  source = util/mkisofs/joliet.c;
+  source = util/mkisofs/match.c;
+  source = util/mkisofs/mkisofs.c;
+  source = util/mkisofs/multi.c;
+  source = util/mkisofs/name.c;
+  source = util/mkisofs/rock.c;
+  source = util/mkisofs/tree.c;
+  source = util/mkisofs/write.c;
+  source = grub-core/gnulib/progname.c;
+  source = grub-core/gnulib/error.c;
+  cflags = '$(CFLAGS_MKISOFS)';
+  cppflags = '$(CPPFLAGS_MKISOFS)';
+  common;
+};
+
+program = {
+  name = grub-mkrelpath;
+  mansection = 1;
+
+  source = util/grub-mkrelpath.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-script-check;
+  mansection = 1;
+
+  source = util/grub-script-check.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-editenv;
+  mansection = 1;
+
+  source = util/grub-editenv.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-mkpasswd-pbkdf2;
+  mansection = 1;
+
+  source = util/grub-mkpasswd-pbkdf2.c;
+
+  ldadd = libutil.a;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  common;
+};
+
+program = {
+  name = grub-macho2img;
+  mansection = 1;
+  source = util/grub-macho2img.c;
+};
+
+program = {
+  name = grub-pe2elf;
+  mansection = 1;
+  source = util/grub-pe2elf.c;
+
+  ldadd = libutil.a;
+};
+
+program = {
+  name = grub-fstest;
+  mansection = 1;
+  source = util/grub-fstest.c;
+
+  ldadd = libutil.a;
+  enable = COND_GRUB_FSTEST;
+  common;
+};
+
+program = {
+  name = grub-mkfont;
+  mansection = 1;
+  source = util/grub-mkfont.c;
+
+  ldadd = libutil.a;
+  cflags = '$(freetype_cflags)';
+  ldflags = '$(freetype_libs)';
+  common;
+  enable = COND_GRUB_MKFONT;
+};
+
+program = {
+  name = grub-mkdevicemap;
+  installdir = sbin;
+  mansection = 8;
+  source = util/grub-mkdevicemap.c;
+  source = util/deviceiter.c;
+  source = util/devicemap.c;
+
+  sparc64_ieee1275 = util/grub-mkdevicemap.c;
+  sparc64_ieee1275 = util/deviceiter.c;
+  sparc64_ieee1275 = util/ieee1275/ofpath.c;
+  sparc64_ieee1275 = util/ieee1275/devicemap.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-probe;
+  installdir = sbin;
+  mansection = 8;
+  source = util/grub-probe.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-setup;
+  installdir = sbin;
+  mansection = 8;
+  i386_pc = util/i386/pc/grub-setup.c;
+  i386_pc = util/raid.c;
+  i386_pc = util/lvm.c;
+
+  sparc64_ieee1275 = util/ieee1275/ofpath.c;
+  sparc64_ieee1275 = util/sparc64/ieee1275/grub-setup.c;
+  sparc64_ieee1275 = util/raid.c;
+  sparc64_ieee1275 = util/lvm.c;
+
+  ldadd = libutil.a;
+};
+
+program = {
+  name = grub-ofpathname;
+  installdir = sbin;
+  source = util/ieee1275/grub-ofpathname.c;
+  source = util/ieee1275/ofpath.c;
+
+  ldadd = libutil.a;
+  sparc64_ieee1275;
+};
+
+data = {
+  source = util/grub.d/README;
+  installdir = grubconf;
+  common;
+};
+
+script = {
+  name = '00_header';
+  source = util/grub.d/00_header.in;
+  installdir = grubconf;
+  common;
+};
+
+script = {
+  name = '10_windows';
+  source = util/grub.d/10_windows.in;
+  installdir = grubconf;
+};
+
+script = {
+  name = '10_hurd';
+  source = util/grub.d/10_hurd.in;
+  installdir = grubconf;
+};
+
+script = {
+  name = '10_linux';
+  source = util/grub.d/10_linux.in;
+  installdir = grubconf;
+  common;
+};
+
+script = {
+  name = '30_os-prober';
+  source = util/grub.d/30_os-prober.in;
+  installdir = grubconf;
+  common;
+};
+
+script = {
+  name = '40_custom';
+  source = util/grub.d/40_custom.in;
+  installdir = grubconf;
+  common;
+};
+
+script = {
+  mansection = 1;
+  name = grub-mkrescue;
+  source = util/grub-mkrescue.in;
+  powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
+  i386_pc;
+  i386_qemu;
+  i386_coreboot;
+};
+
+script = {
+  mansection = 8;
+  installdir = sbin;
+  name = grub-install;
+  source = util/grub-install.in;
+  x86_efi = util/i386/efi/grub-install.in;
+  i386_ieee1275 = util/ieee1275/grub-install.in;
+  powerpc_ieee1275 = util/ieee1275/grub-install.in;
+  mips;
+  i386_pc;
+  i386_qemu;
+  i386_coreboot;
+};
+
+script = {
+  name = grub-mkconfig;
+  source = util/grub-mkconfig.in;
+  mansection = 8;
+  installdir = sbin;
+  common;
+};
+
+script = {
+  name = grub-set-default;
+  source = util/grub-set-default.in;
+  mansection = 8;
+  installdir = sbin;
+  common;
+};
+
+script = {
+  name = grub-reboot;
+  source = util/grub-reboot.in;
+  mansection = 8;
+  installdir = sbin;
+  common;
+};
+
+script = {
+  name = grub-mkconfig_lib;
+  source = util/grub-mkconfig_lib.in;
+  installdir = pkglib;
+  common;
+};
+
+script = {
+  name = update-grub_lib;
+  source = util/update-grub_lib.in;
+  installdir = pkglib;
+  common;
+};
+
+test_script = {
+  name = grub-shell;
+  source = tests/util/grub-shell.in;
+  common;
+};
+
+test_script = {
+  name = grub-shell-tester;
+  source = tests/util/grub-shell-tester.in;
+  common;
+};
+
+test_script = {
+  name = example_scripted_test;
+  source = tests/example_scripted_test.in;
+  common;
+};
+
+test_script = {
+  name = example_grub_script_test;
+  source = tests/example_grub_script_test.in;
+  common;
+};
+
+test_script = {
+  name = grub_script_echo1;
+  source = tests/grub_script_echo1.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_echo_keywords;
+  source = tests/grub_script_echo_keywords.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_vars1;
+  source = tests/grub_script_vars1.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_for1;
+  source = tests/grub_script_for1.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_while1;
+  source = tests/grub_script_while1.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_if;
+  source = tests/grub_script_if.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_blanklines;
+  source = tests/grub_script_blanklines.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_final_semicolon;
+  source = tests/grub_script_final_semicolon.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_dollar;
+  source = tests/grub_script_dollar.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_comments;
+  source = tests/grub_script_comments.in;
+  common;
+  enable;
+};
+
+test_program = {
+  name = example_unit_test;
+  source = tests/example_unit_test.c;
+  source = tests/lib/unit_test.c;
+  source = grub-core/kern/list.c;
+  source = grub-core/kern/misc.c;
+  source = grub-core/tests/lib/test.c;
+  cflags = -Wno-format;
+  common;
+};
diff --git a/po/Makefile.am b/po/Makefile.am
new file mode 100644 (file)
index 0000000..e69de29
index 93a90a1..6fa3dc9 100644 (file)
@@ -1,3 +1,3 @@
-#! @builddir@/grub-shell-tester --modules=echo
+#! @abs_top_builddir@/grub-shell-tester --modules=echo
 
 echo "hello world"
index e461150..92c8ae3 100644 (file)
@@ -105,5 +105,4 @@ grub_exit (void)
   exit (1);
 }
 
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
+struct grub_term_input *grub_term_inputs;
index e9507c8..f1e91f5 100644 (file)
@@ -91,7 +91,7 @@ if [ "x${source}" = x ] ; then
 fi
 
 outfile1=`mktemp`
-@builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1}
+@abs_top_builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1}
 
 outfile2=`mktemp`
 bash ${source} >${outfile2}
index a41a6f6..8324beb 100644 (file)
@@ -123,10 +123,14 @@ source /boot/grub/testcase.cfg
 halt
 EOF
 
+rootdir=`mktemp -d`
+(cd @abs_top_builddir@ && make DESTDIR=$rootdir install) >/dev/null 2>&1
+
 isofile=`mktemp`
-grub-mkrescue --output=${isofile} --override-directory=${builddir} \
-  /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
-  >/dev/null 2>&1
+sh @abs_top_builddir@/grub-mkrescue --output=${isofile} \
+  --root-directory=${rootdir} /boot/grub/grub.cfg=${cfgfile} \
+  /boot/grub/testcase.cfg=${source} >/dev/null 2>&1
+rm -rf $rootdir
 
 hdafile=`mktemp`
 cp ${isofile} ${hdafile}
index 04a19bc..fa9b202 100644 (file)
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <grub/elf.h>
 #include <grub/misc.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
 #include <grub/kernel.h>
index f21042c..24c3632 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/lib/envblk.h>
 #include <grub/handler.h>
 
 #define DEFAULT_ENVBLK_SIZE    1024
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
-int
-grub_getkey (void)
-{
-  return 0;
-}
-
 char *
 grub_env_get (const char *name __attribute__ ((unused)))
 {
index c03c434..9ac5cf5 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/misc.h>
 #include <grub/device.h>
@@ -33,8 +34,6 @@
 #include <grub/command.h>
 #include <grub/i18n.h>
 
-#include <grub_fstest_init.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 
 #include "progname.h"
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-int
-grub_getkey (void)
-{
-  return -1;
-}
-
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
 static grub_err_t
 execute_command (char *name, int n, char **args)
 {
index c68482a..d534ff9 100644 (file)
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 #include <limits.h>
 
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/deviceiter.h>
 #include <grub/i18n.h>
index 51e2e49..30dd96a 100644 (file)
@@ -18,6 +18,8 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/i18n.h>
 #include <grub/fontformat.h>
index a00b1e9..4a218bc 100644 (file)
@@ -18,6 +18,7 @@
 
 #include <grub/types.h>
 #include <grub/crypto.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/i18n.h>
 
 
 #include "progname.h"
 
-/* Few functions to make crypto happy.  */
-void *
-grub_memmove (void *dest, const void *src, grub_size_t n)
-{
-  return memmove (dest, src, n);
-}
-
-void *
-grub_memset (void *s, int c, grub_size_t n)
-{
-  return memset (s, c, n);
-}
-
-int 
-grub_vprintf (const char *fmt, va_list args)
-{
-  return vprintf (fmt, args);
-}
-
-int 
-grub_vsnprintf (char *str, grub_size_t n, const char *fmt, va_list args)
-{
-  return vsnprintf (str, n, fmt, args);
-}
-
-void
-grub_abort (void)
-{
-  abort ();
-}
-
 static struct option options[] =
   {
     {"iteration_count", required_argument, 0, 'c'},
index 20a344d..ff3b9df 100644 (file)
@@ -27,6 +27,7 @@
 #include <grub/i18n.h>
 #include <grub/kernel.h>
 #include <grub/disk.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
 #include <grub/misc.h>
index 327f0c8..4e9d0ed 100644 (file)
@@ -18,6 +18,7 @@
  */
 
 #include <grub/util/misc.h>
+#include <grub/emu/getroot.h>
 #include <grub/i18n.h>
 #include <getopt.h>
 
@@ -97,7 +98,7 @@ main (int argc, char *argv[])
 
   argument = argv[optind];
 
-  relpath = make_system_path_relative_to_its_root (argument);
+  relpath = grub_make_system_path_relative_to_its_root (argument);
   printf ("%s\n", relpath);
   free (relpath);
 
index 44e80b1..2fdb581 100644 (file)
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # Make GRUB rescue image
-# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,8 +28,11 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 native_platform=@platform@
-pkglib_DATA="@pkglib_DATA@"
+pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 
+mkimage=${bindir}/grub-mkimage
+mkisofs=${bindir}/grub-mkisofs
+mkelfimage=${bindir}/grub-mkelfimage
 multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-multiboot
 pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc
 
@@ -70,6 +73,8 @@ for option in "$@"; do
        PATH=${override_dir}:$PATH
        export PATH
        ;;
+    --root-directory=*)
+        rootdir=`echo "${option}/" | sed 's/--root-directory=//'` ;;
     -*)
        echo "Unrecognized option \`$option'" 1>&2
        usage
@@ -121,6 +126,14 @@ process_input_dir ()
     done
 }
 
+if [ "${rootdir}" != "" ] ; then
+    coreboot_dir="${rootdir}/${coreboot_dir}"
+    pc_dir="${rootdir}/${pc_dir}"
+    mkimage="${rootdir}/${mkimage}"
+    mkisofs="${rootdir}/${mkisofs}"
+    mkelfimage="${rootdir}/${mkelfimage}"
+fi
+
 if [ "${override_dir}" = "" ] ; then
     if test -e "${multiboot_dir}" ; then
         process_input_dir ${multiboot_dir} multiboot
@@ -160,7 +173,7 @@ EOF
 
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot
     rm -rf ${memdisk_dir}
-    grub-mkelfimage -d ${multiboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
+    ${mkelfimage} -d ${multiboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
         memdisk tar search iso9660 configfile sh \
         ata at_keyboard
     rm -f ${memdisk_img}
@@ -171,7 +184,7 @@ fi
 if test -e "${pc_dir}" ; then
     echo "Enabling BIOS support ..."
     core_img=`mktemp "$MKTEMP_TEMPLATE"`
-    grub-mkimage -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \
+    ${mkimage} -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \
         iso9660 biosdisk
     cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img
 
@@ -192,7 +205,7 @@ if test -e "${pc_dir}" ; then
 fi
 
 # build iso image
-grub-mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
+${mkisofs} ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
 rm -rf ${iso9660_dir}
 
 rm -f ${embed_img}
index bb41480..0cc35d4 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/device.h>
 #include <grub/disk.h>
 #include <grub/fs.h>
 #include <grub/partition.h>
 #include <grub/msdos_partition.h>
-#include <grub/util/hostdisk.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/hostdisk.h>
+#include <grub/emu/getroot.h>
 #include <grub/term.h>
 #include <grub/env.h>
 #include <grub/raid.h>
 #include <grub/i18n.h>
 
-#include <grub_probe_init.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -58,27 +57,6 @@ enum {
 int print = PRINT_FS;
 static unsigned int argument_is_device = 0;
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-int
-grub_getkey (void)
-{
-  return -1;
-}
-
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
 static void
 probe_partmap (grub_disk_t disk)
 {
@@ -261,7 +239,7 @@ probe (const char *path, char *device_name)
              grub_util_info ("reading %s via OS facilities", path);
              filebuf_via_sys = grub_util_read_image (path);
 
-             rel_path = make_system_path_relative_to_its_root (path);
+             rel_path = grub_make_system_path_relative_to_its_root (path);
              grub_path = xasprintf ("(%s)%s", drive_name, rel_path);
              free (rel_path);
              grub_util_info ("reading %s via GRUB facilities", grub_path);
index dc732aa..fa24593 100644 (file)
 #include <grub/types.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/i18n.h>
 #include <grub/parser.h>
 #include <grub/script_sh.h>
 
-#include <grub_script_check_init.h>
-
 #define _GNU_SOURCE    1
 
 #include <ctype.h>
 
 #include "progname.h"
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-int
-grub_getkey (void)
-{
-  return -1;
-}
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
-char *
-grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_cmdline (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_cmdblock (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_cmdif (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_cmdfor (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_cmdwhile (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute (struct grub_script *script)
-{
-  if (script == 0 || script->cmd == 0)
-    return 0;
-
-  return script->cmd->exec (script->cmd);
-}
-
 static struct option options[] =
   {
     {"help", no_argument, 0, 'h'},
@@ -145,7 +75,7 @@ main (int argc, char *argv[])
   char *input;
   FILE *file = 0;
   int verbose = 0;
-  struct grub_script *script;
+  struct grub_script *script = 0;
 
   auto grub_err_t get_config_line (char **line, int cont);
   grub_err_t get_config_line (char **line, int cont __attribute__ ((unused)))
index f8c0f15..57fba91 100644 (file)
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <time.h>
 #include <grub/elf.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
 #include <grub/kernel.h>
index 63fa8c3..66d4562 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/device.h>
 #include <grub/disk.h>
 #include <grub/msdos_partition.h>
 #include <grub/gpt_partition.h>
 #include <grub/env.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/term.h>
 #include <grub/i18n.h>
 #include <grub/util/raid.h>
 #include <grub/util/lvm.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 
 static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
 
-#include <grub_setup_init.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -57,27 +56,6 @@ static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_P
 #define DEFAULT_BOOT_FILE      "boot.img"
 #define DEFAULT_CORE_FILE      "core.img"
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-int
-grub_getkey (void)
-{
-  return -1;
-}
-
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
 static void
 setup (const char *dir,
        const char *boot_file, const char *core_file,
@@ -423,7 +401,7 @@ unable_to_embed:
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
   core_path_dev_full = grub_util_get_path (dir, core_file);
-  core_path_dev = make_system_path_relative_to_its_root (core_path_dev_full);
+  core_path_dev = grub_make_system_path_relative_to_its_root (core_path_dev_full);
   free (core_path_dev_full);
 
   /* It is a Good Thing to sync two times.  */
index 0a09163..bb2c19f 100644 (file)
@@ -19,7 +19,7 @@
 
 /* We only support LVM on Linux.  */
 #ifdef __linux__
-
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/lvm.h>
 
index f9d860d..a7d5550 100644 (file)
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/cache.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/mm.h>
 #include <grub/term.h>
 #include <grub/time.h>
 #include <grub/i18n.h>
+#include <grub/script_sh.h>
 
 #define ENABLE_RELOCATABLE 0
 #include "progname.h"
 #include <winioctl.h>
 #endif
 
-int verbosity = 0;
-
-void
-grub_util_warn (const char *fmt, ...)
-{
-  va_list ap;
-
-  fprintf (stderr, _("%s: warn:"), program_name);
-  fprintf (stderr, " ");
-  va_start (ap, fmt);
-  vfprintf (stderr, fmt, ap);
-  va_end (ap);
-  fprintf (stderr, ".\n");
-  fflush (stderr);
-}
-
-void
-grub_util_info (const char *fmt, ...)
-{
-  if (verbosity > 0)
-    {
-      va_list ap;
-
-      fprintf (stderr, _("%s: info:"), program_name);
-      fprintf (stderr, " ");
-      va_start (ap, fmt);
-      vfprintf (stderr, fmt, ap);
-      va_end (ap);
-      fprintf (stderr, ".\n");
-      fflush (stderr);
-    }
-}
-
-void
-grub_util_error (const char *fmt, ...)
-{
-  va_list ap;
-
-  fprintf (stderr, _("%s: error:"), program_name);
-  fprintf (stderr, " ");
-  va_start (ap, fmt);
-  vfprintf (stderr, fmt, ap);
-  va_end (ap);
-  fprintf (stderr, ".\n");
-  exit (1);
-}
-
 #ifdef GRUB_UTIL
 int
 grub_err_printf (const char *fmt, ...)
@@ -125,41 +80,6 @@ grub_err_printf (const char *fmt, ...)
 }
 #endif
 
-void *
-xmalloc (size_t size)
-{
-  void *p;
-
-  p = malloc (size);
-  if (! p)
-    grub_util_error ("out of memory");
-
-  return p;
-}
-
-void *
-xrealloc (void *ptr, size_t size)
-{
-  ptr = realloc (ptr, size);
-  if (! ptr)
-    grub_util_error ("out of memory");
-
-  return ptr;
-}
-
-char *
-xstrdup (const char *str)
-{
-  size_t len;
-  char *newstr;
-
-  len = strlen (str);
-  newstr = (char *) xmalloc (len + 1);
-  memcpy (newstr, str, len + 1);
-
-  return newstr;
-}
-
 char *
 grub_util_get_path (const char *dir, const char *file)
 {
@@ -268,89 +188,102 @@ grub_util_write_image (const char *img, size_t size, FILE *out)
     grub_util_error ("write failed");
 }
 
-/* Some functions that we don't use.  */
-void
-grub_mm_init_region (void *addr __attribute__ ((unused)),
-                    grub_size_t size __attribute__ ((unused)))
+char *
+grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
 {
+  return 0;
 }
 
-#if GRUB_NO_MODULES
-void
-grub_register_exported_symbols (void)
+grub_err_t
+grub_script_execute_cmdline (struct grub_script_cmd *cmd __attribute__ ((unused)))
 {
+  return 0;
 }
-#endif
 
-void
-grub_exit (void)
+grub_err_t
+grub_script_execute_cmdblock (struct grub_script_cmd *cmd __attribute__ ((unused)))
 {
-  exit (1);
+  return 0;
 }
 
-grub_uint32_t
-grub_get_rtc (void)
+grub_err_t
+grub_script_execute_cmdif (struct grub_script_cmd *cmd __attribute__ ((unused)))
 {
-  struct timeval tv;
+  return 0;
+}
 
-  gettimeofday (&tv, 0);
+grub_err_t
+grub_script_execute_cmdfor (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
 
-  return (tv.tv_sec * GRUB_TICKS_PER_SECOND
-         + (((tv.tv_sec % GRUB_TICKS_PER_SECOND) * 1000000 + tv.tv_usec)
-            * GRUB_TICKS_PER_SECOND / 1000000));
+grub_err_t
+grub_script_execute_cmdwhile (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
 }
 
-grub_uint64_t
-grub_get_time_ms (void)
+grub_err_t
+grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
 {
-  struct timeval tv;
+  return 0;
+}
 
-  gettimeofday (&tv, 0);
+grub_err_t
+grub_script_execute (struct grub_script *script)
+{
+  if (script == 0 || script->cmd == 0)
+    return 0;
 
-  return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
+  return script->cmd->exec (script->cmd);
 }
 
-#ifdef __MINGW32__
-
 void
-grub_millisleep (grub_uint32_t ms)
+grub_putchar (int c)
 {
-  Sleep (ms);
+  putchar (c);
 }
 
-#else
-
-void
-grub_millisleep (grub_uint32_t ms)
+int
+grub_getkey (void)
 {
-  struct timespec ts;
-
-  ts.tv_sec = ms / 1000;
-  ts.tv_nsec = (ms % 1000) * 1000000;
-  nanosleep (&ts, NULL);
+  return -1;
 }
 
-#endif
-
-#if !(defined (__i386__) || defined (__x86_64__)) && GRUB_NO_MODULES
 void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-                      grub_size_t len __attribute__ ((unused)))
+grub_refresh (void)
 {
+  fflush (stdout);
 }
-#endif
 
-#ifndef HAVE_VASPRINTF
+int
+grub_dl_ref (grub_dl_t mod)
+{
+  (void) mod;
+  return 0;
+}
 
 int
-vasprintf (char **buf, const char *fmt, va_list ap)
+grub_dl_unref (grub_dl_t mod)
 {
-  /* Should be large enough.  */
-  *buf = xmalloc (512);
+  (void) mod;
+  return 0;
+}
 
-  return vsprintf (*buf, fmt, ap);
+/* Some functions that we don't use.  */
+void
+grub_mm_init_region (void *addr __attribute__ ((unused)),
+                    grub_size_t size __attribute__ ((unused)))
+{
 }
 
+#if !(defined (__i386__) || defined (__x86_64__))
+void
+grub_arch_sync_caches (void *address __attribute__ ((unused)),
+                      grub_size_t len __attribute__ ((unused)))
+{
+}
 #endif
 
 #ifndef  HAVE_ASPRINTF
@@ -370,23 +303,6 @@ asprintf (char **buf, const char *fmt, ...)
 
 #endif
 
-char *
-xasprintf (const char *fmt, ...)
-{
-  va_list ap;
-  char *result;
-
-  va_start (ap, fmt);
-  if (vasprintf (&result, fmt, ap) < 0)
-    {
-      if (errno == ENOMEM)
-       grub_util_error ("out of memory");
-      return NULL;
-    }
-
-  return result;
-}
-
 #ifdef __MINGW32__
 
 void sync (void)
@@ -482,104 +398,6 @@ get_win32_path (const char *path)
 }
 #endif
 
-/* This function never prints trailing slashes (so that its output
-   can be appended a slash unconditionally).  */
-char *
-make_system_path_relative_to_its_root (const char *path)
-{
-  struct stat st;
-  char *p, *buf, *buf2, *buf3;
-  uintptr_t offset = 0;
-  dev_t num;
-  size_t len;
-
-  /* canonicalize.  */
-  p = canonicalize_file_name (path);
-
-  if (p == NULL)
-    grub_util_error ("failed to get canonical path of %s", path);
-
-  len = strlen (p) + 1;
-  buf = xstrdup (p);
-  free (p);
-
-  if (stat (buf, &st) < 0)
-    grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
-
-  buf2 = xstrdup (buf);
-  num = st.st_dev;
-
-  /* This loop sets offset to the number of chars of the root
-     directory we're inspecting.  */
-  while (1)
-    {
-      p = strrchr (buf, '/');
-      if (p == NULL)
-       /* This should never happen.  */
-       grub_util_error ("FIXME: no / in buf. (make_system_path_relative_to_its_root)");
-      if (p != buf)
-       *p = 0;
-      else
-       *++p = 0;
-
-      if (stat (buf, &st) < 0)
-       grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
-
-      /* buf is another filesystem; we found it.  */
-      if (st.st_dev != num)
-       {
-         /* offset == 0 means path given is the mount point.
-            This works around special-casing of "/" in Un*x.  This function never
-            prints trailing slashes (so that its output can be appended a slash
-            unconditionally).  Each slash in is considered a preceding slash, and
-            therefore the root directory is an empty string.  */
-         if (offset == 0)
-           {
-             free (buf);
-             free (buf2);
-             return xstrdup ("");
-           }
-         else
-           break;
-       }
-
-      offset = p - buf;
-      /* offset == 1 means root directory.  */
-      if (offset == 1)
-       {
-         /* Include leading slash.  */
-         offset = 0;
-         break;
-       }
-    }
-  free (buf);
-  buf3 = xstrdup (buf2 + offset);
-  free (buf2);
-
-#ifdef __CYGWIN__
-  if (st.st_dev != (DEV_CYGDRIVE_MAJOR << 16))
-    {
-      /* Reached some mount point not below /cygdrive.
-        GRUB does not know Cygwin's emulated mounts,
-        convert to Win32 path.  */
-      grub_util_info ("Cygwin path = %s\n", buf3);
-      char * temp = get_win32_path (buf3);
-      free (buf3);
-      buf3 = temp;
-    }
-#endif
-
-  /* Remove trailing slashes, return empty string if root directory.  */
-  len = strlen (buf3);
-  while (len > 0 && buf3[len - 1] == '/')
-    {
-      buf3[len - 1] = '\0';
-      len--;
-    }
-
-  return buf3;
-}
-
 #ifdef GRUB_UTIL
 void
 grub_util_init_nls (void)
index ec3ecd2..edf865a 100644 (file)
@@ -19,6 +19,7 @@
 
 /* We only support RAID on Linux.  */
 #ifdef __linux__
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/raid.h>
 
index 8b33beb..7eadffd 100644 (file)
@@ -21,8 +21,9 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <grub/util/resolve.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
+#include <grub/util/resolve.h>
 
 /* Module.  */
 struct mod_list
index 06bc167..7051fd0 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/device.h>
 #include <grub/i18n.h>
@@ -29,7 +30,7 @@
 #include <grub/msdos_partition.h>
 #include <grub/gpt_partition.h>
 #include <grub/env.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/term.h>
@@ -37,8 +38,6 @@
 #include <grub/util/lvm.h>
 #include <grub/util/ofpath.h>
 
-#include <grub_setup_init.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -46,7 +45,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 
 #define _GNU_SOURCE    1
 #include <getopt.h>
@@ -83,27 +82,6 @@ struct boot_blocklist
   grub_uint32_t len;
 } __attribute__ ((packed));
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-int
-grub_getkey (void)
-{
-  return -1;
-}
-
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
 static void
 setup (const char *prefix, const char *dir,
        const char *boot_file, const char *core_file,
@@ -627,8 +605,8 @@ main (int argc, char *argv[])
 
   find_dest_dev (&ginfo, argv);
 
-  ginfo.prefix = make_system_path_relative_to_its_root (ginfo.dir ?
-                                                       : DEFAULT_DIRECTORY);
+  ginfo.prefix = grub_make_system_path_relative_to_its_root (ginfo.dir ?
+                                                            : DEFAULT_DIRECTORY);
 
   check_root_dev (&ginfo);