992ffbbebb
* normal/misc.c: New file.
* DISTLIST: Added normal/misc.c.
* partmap/amiga.c (amiga_partition_map_iterate): Add an argument
DISK to HOOK. Call HOOK with DISK.
* partmap/apple.c (apple_partition_map_iterate): Likewise.
* partmap/pc.c (pc_partition_map_iterate): Likewise.
* partmap/sun.c (sun_partition_map_iterate): Likewise.
* normal/menu_entry.c (struct screen): Added a new member
"completion_shown".
(completion_buffer): New global variable.
(make_screen): Set SCREEN->COMPLETION_SHOWN to zero.
(store_completion): New function.
(complete): Likewise.
(clear_completions): Likewise.
(grub_menu_entry_run): If SCREEN->COMPLETION_SHOWN is non-zero,
call clear_completions and reset SCREEN->COMPLETION_SHOWN. If C is
a tab, call complete.
* normal/completion.c (disk_dev): Removed.
(print_simple_completion): Likewise.
(print_partition_completion): Likewise.
(print_func): New global variable.
(add_completion): Do not take the arguments WHAT or PRINT any
longer. Added a new argument TYPE. Instead of printing directly,
call PRINT_FUNC if not NULL.
All callers changed.
(complete_device): Use a local variable DEV instead of
DISK_DEV. Do not move CURRENT_WORD to the end of a device name.
(grub_normal_do_completion): Take a new argument HOOK. Do not
initialize DISK_DEV. Initialize PRINT_FUNC to HOOK. If RET is an
empty string, return NULL instead.
All callers changed.
* normal/cmdline.c (print_completion): New function.
* kern/partition.c (grub_partition_iterate): Add an argument DISK
to HOOK.
All callers changed.
* kern/disk.c (grub_print_partinfo): Removed.
* include/grub/partition.h (struct grub_partition_map): Add a new
argument DISK into HOOK of ITERATE.
(grub_partition_iterate): Add a new argument DISK to HOOK.
* include/grub/normal.h (enum grub_completion_type): New enum.
(grub_completion_type_t): New type.
(GRUB_COMPLETION_TYPE_COMMAND): New constant.
(GRUB_COMPLETION_TYPE_DEVICE): Likewise.
(GRUB_COMPLETION_TYPE_PARTITION): Likewise.
(GRUB_COMPLETION_TYPE_FILE): Likewise.
(grub_normal_do_completion): Added a new argument HOOK.
(grub_normal_print_device_info): New prototype.
* include/grub/disk.h (grub_print_partinfo): Removed.
* conf/i386-pc.rmk (grub_emu_SOURCES): Added normal/misc.c.
(normal_mod_SOURCES): Likewise.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
(normal_mod_SOURCES): Likewise.
* commands/ls.c (grub_ls_list_disks): Use
grub_normal_print_device_info instead of grub_print_partinfo. Free
PNAME.
(grub_ls_list_files): Use grub_normal_print_device_info instead of
duplicating the code.
201 lines
5.7 KiB
Makefile
201 lines
5.7 KiB
Makefile
|
|
# -*- makefile -*-
|
|
|
|
COMMON_ASFLAGS = -nostdinc -D__ASSEMBLY__
|
|
COMMON_CFLAGS = -ffreestanding -msoft-float
|
|
|
|
# Images.
|
|
|
|
MOSTLYCLEANFILES += grubof_symlist.c kernel_syms.lst
|
|
DEFSYMFILES += kernel_syms.lst
|
|
|
|
grubof_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \
|
|
file.h fs.h kernel.h misc.h mm.h net.h rescue.h symbol.h \
|
|
term.h types.h powerpc/libgcc.h loader.h \
|
|
partition.h pc_partition.h ieee1275/ieee1275.h machine/time.h \
|
|
machine/kernel.h
|
|
|
|
grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) gensymlist.sh
|
|
sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
|
|
|
|
kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) genkernsyms.sh
|
|
sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
|
|
|
|
# Programs
|
|
pkgdata_PROGRAMS = grubof
|
|
|
|
# Utilities.
|
|
bin_UTILITIES = grub-emu grub-mkimage
|
|
noinst_UTILITIES = genmoddep
|
|
|
|
# For grub-mkimage.
|
|
grub_mkimage_SOURCES = util/powerpc/ieee1275/grub-mkimage.c util/misc.c \
|
|
util/resolve.c
|
|
|
|
# For grub-emu
|
|
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
|
|
commands/configfile.c commands/default.c commands/help.c \
|
|
commands/terminal.c commands/ls.c commands/timeout.c \
|
|
commands/ieee1275/halt.c commands/ieee1275/reboot.c \
|
|
disk/loopback.c \
|
|
fs/ext2.c fs/fat.c fs/fshelp.c fs/hfs.c fs/iso9660.c fs/jfs.c \
|
|
fs/minix.c fs/ufs.c \
|
|
kern/device.c kern/disk.c kern/dl.c kern/env.c kern/err.c \
|
|
kern/file.c kern/fs.c kern/loader.c kern/main.c kern/misc.c \
|
|
kern/partition.c kern/rescue.c kern/term.c \
|
|
normal/arg.c normal/cmdline.c normal/command.c \
|
|
normal/completion.c normal/context.c \
|
|
normal/main.c normal/menu.c normal/menu_entry.c normal/misc.c \
|
|
partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
|
|
util/console.c util/grub-emu.c util/misc.c \
|
|
util/i386/pc/biosdisk.c util/i386/pc/getroot.c \
|
|
util/powerpc/ieee1275/misc.c
|
|
|
|
grub_emu_LDFLAGS = $(LIBCURSES)
|
|
|
|
grubof_SOURCES = boot/powerpc/ieee1275/crt0.S boot/powerpc/ieee1275/cmain.c \
|
|
kern/ieee1275/ieee1275.c kern/main.c kern/device.c \
|
|
kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
|
|
kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \
|
|
kern/powerpc/ieee1275/init.c term/ieee1275/ofconsole.c \
|
|
kern/powerpc/ieee1275/openfw.c disk/ieee1275/ofdisk.c \
|
|
kern/partition.c kern/env.c kern/powerpc/dl.c grubof_symlist.c \
|
|
kern/powerpc/cache.S
|
|
grubof_HEADERS = grub/powerpc/ieee1275/ieee1275.h
|
|
grubof_CFLAGS = $(COMMON_CFLAGS)
|
|
grubof_ASFLAGS = $(COMMON_ASFLAGS)
|
|
grubof_LDFLAGS = -nostdlib -static-libgcc -lgcc -Wl,-N,-S,-Ttext,0x200000,-Bstatic
|
|
|
|
# For genmoddep.
|
|
genmoddep_SOURCES = util/genmoddep.c
|
|
|
|
# Modules.
|
|
pkgdata_MODULES = _linux.mod linux.mod fat.mod ufs.mod ext2.mod minix.mod \
|
|
hfs.mod jfs.mod normal.mod hello.mod font.mod ls.mod \
|
|
boot.mod cmp.mod cat.mod terminal.mod fshelp.mod amiga.mod apple.mod \
|
|
pc.mod suspend.mod loopback.mod help.mod reboot.mod halt.mod sun.mod \
|
|
default.mod timeout.mod configfile.mod
|
|
|
|
# For fshelp.mod.
|
|
fshelp_mod_SOURCES = fs/fshelp.c
|
|
fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For fat.mod.
|
|
fat_mod_SOURCES = fs/fat.c
|
|
fat_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For ext2.mod.
|
|
ext2_mod_SOURCES = fs/ext2.c
|
|
ext2_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For ufs.mod.
|
|
ufs_mod_SOURCES = fs/ufs.c
|
|
ufs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For minix.mod.
|
|
minix_mod_SOURCES = fs/minix.c
|
|
minix_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For hfs.mod.
|
|
hfs_mod_SOURCES = fs/hfs.c
|
|
hfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For jfs.mod.
|
|
jfs_mod_SOURCES = fs/jfs.c
|
|
jfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For iso9660.mod.
|
|
iso9660_mod_SOURCES = fs/iso9660.c
|
|
iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For _linux.mod.
|
|
_linux_mod_SOURCES = loader/powerpc/ieee1275/linux.c
|
|
_linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For linux.mod.
|
|
linux_mod_SOURCES = loader/powerpc/ieee1275/linux_normal.c
|
|
linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For normal.mod.
|
|
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
|
|
normal/completion.c normal/context.c normal/main.c \
|
|
normal/menu.c normal/menu_entry.c normal/misc.c \
|
|
normal/powerpc/setjmp.S
|
|
normal_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
|
|
|
|
# For hello.mod.
|
|
hello_mod_SOURCES = hello/hello.c
|
|
hello_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For boot.mod.
|
|
boot_mod_SOURCES = commands/boot.c
|
|
boot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For terminal.mod.
|
|
terminal_mod_SOURCES = commands/terminal.c
|
|
terminal_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For ls.mod.
|
|
ls_mod_SOURCES = commands/ls.c
|
|
ls_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For cmp.mod.
|
|
cmp_mod_SOURCES = commands/cmp.c
|
|
cmp_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For cat.mod.
|
|
cat_mod_SOURCES = commands/cat.c
|
|
cat_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For font.mod.
|
|
font_mod_SOURCES = font/manager.c
|
|
font_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For amiga.mod
|
|
amiga_mod_SOURCES = partmap/amiga.c
|
|
amiga_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For apple.mod
|
|
apple_mod_SOURCES = partmap/apple.c
|
|
apple_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For pc.mod
|
|
pc_mod_SOURCES = partmap/pc.c
|
|
pc_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For sun.mod
|
|
sun_mod_SOURCES = partmap/sun.c
|
|
sun_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For loopback.mod
|
|
loopback_mod_SOURCES = disk/loopback.c
|
|
loopback_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For suspend.mod
|
|
suspend_mod_SOURCES = commands/ieee1275/suspend.c
|
|
suspend_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For reboot.mod
|
|
reboot_mod_SOURCES = commands/ieee1275/reboot.c
|
|
reboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For halt.mod
|
|
halt_mod_SOURCES = commands/ieee1275/halt.c
|
|
halt_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For help.mod.
|
|
help_mod_SOURCES = commands/help.c
|
|
help_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For default.mod
|
|
default_mod_SOURCES = commands/default.c
|
|
default_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For timeout.mod
|
|
timeout_mod_SOURCES = commands/timeout.c
|
|
timeout_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
# For configfile.mod
|
|
configfile_mod_SOURCES = commands/configfile.c
|
|
configfile_mod_CFLAGS = $(COMMON_CFLAGS)
|