2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
# -*- makefile -*-
|
|
|
|
|
|
2010-02-10 00:09:23 +00:00
|
|
|
# Used by various components. These rules need to precede them.
|
|
|
|
|
script/lexer.c_DEPENDENCIES = grub_script.tab.h
|
|
|
|
|
|
2009-11-25 23:10:02 +00:00
|
|
|
sbin_UTILITIES += grub-mkdevicemap
|
|
|
|
|
grub_mkdevicemap_SOURCES = gnulib/progname.c util/grub-mkdevicemap.c \
|
|
|
|
|
util/deviceiter.c \
|
2009-12-08 16:00:52 +00:00
|
|
|
util/misc.c
|
|
|
|
|
|
|
|
|
|
ifeq ($(target_cpu)-$(platform), sparc64-ieee1275)
|
|
|
|
|
grub_mkdevicemap_SOURCES += util/ieee1275/ofpath.c util/ieee1275/devicemap.c
|
|
|
|
|
else
|
|
|
|
|
grub_mkdevicemap_SOURCES += util/devicemap.c
|
|
|
|
|
endif
|
2009-11-25 23:10:02 +00:00
|
|
|
|
2008-08-14 18:59:33 +00:00
|
|
|
# For grub-mkelfimage.
|
|
|
|
|
bin_UTILITIES += grub-mkelfimage
|
2009-11-25 23:10:02 +00:00
|
|
|
grub_mkelfimage_SOURCES = gnulib/progname.c \
|
|
|
|
|
util/elf/grub-mkimage.c util/misc.c \
|
2008-08-14 18:59:33 +00:00
|
|
|
util/resolve.c
|
|
|
|
|
util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
|
|
|
|
|
|
2008-01-30 15:32:56 +00:00
|
|
|
# For grub-probe.
|
|
|
|
|
sbin_UTILITIES += grub-probe
|
|
|
|
|
util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
|
2009-11-25 23:10:02 +00:00
|
|
|
grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c \
|
2010-02-07 15:13:59 +00:00
|
|
|
util/hostdisk.c util/misc.c util/getroot.c util/mm.c \
|
2008-01-30 15:32:56 +00:00
|
|
|
kern/device.c kern/disk.c kern/err.c kern/misc.c \
|
2010-03-03 10:44:12 +00:00
|
|
|
kern/parser.c kern/partition.c kern/file.c kern/list.c \
|
2008-01-30 15:32:56 +00:00
|
|
|
\
|
2009-02-09 18:00:36 +00:00
|
|
|
fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
|
2008-02-24 15:34:15 +00:00
|
|
|
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
|
2010-04-24 20:09:08 +00:00
|
|
|
fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c \
|
|
|
|
|
fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c \
|
|
|
|
|
fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c \
|
2008-01-30 15:32:56 +00:00
|
|
|
\
|
2010-02-06 17:43:37 +00:00
|
|
|
partmap/msdos.c partmap/bsdlabel.c partmap/apple.c \
|
2010-02-06 20:36:24 +00:00
|
|
|
partmap/sun.c partmap/sunpc.c partmap/gpt.c \
|
2008-01-30 15:32:56 +00:00
|
|
|
kern/fs.c kern/env.c fs/fshelp.c \
|
2009-02-07 20:55:48 +00:00
|
|
|
disk/raid.c disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
|
2008-01-30 15:32:56 +00:00
|
|
|
|
2008-02-06 16:02:44 +00:00
|
|
|
ifeq ($(enable_grub_fstest), yes)
|
|
|
|
|
bin_UTILITIES += grub-fstest
|
|
|
|
|
endif
|
|
|
|
|
|
2009-11-08 23:04:43 +00:00
|
|
|
bin_UTILITIES += grub-mkisofs
|
2009-11-09 19:58:24 +00:00
|
|
|
grub_mkisofs_SOURCES = util/mkisofs/eltorito.c \
|
2009-11-08 23:01:34 +00:00
|
|
|
util/mkisofs/hash.c util/mkisofs/joliet.c \
|
|
|
|
|
util/mkisofs/match.c util/mkisofs/mkisofs.c \
|
|
|
|
|
util/mkisofs/multi.c util/mkisofs/name.c \
|
|
|
|
|
util/mkisofs/rock.c util/mkisofs/tree.c \
|
2009-11-09 19:58:24 +00:00
|
|
|
util/mkisofs/write.c \
|
|
|
|
|
\
|
2009-11-16 18:49:44 +00:00
|
|
|
gnulib/fnmatch.c gnulib/getopt1.c gnulib/getopt.c \
|
2009-11-18 23:05:59 +00:00
|
|
|
gnulib/error.c gnulib/progname.c
|
2009-11-11 00:23:29 +00:00
|
|
|
grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 \
|
2009-11-17 10:31:08 +00:00
|
|
|
-I$(srcdir)/util/mkisofs/include \
|
2010-03-28 19:43:42 +00:00
|
|
|
-Wno-all -Werror $(GNULIB_UTIL_CFLAGS)
|
2009-11-08 23:01:34 +00:00
|
|
|
|
2008-02-06 16:02:44 +00:00
|
|
|
# For grub-fstest.
|
|
|
|
|
util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
|
2009-11-25 23:10:02 +00:00
|
|
|
grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c util/hostfs.c \
|
2010-02-07 15:13:59 +00:00
|
|
|
util/misc.c util/mm.c \
|
2008-02-06 16:02:44 +00:00
|
|
|
kern/file.c kern/device.c kern/disk.c kern/err.c kern/misc.c \
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
disk/host.c disk/loopback.c kern/list.c kern/command.c \
|
2009-04-14 01:54:06 +00:00
|
|
|
lib/arg.c commands/extcmd.c normal/datetime.c normal/misc.c \
|
2008-08-23 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_probe_SOURCES): Add disk/mdraid_linux.c.
(grub_fstest_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
disk/mdraid_linux.c and disk/dmraid_nvidia.c and lib/crc.c.
(pkglib_MODULES): Add raid5rec.mod, raid6rec.mod, mdraid.mod and
dm_nv.mod.
(raid5rec_mod_SOURCES): New macro.
(raid5rec_mod_CFLAGS): Likewise.
(raid5rec_mod_LDFLAGS): Likewise.
(raid6rec_mod_SOURCES): Likewise.
(raid6rec_mod_CFLAGS): Likewise.
(raid6rec_mod_LDFLAGS): Likewise.
(mdraid_mod_SOURCES): Likewise.
(mdraid_mod_CFLAGS): Likewise.
(mdraid_mod_LDFLAGS): Likewise.
(dm_nv_mod_SOURCES): Likewise.
(dm_nv_mod_CFLAGS): Likewise.
(dm_nv_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add disk/mdraid_linux.c.
(grub_emu_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
disk/mdraid_linux.c and disk/dmraid_nvidia.c.
* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add disk/raid5_recover.c,
disk/raid6_recover.c, disk/mdraid_linux.c and disk/dmraid_nvidia.c.
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* disk/raid5_recover.c: New file.
* disk/raid6_recover.c: Likewise.
* disk/mdraid_linux.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* disk/i386/pc/biosdisk.c: Set total_sectors of cdrom device to
ULONG_MAX.
* disk/raid.c (grub_raid_open): Use the size of the smallest disk to
calculate the size of raid device.
(grub_raid_read): Simplify raid0 code. Support raid4, raid6 and four
different layout of raid5.
(grub_raid_scan_device): Remove code specific to mdraid.
(grub_raid_list): New variable.
(free_array): New function.
(grub_raid_register): Likewise.
(grub_raid_unregister): Likewise.
(grub_raid_rescan): Likewise.
(GRUB_MOD_INIT): Don't iterate device here.
(GRUB_MOD_FINI): Use free_array to release resource.
* include/grub/raid.h: Remove macro and structure specific to mdraid.
(grub_raid5_recover_func_t): New function variable type.
(grub_raid6_recover_func_t): Likewise.
(grub_raid5_recover_func): New variable.
(grub_raid6_recover_func): Likewise.
(grub_raid_register): New function.
(grub_raid_unregister): Likewise.
(grub_raid_rescan): Likewise.
(grub_raid_block_xor): Likewise.
* util/grub-fstest.c: Add #include <grub/raid.h> and <grub/lib/crc.h>.
(CMD_CRC): New macro.
(part): Removed.
(read_file): Handle device as well as file.
(cmd_crc): New function.
(fstest): Handle multiple disks.
(options): Remove part, raw and long, add root and diskcount.
(usage): Add crc, remove -p, -r, -l, add -r and -c.
(main): Find the first non option entry and ignore subsequence options,
add handling for the new options, support multiple disks.
* util/grub-probe.c (probe): Add mdraid to abstraction_name.
2008-08-23 14:51:19 +00:00
|
|
|
lib/hexdump.c lib/crc.c commands/blocklist.c commands/ls.c \
|
2008-02-06 16:02:44 +00:00
|
|
|
\
|
2009-02-09 18:00:36 +00:00
|
|
|
fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c \
|
2008-02-24 15:34:15 +00:00
|
|
|
fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c \
|
2010-04-24 20:09:08 +00:00
|
|
|
fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c \
|
2009-08-28 13:01:26 +00:00
|
|
|
fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c fs/befs.c \
|
|
|
|
|
fs/befs_be.c fs/tar.c \
|
2008-02-06 16:02:44 +00:00
|
|
|
\
|
2010-02-06 20:36:24 +00:00
|
|
|
kern/partition.c partmap/msdos.c partmap/bsdlabel.c \
|
|
|
|
|
partmap/apple.c partmap/sun.c partmap/sunpc.c partmap/gpt.c \
|
2009-02-07 20:55:48 +00:00
|
|
|
kern/fs.c kern/env.c fs/fshelp.c disk/raid.c \
|
2008-08-23 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_probe_SOURCES): Add disk/mdraid_linux.c.
(grub_fstest_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
disk/mdraid_linux.c and disk/dmraid_nvidia.c and lib/crc.c.
(pkglib_MODULES): Add raid5rec.mod, raid6rec.mod, mdraid.mod and
dm_nv.mod.
(raid5rec_mod_SOURCES): New macro.
(raid5rec_mod_CFLAGS): Likewise.
(raid5rec_mod_LDFLAGS): Likewise.
(raid6rec_mod_SOURCES): Likewise.
(raid6rec_mod_CFLAGS): Likewise.
(raid6rec_mod_LDFLAGS): Likewise.
(mdraid_mod_SOURCES): Likewise.
(mdraid_mod_CFLAGS): Likewise.
(mdraid_mod_LDFLAGS): Likewise.
(dm_nv_mod_SOURCES): Likewise.
(dm_nv_mod_CFLAGS): Likewise.
(dm_nv_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add disk/mdraid_linux.c.
(grub_emu_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
disk/mdraid_linux.c and disk/dmraid_nvidia.c.
* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add disk/raid5_recover.c,
disk/raid6_recover.c, disk/mdraid_linux.c and disk/dmraid_nvidia.c.
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* disk/raid5_recover.c: New file.
* disk/raid6_recover.c: Likewise.
* disk/mdraid_linux.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* disk/i386/pc/biosdisk.c: Set total_sectors of cdrom device to
ULONG_MAX.
* disk/raid.c (grub_raid_open): Use the size of the smallest disk to
calculate the size of raid device.
(grub_raid_read): Simplify raid0 code. Support raid4, raid6 and four
different layout of raid5.
(grub_raid_scan_device): Remove code specific to mdraid.
(grub_raid_list): New variable.
(free_array): New function.
(grub_raid_register): Likewise.
(grub_raid_unregister): Likewise.
(grub_raid_rescan): Likewise.
(GRUB_MOD_INIT): Don't iterate device here.
(GRUB_MOD_FINI): Use free_array to release resource.
* include/grub/raid.h: Remove macro and structure specific to mdraid.
(grub_raid5_recover_func_t): New function variable type.
(grub_raid6_recover_func_t): Likewise.
(grub_raid5_recover_func): New variable.
(grub_raid6_recover_func): Likewise.
(grub_raid_register): New function.
(grub_raid_unregister): Likewise.
(grub_raid_rescan): Likewise.
(grub_raid_block_xor): Likewise.
* util/grub-fstest.c: Add #include <grub/raid.h> and <grub/lib/crc.h>.
(CMD_CRC): New macro.
(part): Removed.
(read_file): Handle device as well as file.
(cmd_crc): New function.
(fstest): Handle multiple disks.
(options): Remove part, raw and long, add root and diskcount.
(usage): Add crc, remove -p, -r, -l, add -r and -c.
(main): Find the first non option entry and ignore subsequence options,
add handling for the new options, support multiple disks.
* util/grub-probe.c (probe): Add mdraid to abstraction_name.
2008-08-23 14:51:19 +00:00
|
|
|
disk/raid5_recover.c disk/raid6_recover.c \
|
2009-02-07 20:55:48 +00:00
|
|
|
disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c \
|
2008-02-06 16:02:44 +00:00
|
|
|
grub_fstest_init.c
|
|
|
|
|
|
2009-01-13 16:34:26 +00:00
|
|
|
# For grub-mkfont.
|
|
|
|
|
ifeq ($(enable_grub_mkfont), yes)
|
|
|
|
|
bin_UTILITIES += grub-mkfont
|
2010-03-29 00:06:40 +00:00
|
|
|
grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c unidata.c
|
2009-01-13 16:34:26 +00:00
|
|
|
grub_mkfont_CFLAGS = $(freetype_cflags)
|
|
|
|
|
grub_mkfont_LDFLAGS = $(freetype_libs)
|
|
|
|
|
endif
|
|
|
|
|
|
2009-11-08 00:49:15 +00:00
|
|
|
# For grub-mkrelpath.
|
|
|
|
|
bin_UTILITIES += grub-mkrelpath
|
2009-11-25 23:10:02 +00:00
|
|
|
grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c
|
2009-11-08 00:49:15 +00:00
|
|
|
|
2010-01-10 22:13:53 +00:00
|
|
|
bin_UTILITIES += grub-bin2h
|
2010-01-14 20:33:10 +00:00
|
|
|
grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
|
2010-01-10 22:13:53 +00:00
|
|
|
|
2010-01-22 13:37:27 +00:00
|
|
|
# For the lexer.
|
|
|
|
|
grub_script.yy.c grub_script.yy.h: script/yylex.l
|
|
|
|
|
$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(srcdir)/script/yylex.l
|
|
|
|
|
DISTCLEANFILES += grub_script.yy.c grub_script.yy.h
|
|
|
|
|
|
2010-01-09 14:57:58 +00:00
|
|
|
# For grub-script-check.
|
|
|
|
|
bin_UTILITIES += grub-script-check
|
|
|
|
|
util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
|
2010-02-06 14:37:23 +00:00
|
|
|
grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c \
|
2010-02-07 15:13:59 +00:00
|
|
|
util/grub-script-check.c util/misc.c util/mm.c \
|
2010-01-09 14:57:58 +00:00
|
|
|
script/main.c script/script.c script/function.c script/lexer.c \
|
|
|
|
|
kern/handler.c kern/err.c kern/parser.c kern/list.c \
|
2010-01-22 13:37:27 +00:00
|
|
|
kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c \
|
|
|
|
|
grub_script.yy.c
|
2010-03-28 19:43:42 +00:00
|
|
|
grub_script_check_CFLAGS = $(GNULIB_UTIL_CFLAGS)
|
2010-02-09 23:16:28 +00:00
|
|
|
MOSTLYCLEANFILES += symlist.c kernel_syms.lst
|
|
|
|
|
DEFSYMFILES += kernel_syms.lst
|
|
|
|
|
|
2010-02-10 00:05:40 +00:00
|
|
|
kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
|
|
|
|
|
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
|
|
|
|
|
partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
|
2010-04-10 23:14:31 +00:00
|
|
|
list.h handler.h command.h i18n.h env_private.h libgcc.h
|
2010-02-10 00:05:40 +00:00
|
|
|
|
2010-02-10 01:03:04 +00:00
|
|
|
ifneq ($(platform), emu)
|
|
|
|
|
kernel_img_HEADERS += machine/memory.h machine/loader.h machine/kernel.h
|
|
|
|
|
endif
|
2010-02-10 00:05:40 +00:00
|
|
|
|
2010-02-09 23:16:28 +00:00
|
|
|
symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
|
|
|
|
|
/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
|
|
|
|
|
|
|
|
|
|
kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
|
|
|
|
|
/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
|
|
|
|
|
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
# For the parser.
|
2009-11-23 15:37:33 +00:00
|
|
|
grub_script.tab.c grub_script.tab.h: script/parser.y
|
|
|
|
|
$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
|
2005-12-25 Yoshinori K. Okuji <okuji@enbug.org>
* DISTLIST: Added geninitheader.sh, geninit.sh, commands/test.c,
commands/i386/pc/play.c, conf/common.mk, conf/common.rmk,
include/grub/parser.h, include/grub/script.h, kern/parser.c,
kern/sparc64/cache.S, normal/execute.c, normal/function.c,
normal/lexer.c, normal/parser.y, normal/script.c, and
partmap/gpt.c.
Removed kern/sparc64/cache.c.
* conf/common.rmk (DISTCLEANFILES): Added grub_script.tab.c,
grub_script.tab.h, grub_modules_init.lst, grub_modules_init.h,
grub_emu_init.c.
* configure.ac (AC_INIT): Bumped to 1.92.
2005-12-25 15:22:55 +00:00
|
|
|
DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
|
2010-01-09 15:01:33 +00:00
|
|
|
# For grub-script-check.
|
2010-01-09 14:57:58 +00:00
|
|
|
grub_script_check_init.lst: geninit.sh $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES))
|
|
|
|
|
rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
|
|
|
|
|
DISTCLEANFILES += grub_script_check_init.lst
|
|
|
|
|
|
|
|
|
|
grub_script_check_init.h: grub_script_check_init.lst $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES)) geninitheader.sh
|
|
|
|
|
rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
|
|
|
|
|
DISTCLEANFILES += grub_script_check_init.h
|
|
|
|
|
|
|
|
|
|
grub_script_check_init.c: grub_script_check_init.lst $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES)) geninit.sh
|
|
|
|
|
rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
|
|
|
|
|
DISTCLEANFILES += grub_script_check_init.c
|
|
|
|
|
|
2007-07-22 19:17:27 +00:00
|
|
|
# For grub-probe.
|
|
|
|
|
grub_probe_init.lst: geninit.sh $(filter-out grub_probe_init.c,$(grub_probe_SOURCES))
|
|
|
|
|
rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
|
|
|
|
|
DISTCLEANFILES += grub_probe_init.lst
|
|
|
|
|
|
|
|
|
|
grub_probe_init.h: grub_probe_init.lst $(filter-out grub_probe_init.c,$(grub_probe_SOURCES)) geninitheader.sh
|
|
|
|
|
rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
|
|
|
|
|
DISTCLEANFILES += grub_probe_init.h
|
|
|
|
|
|
|
|
|
|
grub_probe_init.c: grub_probe_init.lst $(filter-out grub_probe_init.c,$(grub_probe_SOURCES)) geninit.sh grub_probe_init.h
|
|
|
|
|
rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
|
|
|
|
|
DISTCLEANFILES += grub_probe_init.c
|
|
|
|
|
|
|
|
|
|
# For grub-setup.
|
|
|
|
|
grub_setup_init.lst: geninit.sh $(filter-out grub_setup_init.c,$(grub_setup_SOURCES))
|
|
|
|
|
rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
|
|
|
|
|
DISTCLEANFILES += grub_setup_init.lst
|
|
|
|
|
|
|
|
|
|
grub_setup_init.h: grub_setup_init.lst $(filter-out grub_setup_init.c,$(grub_setup_SOURCES)) geninitheader.sh
|
|
|
|
|
rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
|
|
|
|
|
DISTCLEANFILES += grub_setup_init.h
|
|
|
|
|
|
|
|
|
|
grub_setup_init.c: grub_setup_init.lst $(filter-out grub_setup_init.c,$(grub_setup_SOURCES)) geninit.sh grub_setup_init.h
|
|
|
|
|
rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
|
|
|
|
|
DISTCLEANFILES += grub_setup_init.c
|
|
|
|
|
|
2008-02-04 08:45:07 +00:00
|
|
|
# For grub-fstest.
|
|
|
|
|
grub_fstest_init.lst: geninit.sh $(filter-out grub_fstest_init.c,$(grub_fstest_SOURCES))
|
|
|
|
|
rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
|
|
|
|
|
DISTCLEANFILES += grub_fstest_init.lst
|
|
|
|
|
|
|
|
|
|
grub_fstest_init.h: grub_fstest_init.lst $(filter-out grub_fstest_init.c,$(grub_fstest_SOURCES)) geninitheader.sh
|
|
|
|
|
rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
|
|
|
|
|
DISTCLEANFILES += grub_fstest_init.h
|
|
|
|
|
|
|
|
|
|
grub_fstest_init.c: grub_fstest_init.lst $(filter-out grub_fstest_init.c,$(grub_fstest_SOURCES)) geninit.sh grub_fstest_init.h
|
|
|
|
|
rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
|
|
|
|
|
DISTCLEANFILES += grub_fstest_init.c
|
|
|
|
|
|
2008-07-02 07:20:11 +00:00
|
|
|
# for grub-editenv
|
|
|
|
|
bin_UTILITIES += grub-editenv
|
2010-02-07 15:13:59 +00:00
|
|
|
grub_editenv_SOURCES = gnulib/progname.c util/grub-editenv.c lib/envblk.c util/misc.c util/mm.c kern/misc.c kern/err.c
|
2008-07-02 07:20:11 +00:00
|
|
|
CLEANFILES += grub-editenv
|
|
|
|
|
|
2009-09-13 01:30:18 +00:00
|
|
|
# Needed for genmk.rb to work
|
|
|
|
|
ifeq (0,1)
|
|
|
|
|
bin_UTILITIES += grub-macho2img grub-pe2elf
|
2008-08-09 12:30:26 +00:00
|
|
|
endif
|
|
|
|
|
|
2009-11-25 23:10:02 +00:00
|
|
|
grub_pe2elf_SOURCES = gnulib/progname.c util/grub-pe2elf.c util/misc.c
|
2008-07-24 14:56:30 +00:00
|
|
|
CLEANFILES += grub-pe2elf
|
|
|
|
|
|
2009-06-04 21:01:11 +00:00
|
|
|
grub_macho2img_SOURCES = util/grub-macho2img.c
|
|
|
|
|
CLEANFILES += grub-macho2img
|
|
|
|
|
|
2008-09-29 14:57:05 +00:00
|
|
|
# For grub-mkconfig
|
|
|
|
|
grub-mkconfig: util/grub-mkconfig.in config.status
|
2007-05-04 07:11:44 +00:00
|
|
|
./config.status --file=$@:$<
|
|
|
|
|
chmod +x $@
|
2008-09-29 14:57:05 +00:00
|
|
|
sbin_SCRIPTS += grub-mkconfig
|
|
|
|
|
CLEANFILES += grub-mkconfig
|
|
|
|
|
|
|
|
|
|
grub-mkconfig_lib: util/grub-mkconfig_lib.in config.status
|
|
|
|
|
./config.status --file=$@:$<
|
|
|
|
|
chmod +x $@
|
2009-06-12 02:10:21 +00:00
|
|
|
lib_SCRIPTS += grub-mkconfig_lib
|
2008-09-29 14:57:05 +00:00
|
|
|
CLEANFILES += grub-mkconfig_lib
|
2007-05-04 07:11:44 +00:00
|
|
|
|
2007-05-20 09:10:06 +00:00
|
|
|
update-grub_lib: util/update-grub_lib.in config.status
|
|
|
|
|
./config.status --file=$@:$<
|
|
|
|
|
chmod +x $@
|
2009-06-12 02:10:21 +00:00
|
|
|
lib_SCRIPTS += update-grub_lib
|
2007-05-20 09:10:06 +00:00
|
|
|
CLEANFILES += update-grub_lib
|
|
|
|
|
|
2009-11-13 20:39:33 +00:00
|
|
|
grub-gettext_lib: util/grub-gettext_lib.in config.status
|
|
|
|
|
./config.status --file=$@:$<
|
|
|
|
|
chmod +x $@
|
|
|
|
|
lib_DATA += grub-gettext_lib
|
|
|
|
|
CLEANFILES += grub-gettext_lib
|
|
|
|
|
|
2008-07-11 20:09:14 +00:00
|
|
|
%: util/grub.d/%.in config.status
|
2007-05-04 07:11:44 +00:00
|
|
|
./config.status --file=$@:$<
|
|
|
|
|
chmod +x $@
|
2009-03-04 22:00:41 +00:00
|
|
|
grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom
|
|
|
|
|
ifneq (, $(host_kernel))
|
|
|
|
|
grub-mkconfig_SCRIPTS += 10_$(host_kernel)
|
2008-08-09 12:30:26 +00:00
|
|
|
endif
|
|
|
|
|
|
2008-09-29 14:57:05 +00:00
|
|
|
CLEANFILES += $(grub-mkconfig_SCRIPTS)
|
2008-04-13 10:51:54 +00:00
|
|
|
|
2008-09-29 14:57:05 +00:00
|
|
|
grub-mkconfig_DATA += util/grub.d/README
|
2007-05-04 07:11:44 +00:00
|
|
|
|
2009-11-20 08:41:20 +00:00
|
|
|
# For grub-set-default.
|
|
|
|
|
grub-set-default: util/grub-set-default.in config.status
|
|
|
|
|
./config.status --file=$@:$<
|
|
|
|
|
chmod +x $@
|
|
|
|
|
sbin_SCRIPTS += grub-set-default
|
|
|
|
|
CLEANFILES += grub-set-default
|
|
|
|
|
|
|
|
|
|
# For grub-reboot.
|
|
|
|
|
grub-reboot: util/grub-reboot.in config.status
|
|
|
|
|
./config.status --file=$@:$<
|
|
|
|
|
chmod +x $@
|
|
|
|
|
sbin_SCRIPTS += grub-reboot
|
|
|
|
|
CLEANFILES += grub-reboot
|
|
|
|
|
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
# Filing systems.
|
2009-08-14 13:31:09 +00:00
|
|
|
pkglib_MODULES += fshelp.mod fat.mod ufs1.mod ufs2.mod ext2.mod ntfs.mod \
|
2007-12-21 11:41:23 +00:00
|
|
|
ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod \
|
2009-02-07 23:38:01 +00:00
|
|
|
affs.mod sfs.mod hfsplus.mod reiserfs.mod cpio.mod tar.mod \
|
2009-08-28 13:01:26 +00:00
|
|
|
udf.mod afs.mod afs_be.mod befs.mod befs_be.mod
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
|
|
|
|
|
# For fshelp.mod.
|
|
|
|
|
fshelp_mod_SOURCES = fs/fshelp.c
|
|
|
|
|
fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For fat.mod.
|
|
|
|
|
fat_mod_SOURCES = fs/fat.c
|
|
|
|
|
fat_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-08-14 13:31:09 +00:00
|
|
|
# For ufs1.mod.
|
|
|
|
|
ufs1_mod_SOURCES = fs/ufs.c
|
|
|
|
|
ufs1_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
ufs1_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For ufs2.mod.
|
|
|
|
|
ufs2_mod_SOURCES = fs/ufs2.c
|
|
|
|
|
ufs2_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
ufs2_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
|
|
|
|
|
# For ext2.mod.
|
|
|
|
|
ext2_mod_SOURCES = fs/ext2.c
|
|
|
|
|
ext2_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2007-08-02 19:12:52 +00:00
|
|
|
# For ntfs.mod.
|
|
|
|
|
ntfs_mod_SOURCES = fs/ntfs.c
|
|
|
|
|
ntfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
ntfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2007-12-21 11:41:23 +00:00
|
|
|
# For ntfscomp.mod.
|
|
|
|
|
ntfscomp_mod_SOURCES = fs/ntfscomp.c
|
|
|
|
|
ntfscomp_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
ntfscomp_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
# For minix.mod.
|
|
|
|
|
minix_mod_SOURCES = fs/minix.c
|
|
|
|
|
minix_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2010-04-24 20:09:08 +00:00
|
|
|
# For nilfs2.mod.
|
|
|
|
|
pkglib_MODULES += nilfs2.mod
|
|
|
|
|
nilfs2_mod_SOURCES = fs/nilfs2.c
|
|
|
|
|
nilfs2_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
nilfs2_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
# For hfs.mod.
|
|
|
|
|
hfs_mod_SOURCES = fs/hfs.c
|
|
|
|
|
hfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For jfs.mod.
|
|
|
|
|
jfs_mod_SOURCES = fs/jfs.c
|
|
|
|
|
jfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For iso9660.mod.
|
|
|
|
|
iso9660_mod_SOURCES = fs/iso9660.c
|
|
|
|
|
iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For xfs.mod.
|
|
|
|
|
xfs_mod_SOURCES = fs/xfs.c
|
|
|
|
|
xfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For affs.mod.
|
|
|
|
|
affs_mod_SOURCES = fs/affs.c
|
|
|
|
|
affs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For sfs.mod.
|
|
|
|
|
sfs_mod_SOURCES = fs/sfs.c
|
|
|
|
|
sfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2005-12-25 15:59:50 +00:00
|
|
|
# For hfsplus.mod.
|
|
|
|
|
hfsplus_mod_SOURCES = fs/hfsplus.c
|
|
|
|
|
hfsplus_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
hfsplus_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-01-06 14:14:31 +00:00
|
|
|
# For reiserfs.mod.
|
|
|
|
|
reiserfs_mod_SOURCES = fs/reiserfs.c
|
|
|
|
|
reiserfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
reiserfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2007-12-26 07:51:19 +00:00
|
|
|
# For cpio.mod.
|
|
|
|
|
cpio_mod_SOURCES = fs/cpio.c
|
|
|
|
|
cpio_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
cpio_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-02-07 23:38:01 +00:00
|
|
|
# For tar.mod.
|
2009-06-10 17:02:15 +00:00
|
|
|
tar_mod_SOURCES = fs/tar.c
|
|
|
|
|
tar_mod_CFLAGS = $(COMMON_CFLAGS)
|
2009-02-07 23:38:01 +00:00
|
|
|
tar_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-02-24 15:34:15 +00:00
|
|
|
# For udf.mod.
|
|
|
|
|
udf_mod_SOURCES = fs/udf.c
|
|
|
|
|
udf_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
udf_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-03-31 11:18:00 +00:00
|
|
|
# For afs.mod.
|
|
|
|
|
afs_mod_SOURCES = fs/afs.c
|
|
|
|
|
afs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
afs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-08-28 13:01:26 +00:00
|
|
|
# For afs_be.mod.
|
|
|
|
|
afs_be_mod_SOURCES = fs/afs_be.c
|
|
|
|
|
afs_be_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
afs_be_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-07-20 21:18:59 +00:00
|
|
|
# For befs.mod.
|
|
|
|
|
befs_mod_SOURCES = fs/befs.c
|
|
|
|
|
befs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
befs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-08-28 13:01:26 +00:00
|
|
|
# For befs_be.mod.
|
|
|
|
|
befs_be_mod_SOURCES = fs/befs_be.c
|
|
|
|
|
befs_be_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
befs_be_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2005-12-03 17:54:55 +00:00
|
|
|
# Partition maps.
|
2009-08-23 Robert Millan <rmh.grub@aybabtu.com>
* partmap/pc.c: Rename to ...
* partmap/msdos.c: ... this. Update all users.
(grub_pc_partition_map): Rename to ...
(grub_msdos_partition_map): ... this. Update all users.
* parttool/pcpart.c: Rename to ...
* parttool/msdospart.c: ... this. Update all users.
* include/grub/pc_partition.h: Rename to ...
* include/grub/msdos_partition.h: ... this. Update all users.
(grub_pc_partition_bsd_entry): Rename to ...
(grub_msdos_partition_bsd_entry): ... this. Update all users.
(grub_pc_partition_disk_label): Rename to ...
(grub_msdos_partition_disk_label): ... this. Update all users.
(grub_pc_partition_entry): Rename to ...
(grub_msdos_partition_entry): ... this. Update all users.
(grub_pc_partition_mbr): Rename to ...
(grub_msdos_partition_mbr): ... this. Update all users.
(grub_pc_partition): Rename to ...
(grub_msdos_partition): ... this. Update all users.
(grub_pc_partition_is_empty): Rename to ...
(grub_msdos_partition_is_empty): ... this. Update all users.
(grub_pc_partition_is_extended): Rename to ...
(grub_msdos_partition_is_extended): ... this. Update all users.
(grub_pc_partition_is_bsd): Rename to ...
(grub_msdos_partition_is_bsd): ... this. Update all users.
* conf/common.rmk (amiga_mod_SOURCES, amiga_mod_CFLAGS)
(amiga_mod_LDFLAGS, apple_mod_SOURCES, apple_mod_CFLAGS)
(apple_mod_LDFLAGS, msdos_mod_SOURCES, msdos_mod_CFLAGS)
(msdos_mod_LDFLAGS, sun_mod_SOURCES, sun_mod_CFLAGS)
(sun_mod_LDFLAGS, acorn_mod_SOURCES, acorn_mod_CFLAGS)
(acorn_mod_LDFLAGS, gpt_mod_SOURCES, gpt_mod_CFLAGS)
(gpt_mod_LDFLAGS): Rename to ...
(part_amiga_mod_SOURCES, part_amiga_mod_CFLAGS, part_amiga_mod_LDFLAGS)
(part_apple_mod_SOURCES, part_apple_mod_CFLAGS, part_apple_mod_LDFLAGS)
(part_msdos_mod_SOURCES, part_msdos_mod_CFLAGS, part_msdos_mod_LDFLAGS)
(part_sun_mod_SOURCES, part_sun_mod_CFLAGS, part_sun_mod_LDFLAGS)
(part_acorn_mod_SOURCES, part_acorn_mod_CFLAGS, part_acorn_mod_LDFLAGS)
(part_gpt_mod_SOURCES, part_gpt_mod_CFLAGS)
(part_gpt_mod_LDFLAGS): ... this.
(pkglib_MODULES): Prefix partition modules with `part_'. Rename
`pcpart.mod' to `msdospart.mod'.
(pcpart_mod_SOURCES, pcpart_mod_CFLAGS, pcpart_mod_LDFLAGS): Rename
to ...
(msdospart_mod_SOURCES, msdospart_mod_CFLAGS)
(msdospart_mod_LDFLAGS): ... this.
2009-08-23 12:00:57 +00:00
|
|
|
|
|
|
|
|
pkglib_MODULES += part_amiga.mod
|
|
|
|
|
part_amiga_mod_SOURCES = partmap/amiga.c
|
|
|
|
|
part_amiga_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
part_amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
pkglib_MODULES += part_apple.mod
|
|
|
|
|
part_apple_mod_SOURCES = partmap/apple.c
|
|
|
|
|
part_apple_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
part_apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
pkglib_MODULES += part_msdos.mod
|
|
|
|
|
part_msdos_mod_SOURCES = partmap/msdos.c
|
|
|
|
|
part_msdos_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
part_msdos_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
pkglib_MODULES += part_sun.mod
|
|
|
|
|
part_sun_mod_SOURCES = partmap/sun.c
|
|
|
|
|
part_sun_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
part_sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
pkglib_MODULES += part_acorn.mod
|
|
|
|
|
part_acorn_mod_SOURCES = partmap/acorn.c
|
|
|
|
|
part_acorn_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
part_acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
pkglib_MODULES += part_gpt.mod
|
|
|
|
|
part_gpt_mod_SOURCES = partmap/gpt.c
|
|
|
|
|
part_gpt_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
part_gpt_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2005-12-03 17:54:55 +00:00
|
|
|
|
2010-02-06 17:43:37 +00:00
|
|
|
pkglib_MODULES += part_bsd.mod
|
|
|
|
|
part_bsd_mod_SOURCES = partmap/bsdlabel.c
|
|
|
|
|
part_bsd_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
part_bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2010-02-06 20:36:24 +00:00
|
|
|
pkglib_MODULES += part_sunpc.mod
|
|
|
|
|
part_sunpc_mod_SOURCES = partmap/sunpc.c
|
|
|
|
|
part_sunpc_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
part_sunpc_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-08-27 15:05:00 +00:00
|
|
|
# Special disk structures and generic drivers
|
2006-10-14 Yoshinori K. Okuji <okuji@enbug.org>
* DISTLIST: Added commands/echo.c, disk/lvm.c, disk/raid.c,
include/grub/bitmap.h, include/grub/lvm.h, include/grub/raid.h,
include/grub/i386/pc/vbeutil.h, include/grub/util/lvm.h,
include/grub/util/raid.h, util/lvm.c, util/raid.c, video/bitmap.c,
video/readers/tga.c and video/i386/pc/vbeutil.c.
2006-10-14 Jeroen Dekkers <jeroen@dekkers.cx>
Added support for RAID and LVM.
* disk/lvm.c: New file.
* disk/raid.c: Likewise.
* include/grub/lvm.h: Likewise.
* include/grub/raid.h: Likewise.
* include/grub/util/lvm.h: Likewise.
* include/grub/util/raid.h: Likewise.
* util/lvm.c: Likewise.
* util/raid.c: Likewise.
* include/grub/disk.h (grub_disk_dev_id): Add
GRUB_DISK_DEVICE_RAID_ID and GRUB_DISK_DEVICE_LVM_ID.
(grub_disk_get_size): New prototype.
* kern/disk.c (grub_disk_open): Check whether grub_partition_probe()
returns a partition.
(grub_disk_get_size): New function.
* kern/i386/pc/init.c (make_install_device): Copy the prefix
verbatim if grub_install_dos_part is -2.
* util/i386/pc/getroot.c (grub_guess_root_device): Support RAID
and LVM devices.
* util/i386/pc/grub-setup.c (setup): New argument
MUST_EMBED. Force embedding of GRUB when the argument is
true. Close FILE before returning.
(main): Add support for RAID and LVM.
* conf/common.rmk: Add RAID and LVM modules.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add util/raid.c and
util/lvm.c.
(grub_emu_SOURCES): Add disk/raid.c and disk/lvm.c.
* kern/misc.c (grub_strstr): New function.
* include/grub/misc.h (grub_strstr): New prototype.
2006-10-14 15:24:53 +00:00
|
|
|
|
2008-08-23 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_probe_SOURCES): Add disk/mdraid_linux.c.
(grub_fstest_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
disk/mdraid_linux.c and disk/dmraid_nvidia.c and lib/crc.c.
(pkglib_MODULES): Add raid5rec.mod, raid6rec.mod, mdraid.mod and
dm_nv.mod.
(raid5rec_mod_SOURCES): New macro.
(raid5rec_mod_CFLAGS): Likewise.
(raid5rec_mod_LDFLAGS): Likewise.
(raid6rec_mod_SOURCES): Likewise.
(raid6rec_mod_CFLAGS): Likewise.
(raid6rec_mod_LDFLAGS): Likewise.
(mdraid_mod_SOURCES): Likewise.
(mdraid_mod_CFLAGS): Likewise.
(mdraid_mod_LDFLAGS): Likewise.
(dm_nv_mod_SOURCES): Likewise.
(dm_nv_mod_CFLAGS): Likewise.
(dm_nv_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add disk/mdraid_linux.c.
(grub_emu_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
disk/mdraid_linux.c and disk/dmraid_nvidia.c.
* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add disk/raid5_recover.c,
disk/raid6_recover.c, disk/mdraid_linux.c and disk/dmraid_nvidia.c.
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* disk/raid5_recover.c: New file.
* disk/raid6_recover.c: Likewise.
* disk/mdraid_linux.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* disk/i386/pc/biosdisk.c: Set total_sectors of cdrom device to
ULONG_MAX.
* disk/raid.c (grub_raid_open): Use the size of the smallest disk to
calculate the size of raid device.
(grub_raid_read): Simplify raid0 code. Support raid4, raid6 and four
different layout of raid5.
(grub_raid_scan_device): Remove code specific to mdraid.
(grub_raid_list): New variable.
(free_array): New function.
(grub_raid_register): Likewise.
(grub_raid_unregister): Likewise.
(grub_raid_rescan): Likewise.
(GRUB_MOD_INIT): Don't iterate device here.
(GRUB_MOD_FINI): Use free_array to release resource.
* include/grub/raid.h: Remove macro and structure specific to mdraid.
(grub_raid5_recover_func_t): New function variable type.
(grub_raid6_recover_func_t): Likewise.
(grub_raid5_recover_func): New variable.
(grub_raid6_recover_func): Likewise.
(grub_raid_register): New function.
(grub_raid_unregister): Likewise.
(grub_raid_rescan): Likewise.
(grub_raid_block_xor): Likewise.
* util/grub-fstest.c: Add #include <grub/raid.h> and <grub/lib/crc.h>.
(CMD_CRC): New macro.
(part): Removed.
(read_file): Handle device as well as file.
(cmd_crc): New function.
(fstest): Handle multiple disks.
(options): Remove part, raw and long, add root and diskcount.
(usage): Add crc, remove -p, -r, -l, add -r and -c.
(main): Find the first non option entry and ignore subsequence options,
add handling for the new options, support multiple disks.
* util/grub-probe.c (probe): Add mdraid to abstraction_name.
2008-08-23 14:51:19 +00:00
|
|
|
pkglib_MODULES += raid.mod raid5rec.mod raid6rec.mod mdraid.mod dm_nv.mod \
|
2008-08-27 15:05:00 +00:00
|
|
|
lvm.mod scsi.mod
|
2006-10-14 Yoshinori K. Okuji <okuji@enbug.org>
* DISTLIST: Added commands/echo.c, disk/lvm.c, disk/raid.c,
include/grub/bitmap.h, include/grub/lvm.h, include/grub/raid.h,
include/grub/i386/pc/vbeutil.h, include/grub/util/lvm.h,
include/grub/util/raid.h, util/lvm.c, util/raid.c, video/bitmap.c,
video/readers/tga.c and video/i386/pc/vbeutil.c.
2006-10-14 Jeroen Dekkers <jeroen@dekkers.cx>
Added support for RAID and LVM.
* disk/lvm.c: New file.
* disk/raid.c: Likewise.
* include/grub/lvm.h: Likewise.
* include/grub/raid.h: Likewise.
* include/grub/util/lvm.h: Likewise.
* include/grub/util/raid.h: Likewise.
* util/lvm.c: Likewise.
* util/raid.c: Likewise.
* include/grub/disk.h (grub_disk_dev_id): Add
GRUB_DISK_DEVICE_RAID_ID and GRUB_DISK_DEVICE_LVM_ID.
(grub_disk_get_size): New prototype.
* kern/disk.c (grub_disk_open): Check whether grub_partition_probe()
returns a partition.
(grub_disk_get_size): New function.
* kern/i386/pc/init.c (make_install_device): Copy the prefix
verbatim if grub_install_dos_part is -2.
* util/i386/pc/getroot.c (grub_guess_root_device): Support RAID
and LVM devices.
* util/i386/pc/grub-setup.c (setup): New argument
MUST_EMBED. Force embedding of GRUB when the argument is
true. Close FILE before returning.
(main): Add support for RAID and LVM.
* conf/common.rmk: Add RAID and LVM modules.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add util/raid.c and
util/lvm.c.
(grub_emu_SOURCES): Add disk/raid.c and disk/lvm.c.
* kern/misc.c (grub_strstr): New function.
* include/grub/misc.h (grub_strstr): New prototype.
2006-10-14 15:24:53 +00:00
|
|
|
|
|
|
|
|
# For raid.mod
|
|
|
|
|
raid_mod_SOURCES = disk/raid.c
|
|
|
|
|
raid_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
raid_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-08-23 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_probe_SOURCES): Add disk/mdraid_linux.c.
(grub_fstest_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
disk/mdraid_linux.c and disk/dmraid_nvidia.c and lib/crc.c.
(pkglib_MODULES): Add raid5rec.mod, raid6rec.mod, mdraid.mod and
dm_nv.mod.
(raid5rec_mod_SOURCES): New macro.
(raid5rec_mod_CFLAGS): Likewise.
(raid5rec_mod_LDFLAGS): Likewise.
(raid6rec_mod_SOURCES): Likewise.
(raid6rec_mod_CFLAGS): Likewise.
(raid6rec_mod_LDFLAGS): Likewise.
(mdraid_mod_SOURCES): Likewise.
(mdraid_mod_CFLAGS): Likewise.
(mdraid_mod_LDFLAGS): Likewise.
(dm_nv_mod_SOURCES): Likewise.
(dm_nv_mod_CFLAGS): Likewise.
(dm_nv_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add disk/mdraid_linux.c.
(grub_emu_SOURCES): Add disk/raid5_recover.c, disk/raid6_recover.c,
disk/mdraid_linux.c and disk/dmraid_nvidia.c.
* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add disk/raid5_recover.c,
disk/raid6_recover.c, disk/mdraid_linux.c and disk/dmraid_nvidia.c.
* conf/i386-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/x86_64-efi.rmk (grub_emu_SOURCES): Likewise.
* conf/i386-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
* disk/raid5_recover.c: New file.
* disk/raid6_recover.c: Likewise.
* disk/mdraid_linux.c: Likewise.
* disk/dmraid_nvidia.c: Likewise.
* disk/i386/pc/biosdisk.c: Set total_sectors of cdrom device to
ULONG_MAX.
* disk/raid.c (grub_raid_open): Use the size of the smallest disk to
calculate the size of raid device.
(grub_raid_read): Simplify raid0 code. Support raid4, raid6 and four
different layout of raid5.
(grub_raid_scan_device): Remove code specific to mdraid.
(grub_raid_list): New variable.
(free_array): New function.
(grub_raid_register): Likewise.
(grub_raid_unregister): Likewise.
(grub_raid_rescan): Likewise.
(GRUB_MOD_INIT): Don't iterate device here.
(GRUB_MOD_FINI): Use free_array to release resource.
* include/grub/raid.h: Remove macro and structure specific to mdraid.
(grub_raid5_recover_func_t): New function variable type.
(grub_raid6_recover_func_t): Likewise.
(grub_raid5_recover_func): New variable.
(grub_raid6_recover_func): Likewise.
(grub_raid_register): New function.
(grub_raid_unregister): Likewise.
(grub_raid_rescan): Likewise.
(grub_raid_block_xor): Likewise.
* util/grub-fstest.c: Add #include <grub/raid.h> and <grub/lib/crc.h>.
(CMD_CRC): New macro.
(part): Removed.
(read_file): Handle device as well as file.
(cmd_crc): New function.
(fstest): Handle multiple disks.
(options): Remove part, raw and long, add root and diskcount.
(usage): Add crc, remove -p, -r, -l, add -r and -c.
(main): Find the first non option entry and ignore subsequence options,
add handling for the new options, support multiple disks.
* util/grub-probe.c (probe): Add mdraid to abstraction_name.
2008-08-23 14:51:19 +00:00
|
|
|
# For raid5rec.mod
|
|
|
|
|
raid5rec_mod_SOURCES = disk/raid5_recover.c
|
|
|
|
|
raid5rec_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
raid5rec_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For raid6rec.mod
|
|
|
|
|
raid6rec_mod_SOURCES = disk/raid6_recover.c
|
|
|
|
|
raid6rec_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
raid6rec_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For mdraid.mod
|
|
|
|
|
mdraid_mod_SOURCES = disk/mdraid_linux.c
|
|
|
|
|
mdraid_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
mdraid_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For dm_nv.mod
|
|
|
|
|
dm_nv_mod_SOURCES = disk/dmraid_nvidia.c
|
|
|
|
|
dm_nv_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
dm_nv_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For lvm.mod
|
2006-10-14 Yoshinori K. Okuji <okuji@enbug.org>
* DISTLIST: Added commands/echo.c, disk/lvm.c, disk/raid.c,
include/grub/bitmap.h, include/grub/lvm.h, include/grub/raid.h,
include/grub/i386/pc/vbeutil.h, include/grub/util/lvm.h,
include/grub/util/raid.h, util/lvm.c, util/raid.c, video/bitmap.c,
video/readers/tga.c and video/i386/pc/vbeutil.c.
2006-10-14 Jeroen Dekkers <jeroen@dekkers.cx>
Added support for RAID and LVM.
* disk/lvm.c: New file.
* disk/raid.c: Likewise.
* include/grub/lvm.h: Likewise.
* include/grub/raid.h: Likewise.
* include/grub/util/lvm.h: Likewise.
* include/grub/util/raid.h: Likewise.
* util/lvm.c: Likewise.
* util/raid.c: Likewise.
* include/grub/disk.h (grub_disk_dev_id): Add
GRUB_DISK_DEVICE_RAID_ID and GRUB_DISK_DEVICE_LVM_ID.
(grub_disk_get_size): New prototype.
* kern/disk.c (grub_disk_open): Check whether grub_partition_probe()
returns a partition.
(grub_disk_get_size): New function.
* kern/i386/pc/init.c (make_install_device): Copy the prefix
verbatim if grub_install_dos_part is -2.
* util/i386/pc/getroot.c (grub_guess_root_device): Support RAID
and LVM devices.
* util/i386/pc/grub-setup.c (setup): New argument
MUST_EMBED. Force embedding of GRUB when the argument is
true. Close FILE before returning.
(main): Add support for RAID and LVM.
* conf/common.rmk: Add RAID and LVM modules.
* conf/i386-pc.rmk (grub_setup_SOURCES): Add util/raid.c and
util/lvm.c.
(grub_emu_SOURCES): Add disk/raid.c and disk/lvm.c.
* kern/misc.c (grub_strstr): New function.
* include/grub/misc.h (grub_strstr): New prototype.
2006-10-14 15:24:53 +00:00
|
|
|
lvm_mod_SOURCES = disk/lvm.c
|
|
|
|
|
lvm_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
lvm_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
|
2008-08-27 15:05:00 +00:00
|
|
|
# For scsi.mod
|
|
|
|
|
scsi_mod_SOURCES = disk/scsi.c
|
|
|
|
|
scsi_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
scsi_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
# Commands.
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
pkglib_MODULES += minicmd.mod extcmd.mod hello.mod handler.mod \
|
2009-06-18 20:00:34 +00:00
|
|
|
ls.mod cmp.mod cat.mod help.mod search.mod loopback.mod \
|
2009-09-22 07:31:18 +00:00
|
|
|
configfile.mod echo.mod \
|
2008-02-02 20:35:08 +00:00
|
|
|
terminfo.mod test.mod blocklist.mod hexdump.mod \
|
2009-04-10 15:33:34 +00:00
|
|
|
read.mod sleep.mod loadenv.mod crc.mod parttool.mod \
|
2009-09-26 11:48:55 +00:00
|
|
|
msdospart.mod memrw.mod normal.mod sh.mod \
|
2009-08-28 13:20:34 +00:00
|
|
|
gptsync.mod true.mod probe.mod password.mod \
|
|
|
|
|
keystatus.mod
|
2009-08-24 23:55:06 +00:00
|
|
|
|
|
|
|
|
# For password.mod.
|
|
|
|
|
password_mod_SOURCES = commands/password.c
|
|
|
|
|
password_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
password_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2009-05-09 11:04:08 +00:00
|
|
|
|
|
|
|
|
# For gptsync.mod.
|
|
|
|
|
gptsync_mod_SOURCES = commands/gptsync.c
|
|
|
|
|
gptsync_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
gptsync_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2009-04-15 12:45:50 +00:00
|
|
|
|
2009-03-21 Bean <bean123ch@gmail.com>
* commands/blocklist.c: Add include file <grub/command.h>, remove
<grub/normal.h> and <grub/arg.h>.
(grub_cmd_blocklist): Use the new command interface.
(GRUB_MOD_INIT): Likewise.
(GRUB_MOD_FINI): Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/crc.c: Likewise.
* commands/echo.c: Likewise.
* commands/halt.c: Likewise.
* commands/handler.c: Likewise.
* commands/hdparm.c: Likewise.
* commands/help.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/ls.c: Likewise.
* commands/lsmmap.c: Likewise.
* commands/lspci.c: Likewise.
* commands/loadenv.c: Likewise.
* commands/read.c: Likewise.
* commands/reboot.c: Likewise.
* commands/search.c: Likewise.
* commands/sleep.c: Likewise.
* commands/test.c: Likewise.
* commands/usbtest.c: Likewise.
* commands/videotest.c: Likewise.
* commands/i386/cpuid.c: Likewise.
* commands/i386/pc/halt.c: Likewise.
* commands/i386/pc/play.c: Likewise.
* commands/i386/pc/pxecmd.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* font/font_cmd.c: Likewise.
* hello/hello.c: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/i386/bsd.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/ieee1275/linux.c: Likewise.
* loader/i386/linux.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* term/gfxterm.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/terminfo.c: Likewise.
* term/i386/pc/vesafb.c: Removed <grub/arg.h>.
* term/i386/pc/vga.c: Likewise.
* video/readers/jpeg.c: Likewise.
* video/readers/png.c: Likewise.
* video/readers/tga.c: Likewise.
* util/grub-fstest (cmd_loopback): Removed.
(cmd_blocklist): Likewise.
(cmd_ls): Likewise.
(grub_register_command): Likewise.
(grub_unregister_command): Likewise.
(execute_command): Use grub_command_find to locate command and execute
it.
* include/grub/efi/chainloader.h: Removed.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/bsd_normal.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/linux_normal.c: Likewise.
* loader/multiboot_loader_normal.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* gencmdlist.sh: Scan new registration command grub_register_extcmd
and grub_register_command_p1.
* conf/common.rmk (grub_fstest_SOURCES): Add kern/list.c,
kern/command.c, lib/arg.c and commands/extcmd.c.
(pkglib_MODULES): Remove boot.mod, and minicmd.mod and extcmd.mod.
(minicmd_mod_SOURCES): New variable.
(minicmd_mod_CFLAGS): Likewise.
(minicmd_mod_LDFLAGS): Likewise.
(extcmd_mod_SOURCES): Likewise.
(extcmd_mod_CFLAGS): Likewise.
(extcmd_mod_LDFLAGS): Likewise.
(boot_mod_SOURCES): Removed.
(boot_mod_CFLAGS): Likewise.
(boot_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/command.c and
kern/corecmd.c.
(kernel_img_HEADERS): Add command.h.
(grub_emu_SOURCES): Remove commands/boot.c and normal/arg.c, add
commands/minicmd.c, kern/command.c, kern/corecmd.c, commands/extcmd.c
and lib/arg.c.
(pkglib_MODULES): Change _linux.mod, _chain.mod, _bsd.mod and
_multiboot.mod as linux.mod, chain.mod, bsd.mod and multiboot.mod,
remove the corresponding normal mode command.
(normal_mod_SOURCES): Remove normal/arg.c.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/arg.h: Move from here ...
* include/grub/lib/arg.h: ... to here.
* normal/arg.c: Move from here ...
* lib/arg.c: ... to here.
* commands/extcmd.c: New file.
* commands/minicmd.c: Likewise.
* include/grub/command.h: Likewise.
* include/grub/extcmd.h: Likewise.
* kern/command.c: Likewise.
* kern/corecmd.c: Likewise.
* kern/list.c (grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(grub_prio_list_insert): Likewise.
* kern/rescue.c (grub_rescue_command): Removed.
(grub_rescue_command_list): Likewise.
(grub_rescue_register_command): Likewise.
(grub_rescue_unregister_command): Likewise.
(grub_rescue_cmd_boot): Move to minicmd.c
(grub_rescue_cmd_help): Likewise.
(grub_rescue_cmd_info): Likewise.
(grub_rescue_cmd_boot): Likewise.
(grub_rescue_cmd_testload): Likewise.
(grub_rescue_cmd_dump): Likewise.
(grub_rescue_cmd_rmmod): Likewise.
(grub_rescue_cmd_lsmod): Likewise.
(grub_rescue_cmd_exit): Likewise.
(grub_rescue_print_devices): Moved to corecmd.c.
(grub_rescue_print_files): Likewise.
(grub_rescue_cmd_ls): Likewise.
(grub_rescue_cmd_insmod): Likewise.
(grub_rescue_cmd_set): Likewise.
(grub_rescue_cmd_unset): Likewise.
(attemp_normal_mode): Use grub_command_find to get normal module.
(grub_enter_rescue_mode): Use grub_register_core_commands to register
commands, remove grub_rescue_regiter_command calls.
* normal/command.c (grub_regiser_command): Removed.
(grub_unregister_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(rescue_command): Likewise.
(export_command): Moved to corecmd.c.
(set_command): Removed.
(unset_command): Likewise.
(insmod_command): Likewise.
(rmmod_command): Likewise.
(lsmod_command): Likewise.
(grub_command_init): Likewise.
* normal/completion.c (iterate_command): Use cmd->prio to check for
active command.
(complete_arguments): Use grub_extcmd_t structure to find options.
(grub_normal_do_completion): Change function grub_iterate_commands to
grub_command_iterate.
* normal/execute.c (grub_script_execute_cmd): No need to parse
argument here.
* normal/main.c (grub_dyncmd_dispatcher): New function.
(read_command_list): Register unload commands as dyncmd.
(grub_cmd_normal): Use new command interface, register rescue,
unregister normal at entry, register normal, unregister rescue at exit.
* include/grub/list.h (grub_list_test_t): New type.
(grub_list_iterate): Return int instead of void.
(grub_list_insert): New function.
(GRUB_AS_NAMED_LIST_P): New macro.
(GRUB_AS_PRIO_LIST): Likewise.
(GRUB_AS_PRIO_LIST_P): Likewise.
(GRUB_PRIO_LIST_PRIO_MASK): New constant.
(GRUB_PRIO_LIST_FLAG_ACTIVE): Likewise.
(grub_prio_list): New structure.
(grub_prio_list_insert): New function.
(grub_prio_list_remove): New inline function.
* include/grub/normal.h: Remove <grub/arg.h>, add <grub/command.h>.
(GRUB_COMMAND_FLAG_CMDLINE): Moved to command.h.
(GRUB_COMMAND_FLAG_MENU): Likewise.
(GRUB_COMMAND_FLAG_BOTH): Likewise.
(GRUB_COMMAND_FLAG_TITLE): Likewise.
(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
(GRUB_COMMAND_FLAG_NO_ARG_PARSE): Removed.
(GRUB_COMMAND_FLAG_NOT_LOADED): Likewise.
(grub_command): Likewise.
(grub_register_command): Likewise.
(grub_command_find): Likewise.
(grub_iterate_commands): Likewise.
(grub_command_init): Likewise.
(grub_arg_parse): Likewise.
(grub_arg_show_help): Likewise.
* include/grub/rescue.h (grub_rescue_register_command): Removed.
(grub_rescue_unregister_command): Likewise.
* include/grub/i386/bsd.h: Remove grub_rescue_cmd_freebsd,
grub_rescue_cmd_openbsd, grub_rescue_cmd_netbsd,
grub_rescue_cmd_freebsd_loadenv and grub_rescue_cmd_freebsd_module.
* include/grub/i386/efi/loader.h: Remove grub_rescue_cmd_linux and
grub_rescue_cmd_initrd.
* include/grub/i386/loader.h: Likewise.
* include/grub/x86_64/loader.h: Likewise.
* include/grub/i386/pc/chainloader.h: Remove grub_chainloader_cmd.
2009-03-21 08:39:59 +00:00
|
|
|
# For minicmd.mod.
|
|
|
|
|
minicmd_mod_SOURCES = commands/minicmd.c
|
|
|
|
|
minicmd_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
minicmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For extcmd.mod.
|
|
|
|
|
extcmd_mod_SOURCES = commands/extcmd.c lib/arg.c
|
|
|
|
|
extcmd_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
extcmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
# For hello.mod.
|
|
|
|
|
hello_mod_SOURCES = hello/hello.c
|
|
|
|
|
hello_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-11-20 15:02:58 +00:00
|
|
|
# For gfxmenu.mod.
|
|
|
|
|
pkglib_MODULES += gfxmenu.mod
|
|
|
|
|
gfxmenu_mod_SOURCES = \
|
|
|
|
|
gfxmenu/gfxmenu.c \
|
|
|
|
|
gfxmenu/model.c \
|
|
|
|
|
gfxmenu/view.c \
|
|
|
|
|
gfxmenu/icon_manager.c \
|
|
|
|
|
gfxmenu/theme_loader.c \
|
|
|
|
|
gfxmenu/widget-box.c \
|
|
|
|
|
gfxmenu/gui_canvas.c \
|
|
|
|
|
gfxmenu/gui_circular_progress.c \
|
|
|
|
|
gfxmenu/gui_box.c \
|
|
|
|
|
gfxmenu/gui_label.c \
|
|
|
|
|
gfxmenu/gui_list.c \
|
|
|
|
|
gfxmenu/gui_image.c \
|
|
|
|
|
gfxmenu/gui_progress_bar.c \
|
|
|
|
|
gfxmenu/gui_util.c \
|
|
|
|
|
gfxmenu/gui_string_util.c \
|
2010-03-15 21:12:34 +00:00
|
|
|
gfxmenu/named_colors.c \
|
|
|
|
|
gfxmenu/font.c
|
2009-11-20 15:02:58 +00:00
|
|
|
gfxmenu_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
gfxmenu_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-04-06 09:51:01 +00:00
|
|
|
# For parttool.mod.
|
|
|
|
|
parttool_mod_SOURCES = commands/parttool.c
|
|
|
|
|
parttool_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
parttool_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-08-23 Robert Millan <rmh.grub@aybabtu.com>
* partmap/pc.c: Rename to ...
* partmap/msdos.c: ... this. Update all users.
(grub_pc_partition_map): Rename to ...
(grub_msdos_partition_map): ... this. Update all users.
* parttool/pcpart.c: Rename to ...
* parttool/msdospart.c: ... this. Update all users.
* include/grub/pc_partition.h: Rename to ...
* include/grub/msdos_partition.h: ... this. Update all users.
(grub_pc_partition_bsd_entry): Rename to ...
(grub_msdos_partition_bsd_entry): ... this. Update all users.
(grub_pc_partition_disk_label): Rename to ...
(grub_msdos_partition_disk_label): ... this. Update all users.
(grub_pc_partition_entry): Rename to ...
(grub_msdos_partition_entry): ... this. Update all users.
(grub_pc_partition_mbr): Rename to ...
(grub_msdos_partition_mbr): ... this. Update all users.
(grub_pc_partition): Rename to ...
(grub_msdos_partition): ... this. Update all users.
(grub_pc_partition_is_empty): Rename to ...
(grub_msdos_partition_is_empty): ... this. Update all users.
(grub_pc_partition_is_extended): Rename to ...
(grub_msdos_partition_is_extended): ... this. Update all users.
(grub_pc_partition_is_bsd): Rename to ...
(grub_msdos_partition_is_bsd): ... this. Update all users.
* conf/common.rmk (amiga_mod_SOURCES, amiga_mod_CFLAGS)
(amiga_mod_LDFLAGS, apple_mod_SOURCES, apple_mod_CFLAGS)
(apple_mod_LDFLAGS, msdos_mod_SOURCES, msdos_mod_CFLAGS)
(msdos_mod_LDFLAGS, sun_mod_SOURCES, sun_mod_CFLAGS)
(sun_mod_LDFLAGS, acorn_mod_SOURCES, acorn_mod_CFLAGS)
(acorn_mod_LDFLAGS, gpt_mod_SOURCES, gpt_mod_CFLAGS)
(gpt_mod_LDFLAGS): Rename to ...
(part_amiga_mod_SOURCES, part_amiga_mod_CFLAGS, part_amiga_mod_LDFLAGS)
(part_apple_mod_SOURCES, part_apple_mod_CFLAGS, part_apple_mod_LDFLAGS)
(part_msdos_mod_SOURCES, part_msdos_mod_CFLAGS, part_msdos_mod_LDFLAGS)
(part_sun_mod_SOURCES, part_sun_mod_CFLAGS, part_sun_mod_LDFLAGS)
(part_acorn_mod_SOURCES, part_acorn_mod_CFLAGS, part_acorn_mod_LDFLAGS)
(part_gpt_mod_SOURCES, part_gpt_mod_CFLAGS)
(part_gpt_mod_LDFLAGS): ... this.
(pkglib_MODULES): Prefix partition modules with `part_'. Rename
`pcpart.mod' to `msdospart.mod'.
(pcpart_mod_SOURCES, pcpart_mod_CFLAGS, pcpart_mod_LDFLAGS): Rename
to ...
(msdospart_mod_SOURCES, msdospart_mod_CFLAGS)
(msdospart_mod_LDFLAGS): ... this.
2009-08-23 12:00:57 +00:00
|
|
|
# For msdospart.mod.
|
|
|
|
|
msdospart_mod_SOURCES = parttool/msdospart.c
|
|
|
|
|
msdospart_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
msdospart_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2009-04-06 09:51:01 +00:00
|
|
|
|
2009-03-01 17:51:44 +00:00
|
|
|
# For handler.mod.
|
|
|
|
|
handler_mod_SOURCES = commands/handler.c
|
|
|
|
|
handler_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
handler_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
|
|
|
|
|
# For ls.mod.
|
|
|
|
|
ls_mod_SOURCES = commands/ls.c
|
|
|
|
|
ls_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For cmp.mod.
|
|
|
|
|
cmp_mod_SOURCES = commands/cmp.c
|
|
|
|
|
cmp_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For cat.mod.
|
|
|
|
|
cat_mod_SOURCES = commands/cat.c
|
|
|
|
|
cat_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2006-09-22 21:09:14 +00:00
|
|
|
# For echo.mod
|
|
|
|
|
echo_mod_SOURCES = commands/echo.c
|
|
|
|
|
echo_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
echo_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
# For help.mod.
|
|
|
|
|
help_mod_SOURCES = commands/help.c
|
|
|
|
|
help_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
help_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For search.mod.
|
2009-09-22 07:27:59 +00:00
|
|
|
search_mod_SOURCES = commands/search_wrap.c
|
2009-06-05 01:28:18 +00:00
|
|
|
search_mod_CFLAGS = $(COMMON_CFLAGS)
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
search_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-11-22 12:15:49 +00:00
|
|
|
pkglib_MODULES += search_fs_file.mod search_fs_uuid.mod search_label.mod
|
|
|
|
|
|
2009-09-22 07:27:59 +00:00
|
|
|
# For search.mod.
|
2009-11-22 12:15:49 +00:00
|
|
|
search_fs_file_mod_SOURCES = commands/search_file.c
|
|
|
|
|
search_fs_file_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
search_fs_file_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2009-09-22 07:27:59 +00:00
|
|
|
|
|
|
|
|
# For search.mod.
|
|
|
|
|
search_label_mod_SOURCES = commands/search_label.c
|
|
|
|
|
search_label_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
search_label_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For search.mod.
|
2009-11-22 12:15:49 +00:00
|
|
|
search_fs_uuid_mod_SOURCES = commands/search_uuid.c
|
|
|
|
|
search_fs_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
search_fs_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2009-09-22 07:27:59 +00:00
|
|
|
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
# For test.mod.
|
|
|
|
|
test_mod_SOURCES = commands/test.c
|
|
|
|
|
test_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
test_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For loopback.mod
|
|
|
|
|
loopback_mod_SOURCES = disk/loopback.c
|
|
|
|
|
loopback_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For configfile.mod
|
|
|
|
|
configfile_mod_SOURCES = commands/configfile.c
|
|
|
|
|
configfile_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For terminfo.mod.
|
|
|
|
|
terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
|
|
|
|
|
terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2006-05-27 21:09:25 +00:00
|
|
|
# For blocklist.mod.
|
|
|
|
|
blocklist_mod_SOURCES = commands/blocklist.c
|
|
|
|
|
blocklist_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
blocklist_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
|
2007-11-18 06:41:46 +00:00
|
|
|
# For hexdump.mod.
|
2008-07-27 13:51:30 +00:00
|
|
|
hexdump_mod_SOURCES = commands/hexdump.c lib/hexdump.c
|
2007-11-18 06:41:46 +00:00
|
|
|
hexdump_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
hexdump_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-07-02 07:20:11 +00:00
|
|
|
# For read.mod.
|
|
|
|
|
read_mod_SOURCES = commands/read.c
|
|
|
|
|
read_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
read_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For sleep.mod.
|
|
|
|
|
sleep_mod_SOURCES = commands/sleep.c
|
|
|
|
|
sleep_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
sleep_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For loadenv.mod.
|
2008-07-27 13:51:30 +00:00
|
|
|
loadenv_mod_SOURCES = commands/loadenv.c lib/envblk.c
|
2008-07-02 07:20:11 +00:00
|
|
|
loadenv_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
loadenv_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2008-07-27 13:51:30 +00:00
|
|
|
# For crc.mod.
|
|
|
|
|
crc_mod_SOURCES = commands/crc.c lib/crc.c
|
|
|
|
|
crc_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
crc_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-04-10 15:33:34 +00:00
|
|
|
# For memrw.mod.
|
|
|
|
|
memrw_mod_SOURCES = commands/memrw.c
|
|
|
|
|
memrw_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
memrw_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-06-08 07:32:14 +00:00
|
|
|
# For true.mod
|
|
|
|
|
true_mod_SOURCES = commands/true.c
|
|
|
|
|
true_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
true_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-06-15 22:41:42 +00:00
|
|
|
# For probe.mod.
|
|
|
|
|
probe_mod_SOURCES = commands/probe.c
|
|
|
|
|
probe_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
probe_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-08-28 13:20:34 +00:00
|
|
|
# For keystatus.mod.
|
|
|
|
|
keystatus_mod_SOURCES = commands/keystatus.c
|
|
|
|
|
keystatus_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
keystatus_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-05-02 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_script.tab.c): Change normal/parser.y to
script/sh/parser.y.
(pkglib_MODULES): Add normal.mod and sh.mod.
(normal_SOURCES): New variable.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
(sh_mod_SOURCES): Likewise.
(sh_mod_CFLAGS): Likewise.
(sh_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (normal/lexer.c_DEPENDENCIES): Changed to
script/sh/lexer.c_DEPENDENCIES.
(kernel_img_SOURCES): Remove kern/rescue.c, and kern/reader.c,
kern/rescue_reader.c and kern/rescue_parser.c.
(kernel_img_HEADERS): Remove rescue.h, add reader.h.
(grub_emu_SOURCES): Change source files.
(pkglib_MODULES): Remove normal.mod.
(normal_SOURCES): Removed.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1276.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/command.h (grub_command_execute): New inline function.
* include/grub/menu.h (grub_menu_entry): Removed commands field.
* include/grub/normal.h: Remove <grub/setjmp.h>.
(grub_fs_module_list): Moved to normal/autofs.c.
(grub_exit_env): Removed.
(grub_command_execute): Likewise.
(grub_normal_menu_addentry): Renamed to grub_menu_addentry, removed
parameter script.
(read_command_list): New function declaration.
(read_fs_list): Likewise.
* include/parser.h: Include <grub/reader.h>.
(grub_parser_split_cmdline): Change type of getline parameter.
(grub_parser): New structure.
(grub_parser_class): New variable.
(grub_parser_execute): New function declaration.
(grub_register_rescue_parser): Likewise.
(grub_parser_register): New inline function.
(grub_parser_unregister): Likewise.
(grub_parser_get_current): Likewise.
(grub_parser_set_current): Likewise.
* include/grub/reader.h: New file.
* kern/reader.c: Likewise.
* kern/rescue_parser.c: Likewise.
* kern/rescue_reader.c: Likewise.
* normal/autofs.c: Likewise.
* normal/dyncmd.c: Likewise.
* include/grub/rescue.h: Removed.
* normal/command.h: Likewise.
* include/grub/script.h: Moved to ...
* include/grub/script_sh.h: ... Moved here.
* normal/execute.c: Moved to ...
* script/sh/execute.c: ... Moved here.
* normal/function.c: Moved to ...
* script/sh/function.c: ... Moved here.
* normal/lexer.c: Moved to ...
* script/sh/lexer.c: ... Moved here.
* normal/parser.y: Moved to ...
* script/sh/parser.y: ... Moved here.
* normal/script.c: Moved to ...
* script/sh/script.c: ... Moved here.
* normal/main.c: Remove <grub/rescue.h> and <grub/script.h>, include
<grub/reader.h>.
(grub_exit_env): Removed.
(fs_module_list): Moved to normal/autofs.c.
(grub_file_getline): Don't handle comment here.
(free_menu): Skip removed field entry->commands.
(grub_normal_menu_addentry): Removed as grub_menu_entry, removed
script parameter.
(read_config_file): Removed nested parameter, change getline function.
(grub_enter_normal_mode): Removed.
(grub_dyncmd_dispatcher): Moved to normal/dyncmd.c.
(read_command_list): Likewise.
(autoload_fs_module): Moved to normal/autofs.c.
(read_fs_list): Likewise.
(reader_nested): New variable.
(grub_normal_execute): Run parser.sh to switch to sh parser.
(grub_cmd_rescue): Removed.
(cmd_normal): Removed.
(grub_cmd_normal): Unregister itself at the beginning. Don't register
rescue command.
(grub_cmdline_run): New function.
(grub_normal_reader_init): Likewise.
(grub_normal_read_line): Likewise.
(grub_env_write_pager): Likewise.
(cmdline): New variable.
(grub_normal_reader): Likewise.
(GRUB_MOD_INIT): Register normal reader and set as current, register
pager hook, register normal command with grub_register_command_prio,
so that it won't show up in command.lst.
(GRUB_MOD_FINI): Unregister normal reader, unhook pager, clear
grub_fs_autoload_hook.
* normal/menu.c: Remove <grub/script.h>, add <grub/command.h>.
(grub_menu_execute_entry): Replace grub_script_execute with
grub_parser_execute, change parameter to grub_command_execute.
* normal/menu_text.c: Remove <grub/script.h>.
* normal/menu_entry.c: Remove <grub/script.h>, add <grub/command.h>
and <grub/parser.h>.
(run): Change editor_getline to use new parser interface. Change
parameter to grub_command_execute.
* kern/main.c: Remove <grub/rescue.h>, include <grub/command.h>,
<grub/reader.h> and <grub/parser.h>.
(grub_load_normal_mode): Execute normal command.
(grub_main): Call grub_register_core_commands,
grub_register_rescue_parser and grub_register_rescue_reader, use
grub_reader_loop to enter input loop.
* kern/parser.c (grub_parser_spli_cmdline): Change type of getline
parameter.
(grub_parser_class): New variable.
(grub_parser_execute): New function.
* loader/i386/multiboot.c: Remove <grub/rescue.h>.
* loader/multiboot2.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* util/grub-emu.c (read_command_list): New dummy function.
2009-05-02 19:49:34 +00:00
|
|
|
# For normal.mod.
|
2010-03-17 07:49:48 +00:00
|
|
|
ifneq (, $(FONT_SOURCE))
|
|
|
|
|
normal/charset.c_DEPENDENCIES = widthspec.h
|
|
|
|
|
endif
|
2009-05-02 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_script.tab.c): Change normal/parser.y to
script/sh/parser.y.
(pkglib_MODULES): Add normal.mod and sh.mod.
(normal_SOURCES): New variable.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
(sh_mod_SOURCES): Likewise.
(sh_mod_CFLAGS): Likewise.
(sh_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (normal/lexer.c_DEPENDENCIES): Changed to
script/sh/lexer.c_DEPENDENCIES.
(kernel_img_SOURCES): Remove kern/rescue.c, and kern/reader.c,
kern/rescue_reader.c and kern/rescue_parser.c.
(kernel_img_HEADERS): Remove rescue.h, add reader.h.
(grub_emu_SOURCES): Change source files.
(pkglib_MODULES): Remove normal.mod.
(normal_SOURCES): Removed.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1276.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/command.h (grub_command_execute): New inline function.
* include/grub/menu.h (grub_menu_entry): Removed commands field.
* include/grub/normal.h: Remove <grub/setjmp.h>.
(grub_fs_module_list): Moved to normal/autofs.c.
(grub_exit_env): Removed.
(grub_command_execute): Likewise.
(grub_normal_menu_addentry): Renamed to grub_menu_addentry, removed
parameter script.
(read_command_list): New function declaration.
(read_fs_list): Likewise.
* include/parser.h: Include <grub/reader.h>.
(grub_parser_split_cmdline): Change type of getline parameter.
(grub_parser): New structure.
(grub_parser_class): New variable.
(grub_parser_execute): New function declaration.
(grub_register_rescue_parser): Likewise.
(grub_parser_register): New inline function.
(grub_parser_unregister): Likewise.
(grub_parser_get_current): Likewise.
(grub_parser_set_current): Likewise.
* include/grub/reader.h: New file.
* kern/reader.c: Likewise.
* kern/rescue_parser.c: Likewise.
* kern/rescue_reader.c: Likewise.
* normal/autofs.c: Likewise.
* normal/dyncmd.c: Likewise.
* include/grub/rescue.h: Removed.
* normal/command.h: Likewise.
* include/grub/script.h: Moved to ...
* include/grub/script_sh.h: ... Moved here.
* normal/execute.c: Moved to ...
* script/sh/execute.c: ... Moved here.
* normal/function.c: Moved to ...
* script/sh/function.c: ... Moved here.
* normal/lexer.c: Moved to ...
* script/sh/lexer.c: ... Moved here.
* normal/parser.y: Moved to ...
* script/sh/parser.y: ... Moved here.
* normal/script.c: Moved to ...
* script/sh/script.c: ... Moved here.
* normal/main.c: Remove <grub/rescue.h> and <grub/script.h>, include
<grub/reader.h>.
(grub_exit_env): Removed.
(fs_module_list): Moved to normal/autofs.c.
(grub_file_getline): Don't handle comment here.
(free_menu): Skip removed field entry->commands.
(grub_normal_menu_addentry): Removed as grub_menu_entry, removed
script parameter.
(read_config_file): Removed nested parameter, change getline function.
(grub_enter_normal_mode): Removed.
(grub_dyncmd_dispatcher): Moved to normal/dyncmd.c.
(read_command_list): Likewise.
(autoload_fs_module): Moved to normal/autofs.c.
(read_fs_list): Likewise.
(reader_nested): New variable.
(grub_normal_execute): Run parser.sh to switch to sh parser.
(grub_cmd_rescue): Removed.
(cmd_normal): Removed.
(grub_cmd_normal): Unregister itself at the beginning. Don't register
rescue command.
(grub_cmdline_run): New function.
(grub_normal_reader_init): Likewise.
(grub_normal_read_line): Likewise.
(grub_env_write_pager): Likewise.
(cmdline): New variable.
(grub_normal_reader): Likewise.
(GRUB_MOD_INIT): Register normal reader and set as current, register
pager hook, register normal command with grub_register_command_prio,
so that it won't show up in command.lst.
(GRUB_MOD_FINI): Unregister normal reader, unhook pager, clear
grub_fs_autoload_hook.
* normal/menu.c: Remove <grub/script.h>, add <grub/command.h>.
(grub_menu_execute_entry): Replace grub_script_execute with
grub_parser_execute, change parameter to grub_command_execute.
* normal/menu_text.c: Remove <grub/script.h>.
* normal/menu_entry.c: Remove <grub/script.h>, add <grub/command.h>
and <grub/parser.h>.
(run): Change editor_getline to use new parser interface. Change
parameter to grub_command_execute.
* kern/main.c: Remove <grub/rescue.h>, include <grub/command.h>,
<grub/reader.h> and <grub/parser.h>.
(grub_load_normal_mode): Execute normal command.
(grub_main): Call grub_register_core_commands,
grub_register_rescue_parser and grub_register_rescue_reader, use
grub_reader_loop to enter input loop.
* kern/parser.c (grub_parser_spli_cmdline): Change type of getline
parameter.
(grub_parser_class): New variable.
(grub_parser_execute): New function.
* loader/i386/multiboot.c: Remove <grub/rescue.h>.
* loader/multiboot2.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* util/grub-emu.c (read_command_list): New dummy function.
2009-05-02 19:49:34 +00:00
|
|
|
normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
|
2009-08-24 23:55:06 +00:00
|
|
|
normal/auth.c normal/autofs.c normal/handler.c \
|
2009-05-02 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_script.tab.c): Change normal/parser.y to
script/sh/parser.y.
(pkglib_MODULES): Add normal.mod and sh.mod.
(normal_SOURCES): New variable.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
(sh_mod_SOURCES): Likewise.
(sh_mod_CFLAGS): Likewise.
(sh_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (normal/lexer.c_DEPENDENCIES): Changed to
script/sh/lexer.c_DEPENDENCIES.
(kernel_img_SOURCES): Remove kern/rescue.c, and kern/reader.c,
kern/rescue_reader.c and kern/rescue_parser.c.
(kernel_img_HEADERS): Remove rescue.h, add reader.h.
(grub_emu_SOURCES): Change source files.
(pkglib_MODULES): Remove normal.mod.
(normal_SOURCES): Removed.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1276.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/command.h (grub_command_execute): New inline function.
* include/grub/menu.h (grub_menu_entry): Removed commands field.
* include/grub/normal.h: Remove <grub/setjmp.h>.
(grub_fs_module_list): Moved to normal/autofs.c.
(grub_exit_env): Removed.
(grub_command_execute): Likewise.
(grub_normal_menu_addentry): Renamed to grub_menu_addentry, removed
parameter script.
(read_command_list): New function declaration.
(read_fs_list): Likewise.
* include/parser.h: Include <grub/reader.h>.
(grub_parser_split_cmdline): Change type of getline parameter.
(grub_parser): New structure.
(grub_parser_class): New variable.
(grub_parser_execute): New function declaration.
(grub_register_rescue_parser): Likewise.
(grub_parser_register): New inline function.
(grub_parser_unregister): Likewise.
(grub_parser_get_current): Likewise.
(grub_parser_set_current): Likewise.
* include/grub/reader.h: New file.
* kern/reader.c: Likewise.
* kern/rescue_parser.c: Likewise.
* kern/rescue_reader.c: Likewise.
* normal/autofs.c: Likewise.
* normal/dyncmd.c: Likewise.
* include/grub/rescue.h: Removed.
* normal/command.h: Likewise.
* include/grub/script.h: Moved to ...
* include/grub/script_sh.h: ... Moved here.
* normal/execute.c: Moved to ...
* script/sh/execute.c: ... Moved here.
* normal/function.c: Moved to ...
* script/sh/function.c: ... Moved here.
* normal/lexer.c: Moved to ...
* script/sh/lexer.c: ... Moved here.
* normal/parser.y: Moved to ...
* script/sh/parser.y: ... Moved here.
* normal/script.c: Moved to ...
* script/sh/script.c: ... Moved here.
* normal/main.c: Remove <grub/rescue.h> and <grub/script.h>, include
<grub/reader.h>.
(grub_exit_env): Removed.
(fs_module_list): Moved to normal/autofs.c.
(grub_file_getline): Don't handle comment here.
(free_menu): Skip removed field entry->commands.
(grub_normal_menu_addentry): Removed as grub_menu_entry, removed
script parameter.
(read_config_file): Removed nested parameter, change getline function.
(grub_enter_normal_mode): Removed.
(grub_dyncmd_dispatcher): Moved to normal/dyncmd.c.
(read_command_list): Likewise.
(autoload_fs_module): Moved to normal/autofs.c.
(read_fs_list): Likewise.
(reader_nested): New variable.
(grub_normal_execute): Run parser.sh to switch to sh parser.
(grub_cmd_rescue): Removed.
(cmd_normal): Removed.
(grub_cmd_normal): Unregister itself at the beginning. Don't register
rescue command.
(grub_cmdline_run): New function.
(grub_normal_reader_init): Likewise.
(grub_normal_read_line): Likewise.
(grub_env_write_pager): Likewise.
(cmdline): New variable.
(grub_normal_reader): Likewise.
(GRUB_MOD_INIT): Register normal reader and set as current, register
pager hook, register normal command with grub_register_command_prio,
so that it won't show up in command.lst.
(GRUB_MOD_FINI): Unregister normal reader, unhook pager, clear
grub_fs_autoload_hook.
* normal/menu.c: Remove <grub/script.h>, add <grub/command.h>.
(grub_menu_execute_entry): Replace grub_script_execute with
grub_parser_execute, change parameter to grub_command_execute.
* normal/menu_text.c: Remove <grub/script.h>.
* normal/menu_entry.c: Remove <grub/script.h>, add <grub/command.h>
and <grub/parser.h>.
(run): Change editor_getline to use new parser interface. Change
parameter to grub_command_execute.
* kern/main.c: Remove <grub/rescue.h>, include <grub/command.h>,
<grub/reader.h> and <grub/parser.h>.
(grub_load_normal_mode): Execute normal command.
(grub_main): Call grub_register_core_commands,
grub_register_rescue_parser and grub_register_rescue_reader, use
grub_reader_loop to enter input loop.
* kern/parser.c (grub_parser_spli_cmdline): Change type of getline
parameter.
(grub_parser_class): New variable.
(grub_parser_execute): New function.
* loader/i386/multiboot.c: Remove <grub/rescue.h>.
* loader/multiboot2.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* util/grub-emu.c (read_command_list): New dummy function.
2009-05-02 19:49:34 +00:00
|
|
|
normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
|
2010-03-15 21:17:26 +00:00
|
|
|
normal/menu_entry.c normal/menu_text.c normal/charset.c \
|
2010-03-15 20:34:50 +00:00
|
|
|
normal/misc.c normal/crypto.c normal/term.c normal/context.c \
|
|
|
|
|
unidata.c
|
2010-03-16 20:29:15 +00:00
|
|
|
|
2009-05-02 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_script.tab.c): Change normal/parser.y to
script/sh/parser.y.
(pkglib_MODULES): Add normal.mod and sh.mod.
(normal_SOURCES): New variable.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
(sh_mod_SOURCES): Likewise.
(sh_mod_CFLAGS): Likewise.
(sh_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (normal/lexer.c_DEPENDENCIES): Changed to
script/sh/lexer.c_DEPENDENCIES.
(kernel_img_SOURCES): Remove kern/rescue.c, and kern/reader.c,
kern/rescue_reader.c and kern/rescue_parser.c.
(kernel_img_HEADERS): Remove rescue.h, add reader.h.
(grub_emu_SOURCES): Change source files.
(pkglib_MODULES): Remove normal.mod.
(normal_SOURCES): Removed.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1276.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/command.h (grub_command_execute): New inline function.
* include/grub/menu.h (grub_menu_entry): Removed commands field.
* include/grub/normal.h: Remove <grub/setjmp.h>.
(grub_fs_module_list): Moved to normal/autofs.c.
(grub_exit_env): Removed.
(grub_command_execute): Likewise.
(grub_normal_menu_addentry): Renamed to grub_menu_addentry, removed
parameter script.
(read_command_list): New function declaration.
(read_fs_list): Likewise.
* include/parser.h: Include <grub/reader.h>.
(grub_parser_split_cmdline): Change type of getline parameter.
(grub_parser): New structure.
(grub_parser_class): New variable.
(grub_parser_execute): New function declaration.
(grub_register_rescue_parser): Likewise.
(grub_parser_register): New inline function.
(grub_parser_unregister): Likewise.
(grub_parser_get_current): Likewise.
(grub_parser_set_current): Likewise.
* include/grub/reader.h: New file.
* kern/reader.c: Likewise.
* kern/rescue_parser.c: Likewise.
* kern/rescue_reader.c: Likewise.
* normal/autofs.c: Likewise.
* normal/dyncmd.c: Likewise.
* include/grub/rescue.h: Removed.
* normal/command.h: Likewise.
* include/grub/script.h: Moved to ...
* include/grub/script_sh.h: ... Moved here.
* normal/execute.c: Moved to ...
* script/sh/execute.c: ... Moved here.
* normal/function.c: Moved to ...
* script/sh/function.c: ... Moved here.
* normal/lexer.c: Moved to ...
* script/sh/lexer.c: ... Moved here.
* normal/parser.y: Moved to ...
* script/sh/parser.y: ... Moved here.
* normal/script.c: Moved to ...
* script/sh/script.c: ... Moved here.
* normal/main.c: Remove <grub/rescue.h> and <grub/script.h>, include
<grub/reader.h>.
(grub_exit_env): Removed.
(fs_module_list): Moved to normal/autofs.c.
(grub_file_getline): Don't handle comment here.
(free_menu): Skip removed field entry->commands.
(grub_normal_menu_addentry): Removed as grub_menu_entry, removed
script parameter.
(read_config_file): Removed nested parameter, change getline function.
(grub_enter_normal_mode): Removed.
(grub_dyncmd_dispatcher): Moved to normal/dyncmd.c.
(read_command_list): Likewise.
(autoload_fs_module): Moved to normal/autofs.c.
(read_fs_list): Likewise.
(reader_nested): New variable.
(grub_normal_execute): Run parser.sh to switch to sh parser.
(grub_cmd_rescue): Removed.
(cmd_normal): Removed.
(grub_cmd_normal): Unregister itself at the beginning. Don't register
rescue command.
(grub_cmdline_run): New function.
(grub_normal_reader_init): Likewise.
(grub_normal_read_line): Likewise.
(grub_env_write_pager): Likewise.
(cmdline): New variable.
(grub_normal_reader): Likewise.
(GRUB_MOD_INIT): Register normal reader and set as current, register
pager hook, register normal command with grub_register_command_prio,
so that it won't show up in command.lst.
(GRUB_MOD_FINI): Unregister normal reader, unhook pager, clear
grub_fs_autoload_hook.
* normal/menu.c: Remove <grub/script.h>, add <grub/command.h>.
(grub_menu_execute_entry): Replace grub_script_execute with
grub_parser_execute, change parameter to grub_command_execute.
* normal/menu_text.c: Remove <grub/script.h>.
* normal/menu_entry.c: Remove <grub/script.h>, add <grub/command.h>
and <grub/parser.h>.
(run): Change editor_getline to use new parser interface. Change
parameter to grub_command_execute.
* kern/main.c: Remove <grub/rescue.h>, include <grub/command.h>,
<grub/reader.h> and <grub/parser.h>.
(grub_load_normal_mode): Execute normal command.
(grub_main): Call grub_register_core_commands,
grub_register_rescue_parser and grub_register_rescue_reader, use
grub_reader_loop to enter input loop.
* kern/parser.c (grub_parser_spli_cmdline): Change type of getline
parameter.
(grub_parser_class): New variable.
(grub_parser_execute): New function.
* loader/i386/multiboot.c: Remove <grub/rescue.h>.
* loader/multiboot2.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* util/grub-emu.c (read_command_list): New dummy function.
2009-05-02 19:49:34 +00:00
|
|
|
normal_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For sh.mod.
|
2009-11-23 15:37:33 +00:00
|
|
|
sh_mod_SOURCES = script/main.c script/script.c script/execute.c \
|
2010-01-22 13:37:27 +00:00
|
|
|
script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
|
2010-04-06 09:09:11 +00:00
|
|
|
sh_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
|
2009-05-02 Bean <bean123ch@gmail.com>
* conf/common.rmk (grub_script.tab.c): Change normal/parser.y to
script/sh/parser.y.
(pkglib_MODULES): Add normal.mod and sh.mod.
(normal_SOURCES): New variable.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
(sh_mod_SOURCES): Likewise.
(sh_mod_CFLAGS): Likewise.
(sh_mod_LDFLAGS): Likewise.
* conf/i386-pc.rmk (normal/lexer.c_DEPENDENCIES): Changed to
script/sh/lexer.c_DEPENDENCIES.
(kernel_img_SOURCES): Remove kern/rescue.c, and kern/reader.c,
kern/rescue_reader.c and kern/rescue_parser.c.
(kernel_img_HEADERS): Remove rescue.h, add reader.h.
(grub_emu_SOURCES): Change source files.
(pkglib_MODULES): Remove normal.mod.
(normal_SOURCES): Removed.
(normal_mod_CFLAGS): Likewise.
(normal_mod_LDFLAGS): Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-efi.rmk: Likewise.
* conf/i386-ieee1276.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* conf/sparc64-ieee1275.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* include/grub/command.h (grub_command_execute): New inline function.
* include/grub/menu.h (grub_menu_entry): Removed commands field.
* include/grub/normal.h: Remove <grub/setjmp.h>.
(grub_fs_module_list): Moved to normal/autofs.c.
(grub_exit_env): Removed.
(grub_command_execute): Likewise.
(grub_normal_menu_addentry): Renamed to grub_menu_addentry, removed
parameter script.
(read_command_list): New function declaration.
(read_fs_list): Likewise.
* include/parser.h: Include <grub/reader.h>.
(grub_parser_split_cmdline): Change type of getline parameter.
(grub_parser): New structure.
(grub_parser_class): New variable.
(grub_parser_execute): New function declaration.
(grub_register_rescue_parser): Likewise.
(grub_parser_register): New inline function.
(grub_parser_unregister): Likewise.
(grub_parser_get_current): Likewise.
(grub_parser_set_current): Likewise.
* include/grub/reader.h: New file.
* kern/reader.c: Likewise.
* kern/rescue_parser.c: Likewise.
* kern/rescue_reader.c: Likewise.
* normal/autofs.c: Likewise.
* normal/dyncmd.c: Likewise.
* include/grub/rescue.h: Removed.
* normal/command.h: Likewise.
* include/grub/script.h: Moved to ...
* include/grub/script_sh.h: ... Moved here.
* normal/execute.c: Moved to ...
* script/sh/execute.c: ... Moved here.
* normal/function.c: Moved to ...
* script/sh/function.c: ... Moved here.
* normal/lexer.c: Moved to ...
* script/sh/lexer.c: ... Moved here.
* normal/parser.y: Moved to ...
* script/sh/parser.y: ... Moved here.
* normal/script.c: Moved to ...
* script/sh/script.c: ... Moved here.
* normal/main.c: Remove <grub/rescue.h> and <grub/script.h>, include
<grub/reader.h>.
(grub_exit_env): Removed.
(fs_module_list): Moved to normal/autofs.c.
(grub_file_getline): Don't handle comment here.
(free_menu): Skip removed field entry->commands.
(grub_normal_menu_addentry): Removed as grub_menu_entry, removed
script parameter.
(read_config_file): Removed nested parameter, change getline function.
(grub_enter_normal_mode): Removed.
(grub_dyncmd_dispatcher): Moved to normal/dyncmd.c.
(read_command_list): Likewise.
(autoload_fs_module): Moved to normal/autofs.c.
(read_fs_list): Likewise.
(reader_nested): New variable.
(grub_normal_execute): Run parser.sh to switch to sh parser.
(grub_cmd_rescue): Removed.
(cmd_normal): Removed.
(grub_cmd_normal): Unregister itself at the beginning. Don't register
rescue command.
(grub_cmdline_run): New function.
(grub_normal_reader_init): Likewise.
(grub_normal_read_line): Likewise.
(grub_env_write_pager): Likewise.
(cmdline): New variable.
(grub_normal_reader): Likewise.
(GRUB_MOD_INIT): Register normal reader and set as current, register
pager hook, register normal command with grub_register_command_prio,
so that it won't show up in command.lst.
(GRUB_MOD_FINI): Unregister normal reader, unhook pager, clear
grub_fs_autoload_hook.
* normal/menu.c: Remove <grub/script.h>, add <grub/command.h>.
(grub_menu_execute_entry): Replace grub_script_execute with
grub_parser_execute, change parameter to grub_command_execute.
* normal/menu_text.c: Remove <grub/script.h>.
* normal/menu_entry.c: Remove <grub/script.h>, add <grub/command.h>
and <grub/parser.h>.
(run): Change editor_getline to use new parser interface. Change
parameter to grub_command_execute.
* kern/main.c: Remove <grub/rescue.h>, include <grub/command.h>,
<grub/reader.h> and <grub/parser.h>.
(grub_load_normal_mode): Execute normal command.
(grub_main): Call grub_register_core_commands,
grub_register_rescue_parser and grub_register_rescue_reader, use
grub_reader_loop to enter input loop.
* kern/parser.c (grub_parser_spli_cmdline): Change type of getline
parameter.
(grub_parser_class): New variable.
(grub_parser_execute): New function.
* loader/i386/multiboot.c: Remove <grub/rescue.h>.
* loader/multiboot2.c: Likewise.
* loader/sparc64/ieee1275/linux.c: Likewise.
* util/grub-emu.c (read_command_list): New dummy function.
2009-05-02 19:49:34 +00:00
|
|
|
sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2010-02-25 14:10:18 +00:00
|
|
|
ifneq (, $(FONT_SOURCE))
|
|
|
|
|
font/font.c_DEPENDENCIES = ascii.h
|
|
|
|
|
endif
|
|
|
|
|
|
2009-01-06 Vesa Jääskeläinen <chaac@nic.fi>
* commands/videotest.c: Removed include to grub/machine/memory.h.
* conf/i386-pc.rmk (pkglib_MODULES): Removed video.mod, gfxterm.mod,
videotest.mod, bitmap.mod, tga.mod, jpeg.mod, png.mod.
(video_mod_SOURCES): Removed.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
* conf/common.rmk (pkglib_MODULES): Added video.mod, videotest.mod,
bitmap.mod, tga.mod, jpeg.mod, png.mod, font.mod, gfxterm.mod
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
* term/gfxterm.c: Removed include to grub/machine/memory.h,
grub/machine/console.h.
2009-01-05 23:01:00 +00:00
|
|
|
# Common Video Subsystem specific modules.
|
2010-02-25 14:10:18 +00:00
|
|
|
# On Yeeloong it's part of kernel
|
|
|
|
|
ifneq ($(platform), yeeloong)
|
2009-01-06 Vesa Jääskeläinen <chaac@nic.fi>
* commands/videotest.c: Removed include to grub/machine/memory.h.
* conf/i386-pc.rmk (pkglib_MODULES): Removed video.mod, gfxterm.mod,
videotest.mod, bitmap.mod, tga.mod, jpeg.mod, png.mod.
(video_mod_SOURCES): Removed.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
* conf/common.rmk (pkglib_MODULES): Added video.mod, videotest.mod,
bitmap.mod, tga.mod, jpeg.mod, png.mod, font.mod, gfxterm.mod
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
* term/gfxterm.c: Removed include to grub/machine/memory.h,
grub/machine/console.h.
2009-01-05 23:01:00 +00:00
|
|
|
|
|
|
|
|
# For video.mod.
|
2010-02-25 14:10:18 +00:00
|
|
|
pkglib_MODULES += video.mod
|
2009-01-06 Vesa Jääskeläinen <chaac@nic.fi>
* commands/videotest.c: Removed include to grub/machine/memory.h.
* conf/i386-pc.rmk (pkglib_MODULES): Removed video.mod, gfxterm.mod,
videotest.mod, bitmap.mod, tga.mod, jpeg.mod, png.mod.
(video_mod_SOURCES): Removed.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
* conf/common.rmk (pkglib_MODULES): Added video.mod, videotest.mod,
bitmap.mod, tga.mod, jpeg.mod, png.mod, font.mod, gfxterm.mod
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
* term/gfxterm.c: Removed include to grub/machine/memory.h,
grub/machine/console.h.
2009-01-05 23:01:00 +00:00
|
|
|
video_mod_SOURCES = video/video.c
|
|
|
|
|
video_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
video_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2010-02-25 14:10:18 +00:00
|
|
|
pkglib_MODULES += video_fb.mod
|
2009-08-14 12:41:58 +00:00
|
|
|
video_fb_mod_SOURCES = video/fb/video_fb.c video/fb/fbblit.c \
|
|
|
|
|
video/fb/fbfill.c video/fb/fbutil.c
|
|
|
|
|
video_fb_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
video_fb_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-01-06 Vesa Jääskeläinen <chaac@nic.fi>
* commands/videotest.c: Removed include to grub/machine/memory.h.
* conf/i386-pc.rmk (pkglib_MODULES): Removed video.mod, gfxterm.mod,
videotest.mod, bitmap.mod, tga.mod, jpeg.mod, png.mod.
(video_mod_SOURCES): Removed.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
* conf/common.rmk (pkglib_MODULES): Added video.mod, videotest.mod,
bitmap.mod, tga.mod, jpeg.mod, png.mod, font.mod, gfxterm.mod
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
* term/gfxterm.c: Removed include to grub/machine/memory.h,
grub/machine/console.h.
2009-01-05 23:01:00 +00:00
|
|
|
# For bitmap.mod
|
2010-02-25 14:10:18 +00:00
|
|
|
pkglib_MODULES += bitmap.mod
|
2009-01-06 Vesa Jääskeläinen <chaac@nic.fi>
* commands/videotest.c: Removed include to grub/machine/memory.h.
* conf/i386-pc.rmk (pkglib_MODULES): Removed video.mod, gfxterm.mod,
videotest.mod, bitmap.mod, tga.mod, jpeg.mod, png.mod.
(video_mod_SOURCES): Removed.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
* conf/common.rmk (pkglib_MODULES): Added video.mod, videotest.mod,
bitmap.mod, tga.mod, jpeg.mod, png.mod, font.mod, gfxterm.mod
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
* term/gfxterm.c: Removed include to grub/machine/memory.h,
grub/machine/console.h.
2009-01-05 23:01:00 +00:00
|
|
|
bitmap_mod_SOURCES = video/bitmap.c
|
|
|
|
|
bitmap_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
bitmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-11-20 09:46:30 +00:00
|
|
|
# For bitmap_scale.mod
|
|
|
|
|
pkglib_MODULES += bitmap_scale.mod
|
|
|
|
|
bitmap_scale_mod_SOURCES = video/bitmap_scale.c
|
|
|
|
|
bitmap_scale_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
bitmap_scale_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2010-02-25 14:10:18 +00:00
|
|
|
pkglib_MODULES += font.mod
|
2010-03-15 20:34:50 +00:00
|
|
|
font_mod_SOURCES = font/font_cmd.c font/font.c
|
2010-02-25 14:10:18 +00:00
|
|
|
font_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
font_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For gfxterm.mod.
|
|
|
|
|
pkglib_MODULES += gfxterm.mod
|
|
|
|
|
gfxterm_mod_SOURCES = term/gfxterm.c
|
|
|
|
|
gfxterm_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
gfxterm_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# For videotest.mod.
|
|
|
|
|
pkglib_MODULES += videotest.mod
|
|
|
|
|
videotest_mod_SOURCES = commands/videotest.c
|
|
|
|
|
videotest_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
videotest_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-01-06 Vesa Jääskeläinen <chaac@nic.fi>
* commands/videotest.c: Removed include to grub/machine/memory.h.
* conf/i386-pc.rmk (pkglib_MODULES): Removed video.mod, gfxterm.mod,
videotest.mod, bitmap.mod, tga.mod, jpeg.mod, png.mod.
(video_mod_SOURCES): Removed.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
* conf/common.rmk (pkglib_MODULES): Added video.mod, videotest.mod,
bitmap.mod, tga.mod, jpeg.mod, png.mod, font.mod, gfxterm.mod
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
* term/gfxterm.c: Removed include to grub/machine/memory.h,
grub/machine/console.h.
2009-01-05 23:01:00 +00:00
|
|
|
# For tga.mod
|
2010-02-25 14:10:18 +00:00
|
|
|
pkglib_MODULES += tga.mod
|
2009-01-06 Vesa Jääskeläinen <chaac@nic.fi>
* commands/videotest.c: Removed include to grub/machine/memory.h.
* conf/i386-pc.rmk (pkglib_MODULES): Removed video.mod, gfxterm.mod,
videotest.mod, bitmap.mod, tga.mod, jpeg.mod, png.mod.
(video_mod_SOURCES): Removed.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
* conf/common.rmk (pkglib_MODULES): Added video.mod, videotest.mod,
bitmap.mod, tga.mod, jpeg.mod, png.mod, font.mod, gfxterm.mod
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
* term/gfxterm.c: Removed include to grub/machine/memory.h,
grub/machine/console.h.
2009-01-05 23:01:00 +00:00
|
|
|
tga_mod_SOURCES = video/readers/tga.c
|
|
|
|
|
tga_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
tga_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For jpeg.mod.
|
2010-02-25 14:10:18 +00:00
|
|
|
pkglib_MODULES += jpeg.mod
|
2009-01-06 Vesa Jääskeläinen <chaac@nic.fi>
* commands/videotest.c: Removed include to grub/machine/memory.h.
* conf/i386-pc.rmk (pkglib_MODULES): Removed video.mod, gfxterm.mod,
videotest.mod, bitmap.mod, tga.mod, jpeg.mod, png.mod.
(video_mod_SOURCES): Removed.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
* conf/common.rmk (pkglib_MODULES): Added video.mod, videotest.mod,
bitmap.mod, tga.mod, jpeg.mod, png.mod, font.mod, gfxterm.mod
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
* term/gfxterm.c: Removed include to grub/machine/memory.h,
grub/machine/console.h.
2009-01-05 23:01:00 +00:00
|
|
|
jpeg_mod_SOURCES = video/readers/jpeg.c
|
|
|
|
|
jpeg_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
jpeg_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For png.mod.
|
2010-02-25 14:10:18 +00:00
|
|
|
pkglib_MODULES += png.mod
|
2009-01-06 Vesa Jääskeläinen <chaac@nic.fi>
* commands/videotest.c: Removed include to grub/machine/memory.h.
* conf/i386-pc.rmk (pkglib_MODULES): Removed video.mod, gfxterm.mod,
videotest.mod, bitmap.mod, tga.mod, jpeg.mod, png.mod.
(video_mod_SOURCES): Removed.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
* conf/common.rmk (pkglib_MODULES): Added video.mod, videotest.mod,
bitmap.mod, tga.mod, jpeg.mod, png.mod, font.mod, gfxterm.mod
(video_mod_SOURCES): Added.
(video_mod_CFLAGS): Likewise.
(video_mod_LDFLAGS): Likewise.
(videotest_mod_SOURCES): Likewise.
(videotest_mod_CFLAGS): Likewise.
(videotest_mod_LDFLAGS): Likewise.
(bitmap_mod_SOURCES): Likewise.
(bitmap_mod_CFLAGS): Likewise.
(bitmap_mod_LDFLAGS): Likewise.
(tga_mod_SOURCES): Likewise.
(tga_mod_CFLAGS): Likewise.
(tga_mod_LDFLAGS): Likewise.
(jpeg_mod_SOURCES): Likewise.
(jpeg_mod_CFLAGS): Likewise.
(jpeg_mod_LDFLAGS): Likewise.
(png_mod_SOURCES): Likewise.
(png_mod_CFLAGS): Likewise.
(png_mod_LDFLAGS): Likewise.
(gfxterm_mod_SOURCES): Likewise.
(gfxterm_mod_CFLAGS): Likewise.
(gfxterm_mod_LDFLAGS): Likewise.
* term/gfxterm.c: Removed include to grub/machine/memory.h,
grub/machine/console.h.
2009-01-05 23:01:00 +00:00
|
|
|
png_mod_SOURCES = video/readers/png.c
|
|
|
|
|
png_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
png_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
# Misc.
|
2010-02-25 14:10:18 +00:00
|
|
|
pkglib_MODULES += gzio.mod elf.mod
|
2006-11-03 20:28:04 +00:00
|
|
|
|
|
|
|
|
# For elf.mod.
|
|
|
|
|
elf_mod_SOURCES = kern/elf.c
|
|
|
|
|
elf_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
elf_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2005-11-18 Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
* genmk.rb: Fixed list rules moved to Makefile.in. Recognise
appending to variables with "+=".
(PModule): Use full pathname to generate *.lst filenames.
* Makefile.in: Fixed list rules moved from genmk.rb.
(.DELETE_ON_ERROR): New special target.
(RMKFILES): Add common.rmk and sparc64-ieee1275.rmk.
* conf/i386-pc.rmk: Include conf/common.mk.
(pkgdata_MODULES): Removed fshelp.mod, fat.mod, ext2.mod, ufs.mod,
minux.mod, hfs.mod, jfs.mod, xfs.mod, affs.mod, sfs.mod,
hello.mod, boot.mod, terminal.mod, ls.mod, cmp.mod, cat.mod,
help.mod, font.mod, terminfo.mod, amiga.mod, apple.mod, pc.mod,
sun.mod, acorn.mod, loopback.mod, default.mod, timeout.mod,
configfile.mod, search.mod, gzio.mod and test.mod.
(symlist.c, grub_script.tab.c, grub_script.tab.h, kernel_syms.lst)
(grub_modules_init.lst, grub_modules_init.h, grub_emu_init.c)
(fshelp_mod_SOURCES, fshelp_mod_CFLAGS, fshelp_mod_LDFLAGS)
(fat_mod_SOURCES, fat_mod_CFLAGS, fat_mod_LDFLAGS)
(ext2_mod_SOURCES, ext2_mod_CFLAGS, ext2_mod_LDFLAGS)
(ufs_mod_SOURCES, ufs_mod_CFLAGS, ufs_mod_LDFLAGS)
(minix_mod_SOURCES, minix_mod_CFLAGS, minix_mod_LDFLAGS)
(hfs_mod_SOURCES, hfs_mod_CFLAGS, hfs_mod_LDFLAGS, jfs_mod_SOURCES)
(jfs_mod_CFLAGS, jfs_mod_LDFLAGS, iso9660_mod_SOURCES)
(iso9660_mod_CFLAGS, iso9660_mod_LDFLAGS, xfs_mod_SOURCES)
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, hello_mod_SOURCES)
(hello_mod_CFLAGS, hello_mod_LDFLAGS, boot_mod_SOURCES)
(boot_mod_CFLAGS, boot_mod_LDFLAGS, terminal_mod_SOURCES)
(terminal_mod_CFLAGS, terminal_mod_LDFLAGS, ls_mod_SOURCES)
(ls_mod_CFLAGS, ls_mod_LDFLAGS, cmp_mod_SOURCES, cmp_mod_CFLAGS)
(cmp_mod_LDFLAGS, cat_mod_SOURCES, cat_mod_CFLAGS, cat_mod_LDFLAGS)
(help_mod_SOURCES, help_mod_CFLAGS, help_mod_LDFLAGS)
(font_mod_SOURCES, font_mod_CFLAGS, font_mod_LDFLAGS)
(terminfo_mod_SOURCES, terminfo_mod_CFLAGS, terminfo_mod_LDFLAGS)
(amiga_mod_SOURCES, amiga_mod_CFLAGS, amiga_mod_LDFLAGS)
(apple_mod_SOURCES, apple_mod_CFLAGS, apple_mod_LDFLAG): Move from
here...
* conf/common.rmk: ... to here. New file.
* conf/common.mk: New file.
2005-11-18 14:56:55 +00:00
|
|
|
|
|
|
|
|
# For gzio.mod.
|
|
|
|
|
gzio_mod_SOURCES = io/gzio.c
|
|
|
|
|
gzio_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2008-08-01 04:06:55 +00:00
|
|
|
|
2010-02-25 14:10:18 +00:00
|
|
|
# On Yeeloong it's part of kernel
|
|
|
|
|
ifneq ($(platform), yeeloong)
|
2008-08-01 04:06:55 +00:00
|
|
|
# For bufio.mod.
|
2010-02-25 14:10:18 +00:00
|
|
|
pkglib_MODULES += bufio.mod
|
2008-08-01 04:06:55 +00:00
|
|
|
bufio_mod_SOURCES = io/bufio.c
|
|
|
|
|
bufio_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
bufio_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2010-02-25 14:10:18 +00:00
|
|
|
endif
|
2009-06-15 22:41:42 +00:00
|
|
|
|
2009-11-13 20:39:33 +00:00
|
|
|
# For gettext.mod.
|
2009-11-21 23:06:37 +00:00
|
|
|
pkglib_MODULES += gettext.mod
|
2009-11-13 20:39:33 +00:00
|
|
|
gettext_mod_SOURCES = gettext/gettext.c
|
|
|
|
|
gettext_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
gettext_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-06-15 22:57:39 +00:00
|
|
|
# Misc.
|
|
|
|
|
pkglib_MODULES += xnu_uuid.mod
|
|
|
|
|
|
|
|
|
|
# For elf.mod.
|
|
|
|
|
xnu_uuid_mod_SOURCES = commands/xnu_uuid.c
|
|
|
|
|
xnu_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
xnu_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2009-07-01 12:59:47 +00:00
|
|
|
|
2009-11-14 22:11:55 +00:00
|
|
|
pkglib_MODULES += trig.mod
|
2009-11-21 21:44:08 +00:00
|
|
|
trig_mod_SOURCES = trigtables.c
|
2009-11-14 22:11:55 +00:00
|
|
|
trig_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
trig_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-11-21 21:44:08 +00:00
|
|
|
trigtables.c: gentrigtables
|
|
|
|
|
./gentrigtables > $@
|
|
|
|
|
DISTCLEANFILES += trigtables.c
|
|
|
|
|
gentrigtables: gentrigtables.c
|
|
|
|
|
$(CC) -o $@ $^ $(CPPFLAGS) -lm
|
|
|
|
|
DISTCLEANFILES += gentrigtables
|
|
|
|
|
|
2009-07-01 12:59:47 +00:00
|
|
|
pkglib_MODULES += setjmp.mod
|
|
|
|
|
setjmp_mod_SOURCES = lib/$(target_cpu)/setjmp.S
|
|
|
|
|
setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
|
|
|
|
|
setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2009-11-09 17:43:53 +00:00
|
|
|
|
2009-12-27 15:37:18 +00:00
|
|
|
pkglib_MODULES += regexp.mod
|
|
|
|
|
regexp_mod_SOURCES = gnulib/regex.c commands/regexp.c
|
2010-03-28 19:43:42 +00:00
|
|
|
regexp_mod_CFLAGS = $(COMMON_CFLAGS) $(GNULIB_CFLAGS)
|
2009-12-27 15:37:18 +00:00
|
|
|
regexp_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2010-03-28 16:31:40 +00:00
|
|
|
|
2009-12-25 02:36:42 +00:00
|
|
|
pkglib_MODULES += terminal.mod
|
|
|
|
|
terminal_mod_SOURCES = commands/terminal.c
|
|
|
|
|
terminal_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
2009-12-22 13:28:39 +00:00
|
|
|
|
2009-11-12 21:40:14 +00:00
|
|
|
pkglib_MODULES += crypto.mod
|
|
|
|
|
crypto_mod_SOURCES = lib/crypto.c
|
|
|
|
|
crypto_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
crypto_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-12-23 19:31:12 +00:00
|
|
|
pkglib_MODULES += hashsum.mod
|
|
|
|
|
hashsum_mod_SOURCES = commands/hashsum.c
|
|
|
|
|
hashsum_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
hashsum_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-11-24 01:32:29 +00:00
|
|
|
pkglib_MODULES += pbkdf2.mod
|
|
|
|
|
pbkdf2_mod_SOURCES = lib/pbkdf2.c
|
|
|
|
|
pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-11-24 01:36:21 +00:00
|
|
|
# For password_pbkdf2.mod.
|
|
|
|
|
pkglib_MODULES += password_pbkdf2.mod
|
|
|
|
|
password_pbkdf2_mod_SOURCES = commands/password_pbkdf2.c
|
|
|
|
|
password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2010-02-07 22:49:49 +00:00
|
|
|
# For memdisk.mod.
|
|
|
|
|
pkglib_MODULES += memdisk.mod
|
|
|
|
|
memdisk_mod_SOURCES = disk/memdisk.c
|
|
|
|
|
memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For reboot.mod.
|
|
|
|
|
pkglib_MODULES += reboot.mod
|
|
|
|
|
reboot_mod_SOURCES = commands/reboot.c
|
|
|
|
|
reboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For date.mod
|
|
|
|
|
pkglib_MODULES += date.mod
|
|
|
|
|
date_mod_SOURCES = commands/date.c
|
|
|
|
|
date_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
date_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For datehook.mod
|
|
|
|
|
pkglib_MODULES += datehook.mod
|
|
|
|
|
datehook_mod_SOURCES = hook/datehook.c
|
|
|
|
|
datehook_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For lsmmap.mod
|
|
|
|
|
pkglib_MODULES += lsmmap.mod
|
|
|
|
|
lsmmap_mod_SOURCES = commands/lsmmap.c
|
|
|
|
|
lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
|
|
|
|
# For boot.mod.
|
|
|
|
|
pkglib_MODULES += boot.mod
|
|
|
|
|
boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
|
|
|
|
|
boot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
|
|
|
|
|
2009-11-26 16:34:22 +00:00
|
|
|
bin_UTILITIES += grub-mkpasswd-pbkdf2
|
2010-02-07 15:13:59 +00:00
|
|
|
grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c util/mm.c kern/err.c
|
2009-12-06 19:11:50 +00:00
|
|
|
grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
|
2009-11-24 01:36:21 +00:00
|
|
|
|
2009-11-09 16:13:17 +00:00
|
|
|
include $(srcdir)/conf/gcry.mk
|