2002-12-27 08:53:07 +00:00
|
|
|
# -*- makefile -*-
|
|
|
|
|
|
|
|
|
|
COMMON_ASFLAGS = -nostdinc -fno-builtin
|
2002-12-28 07:16:30 +00:00
|
|
|
COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
# Images.
|
2004-07-11 13:44:23 +00:00
|
|
|
pkgdata_IMAGES = boot.img diskboot.img kernel.img pxeboot.img
|
2002-12-27 08:53:07 +00:00
|
|
|
|
|
|
|
|
# For boot.img.
|
|
|
|
|
boot_img_SOURCES = boot/i386/pc/boot.S
|
|
|
|
|
boot_img_ASFLAGS = $(COMMON_ASFLAGS)
|
|
|
|
|
boot_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
|
|
|
|
|
|
2004-07-11 13:44:23 +00:00
|
|
|
# For pxeboot.img
|
|
|
|
|
pxeboot_img_SOURCES = boot/i386/pc/pxeboot.S
|
|
|
|
|
pxeboot_img_ASFLAGS = $(COMMON_ASFLAGS)
|
2005-07-16 22:06:33 +00:00
|
|
|
pxeboot_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
|
2004-07-11 13:44:23 +00:00
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
# For diskboot.img.
|
|
|
|
|
diskboot_img_SOURCES = boot/i386/pc/diskboot.S
|
|
|
|
|
diskboot_img_ASFLAGS = $(COMMON_ASFLAGS)
|
|
|
|
|
diskboot_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,8000
|
|
|
|
|
|
|
|
|
|
# For kernel.img.
|
|
|
|
|
kernel_img_SOURCES = kern/i386/pc/startup.S 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 \
|
2004-12-04 Marco Gerards <metgerards@student.han.nl>
Modulize the partition map support and add support for the amiga
partition map.
* commands/ls.c: Include <grub/partition.h> instead of
<grub/machine/partition.h>.
* kern/disk.c: Likewise.
* kern/rescue.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* normal/cmdline.c: Likewise.
* kern/powerpc/ieee1275/init.c: Likewise.
(grub_machine_init): Call `grub_pc_partition_map_init',
`grub_amiga_partition_map_init' and
`grub_apple_partition_map_init'.
* conf/i386-pc.rmk (kernel_img_SOURCES): Remove
`disk/i386/pc/partition.c'. Add `kern/partition.c'.
(kernel_img_HEADERS): Remove `machine/partition.h'. Add
`partition.h' and `pc_partition.h'.
(grub_setup_SOURCES): Remove
`disk/i386/pc/partition.c'. Add `kern/partition.c',
`partmap/amiga.c', `partmap/apple.c' and `partmap/pc.c'.
(grub_emu_SOURCES): Likewise.
(pkgdata_MODULES): Add `amiga.mod', `apple.mod' and `pc.mod'.
(amiga_mod_SOURCES, amiga_mod_CFLAGS, apple_mod_SOURCES)
(apple_mod_CFLAGS, pc_mod_SOURCES, pc_mod_CFLAGS): New variables.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Remove
`disk/powerpc/ieee1275/partition.c'. Add `kern/partition.c',
`partmap/amiga.c', `partmap/apple.c' and `partmap/pc.c'.
(grubof_SOURCES): Likewise.
* disk/i386/pc/partition.c: File removed.
* disk/powerpc/ieee1275/partition.c: Likewise.
* include/grub/powerpc/ieee1275/partition.h: Likewise.
* include/grub/i386/pc/partition.h: Likewise.
* kern/partition.c: New file.
* partmap/amiga.c: Likewise.
* partmap/apple.c: Likewise.
* partmap/pc.c: Likewise.
* include/grub/partition.h: Likewise..
* include/grub/pc_partition.h: Likewise.
* util/grub-emu.c: Include <grub/partition.h> instead of
<grub/machine/partition.h>.
(main): Call `grub_pc_partition_map_init',
`grub_amiga_partition_map_init' and
`grub_apple_partition_map_init' and deinitialize afterwards.
* util/i386/pc/biosdisk.c: Include `#include
<grub/partition.h>' and `include <grub/pc_partition.h>' instead of
`<grub/machine/partition.h>'.
* util/i386/pc/grub-setup.c: Likewise.
* util/i386/pc/biosdisk.c: Likewise.
(grub_util_biosdisk_get_grub_dev): Only access the PC specific
partition information in case of a PC partition.
* util/i386/pc/grub-setup.c: Include `#include
<grub/partition.h>' and `include <grub/pc_partition.h>' instead of
`<grub/machine/partition.h>'.
(setup): Only access the PC specific partition information in case
of a PC partition.
2004-12-04 18:45:46 +00:00
|
|
|
kern/i386/dl.c kern/i386/pc/init.c kern/partition.c \
|
2004-03-14 Marco Gerards <metgerards@student.han.nl>
* commands/boot.c: New file.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/ls.c: Likewise.
* commands/terminal.c: Likewise.
* normal/command.c: Include <pupa/env.h> and <pupa/dl.h>.
(pupa_register_command): Changed interface to match the new
argument parser.
(pupa_command_execute): Changed (almost rewritten) so it uses
pupa_split_command. Added support for setting variables using the
syntax `foo=bar'.
(rescue_command): Changed to work with the new argument parser.
(terminal_command): Moved from here to commands/terminal.c.
(set_command): New function.
(unset_command): New function.
(insmod_command): New function.
(rmmod_command): New function.
(lsmod_command): New function.
(pupa_command_init): Don't initialize the command terminal
anymore. Initialize the commands set, unset, insmod, rmmod and
lsmod.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c.
(kernel_img_HEADERS): Add arg.h and env.h.
(pupa_mkimage_LDFLAGS): Add kern/env.c.
(pupa_emu_SOURCES): Add kern/env.c, commands/ls.c,
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c,
normal/arg.c.
(pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and
terminal.mod.
(normal_mod_SOURCES): Add normal/arg.c and normal/arg.c.
(boot_mod_SOURCES): New variable.
(terminal_mod_SOURCES): Likewise.
(ls_mod_SOURCES): Likewise.
(cmp_mod_SOURCES): Likewise.
(cat_mod_SOURCES): Likewise.
* normal/arg.c: New file.
* kern/env.c: Likewise.
* include/pupa/arg.h: Likewise.
* include/pupa/env.h: Likewise.
* font/manager.c (font_command): Changed to match argument parsing
interface changes.
(PUPA_MOD_INIT): Likewise.
* hello/hello.c (pupa_cmd_hello): Likewise.
(PUPA_MOD_INIT): Likewise.
* include/pupa/disk.h: Include <pupa/device.h>.
(pupa_print_partinfo): New prototype.
* include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed.
(pupa_dl_get_prefix): Likewise.
* include/pupa/misc.h: Include <pupa/err.h>.
(pupa_isgraph): New prototype.
(pupa_isdigit): Likewise.
(pupa_split_cmdline): Likewise.
* include/pupa/normal.h: Include <pupa/arg.h>.
(pupa_command): Changed the prototype of the member `func' to
match the argument parsing interface. Added member `options'.
(pupa_register_command): Updated to match function.
(pupa_arg_parse): New prototype.
(pupa_hello_init) [PUPA_UTIL]: New prototype.
(pupa_hello_fini) [PUPA_UTIL]: Likewise.
(pupa_ls_init) [PUPA_UTIL]: Likewise.
(pupa_ls_fini) [PUPA_UTIL]: Likewise.
(pupa_cat_init) [PUPA_UTIL]: Likewise.
(pupa_cat_fini) [PUPA_UTIL]: Likewise.
(pupa_boot_init) [PUPA_UTIL]: Likewise.
(pupa_boot_fini) [PUPA_UTIL]: Likewise.
(pupa_cmp_init) [PUPA_UTIL]: Likewise.
(pupa_cmp_fini) [PUPA_UTIL]: Likewise.
(pupa_terminal_init) [PUPA_UTIL]: Likewise.
(pupa_terminal_fini) [PUPA_UTIL]: Likewise.
* kern/disk.c: Include <pupa/file.h>.
(pupa_print_partinfo): New function.
* kern/dl.c: Include <pupa/env.h>.
(pupa_dl_dir): Variable removed.
(pupa_dl_load): Use the environment variable `prefix' instead of
the variable pupa_dl_dir.
(pupa_dl_set_prefix): Function removed.
(pupa_dl_get_prefix): Likewise.
* kern/i386/pc/init.c: Include <pupa/env.h>.
(pupa_machine_init): Use the environment variable `prefix' instead of
using pupa_dl_set_prefix to set the prefix.
* kern/main.c: Include <pupa/env.h>.
(pupa_set_root_dev): Use the environment variable `prefix' instead of
using pupa_dl_get_prefix to get the prefix.
* kern/misc.c: Include <pupa/env.h>.
(pupa_isdigit): New function.
(pupa_isgraph): Likewise.
(pupa_ftoa): Likewise.
(pupa_vsprintf): Added support for printing values of the type
`double'. Make it possible to format variable output when using
formatting like `%1.2%f'.
(pupa_split_cmdline): New function.
* kern/rescue.c: Include <pupa/env.h>.
(next_word): Removed function.
(pupa_rescue_cmd_prefix): Likewise.
(pupa_rescue_cmd_set): New function.
(pupa_rescue_cmd_unset): New function.
(pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to
split the command line instead of splitting it here. Added
support for setting variables using the syntax `foo=bar'. Don't
initialize the prefix command anymore. Initialized the set and
unset commands.
* normal/cmdline.c: Include <pupa/env.h>.
(pupa_tab_complete): Added prototypes for print_simple_completion,
print_partition_completion, add_completion, iterate_commands,
iterate_dev, iterate_part and iterate_dir. Moved code to print
partition information from here to kern/disk.c.
(pupa_cmdline_run): Don't check if the funtion exists anymore.
* normal/main.c: Include <pupa/env.h>.
(pupa_rescue_cmd_normal): Use the environment variable `prefix'
instead of using pupa_dl_get_prefix to get the prefix.
* term/i386/pc/vga.c: Include <pupa/arg.h>.
(check_vga_mem): Cast pointers to `void *' to silence a gcc
warning.
(pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case.
(pupa_vga_setcolor): Declare unused variables with `__attribute__
((unused))' to silence a gcc warning.
(pupa_vga_setcolor): Likewise.
(debug_command): Changed to match argument parsing
interface changes.
* util/pupa-emu.c: Include <pupa/env.h>.
(options): Added 0's for unused fields to silence a gcc warning.
(argp): Likewise.
(main): Use the environment variable `prefix' instead of using
pupa_dl_set_prefix to set the prefix. Initialize the commands ls,
boot, cmp, cat and terminal. Finish the commands boot, cmp, cat
and terminal.
* util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>.
* util/misc.c: Include <malloc.h>.
(pupa_malloc): Rewritten so errors are correctly reported.
(pupa_realloc): Likewise.
(pupa_memalign): Likewise.
(pupa_mm_init_region): Declare unused variables with
`__attribute__ ((unused))' to silence a gcc warning.
* normal/i386/setjmp.S: Remove tab at the end of the file to
silence a gcc warning.
* loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused
variables with `__attribute__ ((unused))' to silence a gcc
warning.
* loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the
local variable i unsigned to silence a gcc warning.
* kern/term.c: Include <pupa/misc.h>.
(pupa_more_lines): New variable.
(pupa_more): Likewise.
(pupa_putcode): When the pager is active pause at the end of every
screen.
(pupa_set_more): New function.
* include/pupa/term.h (pupa_set_more): New prototype.
2004-03-13 13:59:25 +00:00
|
|
|
kern/env.c disk/i386/pc/biosdisk.c \
|
2002-12-27 08:53:07 +00:00
|
|
|
term/i386/pc/console.c \
|
|
|
|
|
symlist.c
|
2004-09-10 20:31:55 +00:00
|
|
|
kernel_img_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \
|
2002-12-27 08:53:07 +00:00
|
|
|
file.h fs.h kernel.h loader.h misc.h mm.h net.h rescue.h symbol.h \
|
|
|
|
|
term.h types.h machine/biosdisk.h machine/boot.h \
|
|
|
|
|
machine/console.h machine/init.h machine/memory.h \
|
2004-12-04 Marco Gerards <metgerards@student.han.nl>
Modulize the partition map support and add support for the amiga
partition map.
* commands/ls.c: Include <grub/partition.h> instead of
<grub/machine/partition.h>.
* kern/disk.c: Likewise.
* kern/rescue.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* normal/cmdline.c: Likewise.
* kern/powerpc/ieee1275/init.c: Likewise.
(grub_machine_init): Call `grub_pc_partition_map_init',
`grub_amiga_partition_map_init' and
`grub_apple_partition_map_init'.
* conf/i386-pc.rmk (kernel_img_SOURCES): Remove
`disk/i386/pc/partition.c'. Add `kern/partition.c'.
(kernel_img_HEADERS): Remove `machine/partition.h'. Add
`partition.h' and `pc_partition.h'.
(grub_setup_SOURCES): Remove
`disk/i386/pc/partition.c'. Add `kern/partition.c',
`partmap/amiga.c', `partmap/apple.c' and `partmap/pc.c'.
(grub_emu_SOURCES): Likewise.
(pkgdata_MODULES): Add `amiga.mod', `apple.mod' and `pc.mod'.
(amiga_mod_SOURCES, amiga_mod_CFLAGS, apple_mod_SOURCES)
(apple_mod_CFLAGS, pc_mod_SOURCES, pc_mod_CFLAGS): New variables.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Remove
`disk/powerpc/ieee1275/partition.c'. Add `kern/partition.c',
`partmap/amiga.c', `partmap/apple.c' and `partmap/pc.c'.
(grubof_SOURCES): Likewise.
* disk/i386/pc/partition.c: File removed.
* disk/powerpc/ieee1275/partition.c: Likewise.
* include/grub/powerpc/ieee1275/partition.h: Likewise.
* include/grub/i386/pc/partition.h: Likewise.
* kern/partition.c: New file.
* partmap/amiga.c: Likewise.
* partmap/apple.c: Likewise.
* partmap/pc.c: Likewise.
* include/grub/partition.h: Likewise..
* include/grub/pc_partition.h: Likewise.
* util/grub-emu.c: Include <grub/partition.h> instead of
<grub/machine/partition.h>.
(main): Call `grub_pc_partition_map_init',
`grub_amiga_partition_map_init' and
`grub_apple_partition_map_init' and deinitialize afterwards.
* util/i386/pc/biosdisk.c: Include `#include
<grub/partition.h>' and `include <grub/pc_partition.h>' instead of
`<grub/machine/partition.h>'.
* util/i386/pc/grub-setup.c: Likewise.
* util/i386/pc/biosdisk.c: Likewise.
(grub_util_biosdisk_get_grub_dev): Only access the PC specific
partition information in case of a PC partition.
* util/i386/pc/grub-setup.c: Include `#include
<grub/partition.h>' and `include <grub/pc_partition.h>' instead of
`<grub/machine/partition.h>'.
(setup): Only access the PC specific partition information in case
of a PC partition.
2004-12-04 18:45:46 +00:00
|
|
|
machine/loader.h partition.h pc_partition.h machine/time.h machine/vga.h
|
2002-12-27 08:53:07 +00:00
|
|
|
kernel_img_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
|
|
|
|
|
kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,8200
|
|
|
|
|
|
|
|
|
|
MOSTLYCLEANFILES += symlist.c kernel_syms.lst
|
|
|
|
|
DEFSYMFILES += kernel_syms.lst
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) gensymlist.sh
|
2002-12-27 08:53:07 +00:00
|
|
|
sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) genkernsyms.sh
|
2002-12-27 08:53:07 +00:00
|
|
|
sh $(srcdir)/genkernsyms.sh $(filter %h,$^) > $@
|
|
|
|
|
|
|
|
|
|
# Utilities.
|
2004-04-04 13:46:03 +00:00
|
|
|
bin_UTILITIES = grub-mkimage
|
2005-07-10 07:57:49 +00:00
|
|
|
sbin_UTILITIES = grub-setup grub-emu grub-mkdevicemap
|
2002-12-27 08:53:07 +00:00
|
|
|
noinst_UTILITIES = genmoddep
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
# For grub-mkimage.
|
|
|
|
|
grub_mkimage_SOURCES = util/i386/pc/grub-mkimage.c util/misc.c \
|
2002-12-27 08:53:07 +00:00
|
|
|
util/resolve.c
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_mkimage_LDFLAGS = -llzo
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
# For grub-setup.
|
|
|
|
|
grub_setup_SOURCES = util/i386/pc/grub-setup.c util/i386/pc/biosdisk.c \
|
2003-11-17 18:07:09 +00:00
|
|
|
util/misc.c util/i386/pc/getroot.c kern/device.c kern/disk.c \
|
2004-12-04 Marco Gerards <metgerards@student.han.nl>
Modulize the partition map support and add support for the amiga
partition map.
* commands/ls.c: Include <grub/partition.h> instead of
<grub/machine/partition.h>.
* kern/disk.c: Likewise.
* kern/rescue.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* normal/cmdline.c: Likewise.
* kern/powerpc/ieee1275/init.c: Likewise.
(grub_machine_init): Call `grub_pc_partition_map_init',
`grub_amiga_partition_map_init' and
`grub_apple_partition_map_init'.
* conf/i386-pc.rmk (kernel_img_SOURCES): Remove
`disk/i386/pc/partition.c'. Add `kern/partition.c'.
(kernel_img_HEADERS): Remove `machine/partition.h'. Add
`partition.h' and `pc_partition.h'.
(grub_setup_SOURCES): Remove
`disk/i386/pc/partition.c'. Add `kern/partition.c',
`partmap/amiga.c', `partmap/apple.c' and `partmap/pc.c'.
(grub_emu_SOURCES): Likewise.
(pkgdata_MODULES): Add `amiga.mod', `apple.mod' and `pc.mod'.
(amiga_mod_SOURCES, amiga_mod_CFLAGS, apple_mod_SOURCES)
(apple_mod_CFLAGS, pc_mod_SOURCES, pc_mod_CFLAGS): New variables.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Remove
`disk/powerpc/ieee1275/partition.c'. Add `kern/partition.c',
`partmap/amiga.c', `partmap/apple.c' and `partmap/pc.c'.
(grubof_SOURCES): Likewise.
* disk/i386/pc/partition.c: File removed.
* disk/powerpc/ieee1275/partition.c: Likewise.
* include/grub/powerpc/ieee1275/partition.h: Likewise.
* include/grub/i386/pc/partition.h: Likewise.
* kern/partition.c: New file.
* partmap/amiga.c: Likewise.
* partmap/apple.c: Likewise.
* partmap/pc.c: Likewise.
* include/grub/partition.h: Likewise..
* include/grub/pc_partition.h: Likewise.
* util/grub-emu.c: Include <grub/partition.h> instead of
<grub/machine/partition.h>.
(main): Call `grub_pc_partition_map_init',
`grub_amiga_partition_map_init' and
`grub_apple_partition_map_init' and deinitialize afterwards.
* util/i386/pc/biosdisk.c: Include `#include
<grub/partition.h>' and `include <grub/pc_partition.h>' instead of
`<grub/machine/partition.h>'.
* util/i386/pc/grub-setup.c: Likewise.
* util/i386/pc/biosdisk.c: Likewise.
(grub_util_biosdisk_get_grub_dev): Only access the PC specific
partition information in case of a PC partition.
* util/i386/pc/grub-setup.c: Include `#include
<grub/partition.h>' and `include <grub/pc_partition.h>' instead of
`<grub/machine/partition.h>'.
(setup): Only access the PC specific partition information in case
of a PC partition.
2004-12-04 18:45:46 +00:00
|
|
|
kern/err.c kern/misc.c fs/fat.c fs/ext2.c \
|
2005-02-21 22:00:32 +00:00
|
|
|
kern/partition.c partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
|
2004-09-11 11:42:43 +00:00
|
|
|
fs/ufs.c fs/minix.c fs/hfs.c fs/jfs.c kern/file.c kern/fs.c kern/env.c fs/fshelp.c
|
2003-11-17 18:07:09 +00:00
|
|
|
|
2005-07-10 07:57:49 +00:00
|
|
|
# For grub-mkdevicemap.
|
|
|
|
|
grub_mkdevicemap_SOURCES = util/i386/pc/grub-mkdevicemap.c util/misc.c
|
|
|
|
|
|
|
|
|
|
# For grub-emu.
|
2005-02-15 00:07:01 +00:00
|
|
|
grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \
|
2005-03-02 20:12:46 +00:00
|
|
|
commands/configfile.c commands/default.c commands/help.c \
|
|
|
|
|
commands/terminal.c commands/ls.c commands/timeout.c \
|
2005-02-15 00:07:01 +00:00
|
|
|
commands/i386/pc/halt.c commands/i386/pc/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 \
|
2005-02-27 21:19:06 +00:00
|
|
|
normal/arg.c normal/cmdline.c normal/command.c normal/context.c \
|
|
|
|
|
normal/main.c normal/menu.c normal/menu_entry.c \
|
2005-02-21 22:00:32 +00:00
|
|
|
partmap/amiga.c partmap/apple.c partmap/pc.c partmap/sun.c \
|
2005-02-15 00:07:01 +00:00
|
|
|
util/console.c util/grub-emu.c util/misc.c \
|
|
|
|
|
util/i386/pc/biosdisk.c util/i386/pc/getroot.c \
|
|
|
|
|
util/i386/pc/misc.c
|
|
|
|
|
|
2004-04-04 13:46:03 +00:00
|
|
|
grub_emu_LDFLAGS = -lncurses
|
2003-01-02 20:12:33 +00:00
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
# For genmoddep.
|
|
|
|
|
genmoddep_SOURCES = util/genmoddep.c
|
|
|
|
|
|
|
|
|
|
# Modules.
|
2005-02-27 21:19:06 +00:00
|
|
|
pkgdata_MODULES = _chain.mod _linux.mod linux.mod fat.mod ufs.mod \
|
|
|
|
|
ext2.mod minix.mod hfs.mod jfs.mod normal.mod hello.mod vga.mod \
|
|
|
|
|
font.mod _multiboot.mod ls.mod boot.mod cmp.mod cat.mod \
|
|
|
|
|
terminal.mod fshelp.mod chain.mod multiboot.mod amiga.mod \
|
|
|
|
|
apple.mod pc.mod sun.mod loopback.mod reboot.mod halt.mod \
|
2005-03-02 20:12:46 +00:00
|
|
|
help.mod default.mod timeout.mod configfile.mod
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2003-01-20 04:13:46 +00:00
|
|
|
# For _chain.mod.
|
|
|
|
|
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
|
|
|
|
|
_chain_mod_CFLAGS = $(COMMON_CFLAGS)
|
2002-12-27 08:53:07 +00:00
|
|
|
|
2004-09-12 12:20:52 +00:00
|
|
|
# For chain.mod.
|
|
|
|
|
chain_mod_SOURCES = loader/i386/pc/chainloader_normal.c
|
|
|
|
|
chain_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
2004-09-11 11:42:43 +00:00
|
|
|
# For fshelp.mod.
|
|
|
|
|
fshelp_mod_SOURCES = fs/fshelp.c
|
|
|
|
|
fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
2002-12-27 08:53:07 +00:00
|
|
|
# For fat.mod.
|
|
|
|
|
fat_mod_SOURCES = fs/fat.c
|
|
|
|
|
fat_mod_CFLAGS = $(COMMON_CFLAGS)
|
2003-01-17 02:52:05 +00:00
|
|
|
|
2003-10-29 18:44:30 +00:00
|
|
|
# For ext2.mod.
|
|
|
|
|
ext2_mod_SOURCES = fs/ext2.c
|
|
|
|
|
ext2_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
2004-05-24 21:32:21 +00:00
|
|
|
# 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)
|
|
|
|
|
|
2004-08-18 09:00:01 +00:00
|
|
|
# For hfs.mod.
|
|
|
|
|
hfs_mod_SOURCES = fs/hfs.c
|
|
|
|
|
hfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
2004-08-28 13:14:29 +00:00
|
|
|
# For jfs.mod.
|
|
|
|
|
jfs_mod_SOURCES = fs/jfs.c
|
|
|
|
|
jfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
2004-11-01 16:14:16 +00:00
|
|
|
# For iso9660.mod.
|
|
|
|
|
iso9660_mod_SOURCES = fs/iso9660.c
|
|
|
|
|
iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
2003-01-20 04:13:46 +00:00
|
|
|
# For _linux.mod.
|
|
|
|
|
_linux_mod_SOURCES = loader/i386/pc/linux.c
|
|
|
|
|
_linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
2004-09-17 09:36:52 +00:00
|
|
|
|
|
|
|
|
# For linux.mod.
|
|
|
|
|
linux_mod_SOURCES = loader/i386/pc/linux_normal.c
|
|
|
|
|
linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
2003-01-20 04:13:46 +00:00
|
|
|
|
|
|
|
|
# For normal.mod.
|
2005-02-19 20:56:07 +00:00
|
|
|
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
|
2005-02-27 21:19:06 +00:00
|
|
|
normal/context.c normal/main.c normal/menu.c \
|
|
|
|
|
normal/menu_entry.c normal/i386/setjmp.S
|
2003-01-20 04:13:46 +00:00
|
|
|
normal_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
|
2003-02-08 08:15:43 +00:00
|
|
|
|
|
|
|
|
# For hello.mod.
|
|
|
|
|
hello_mod_SOURCES = hello/hello.c
|
|
|
|
|
hello_mod_CFLAGS = $(COMMON_CFLAGS)
|
2003-09-25 20:15:53 +00:00
|
|
|
|
2004-03-14 Marco Gerards <metgerards@student.han.nl>
* commands/boot.c: New file.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/ls.c: Likewise.
* commands/terminal.c: Likewise.
* normal/command.c: Include <pupa/env.h> and <pupa/dl.h>.
(pupa_register_command): Changed interface to match the new
argument parser.
(pupa_command_execute): Changed (almost rewritten) so it uses
pupa_split_command. Added support for setting variables using the
syntax `foo=bar'.
(rescue_command): Changed to work with the new argument parser.
(terminal_command): Moved from here to commands/terminal.c.
(set_command): New function.
(unset_command): New function.
(insmod_command): New function.
(rmmod_command): New function.
(lsmod_command): New function.
(pupa_command_init): Don't initialize the command terminal
anymore. Initialize the commands set, unset, insmod, rmmod and
lsmod.
* conf/i386-pc.rmk (kernel_img_SOURCES): Add kern/env.c.
(kernel_img_HEADERS): Add arg.h and env.h.
(pupa_mkimage_LDFLAGS): Add kern/env.c.
(pupa_emu_SOURCES): Add kern/env.c, commands/ls.c,
commands/terminal.c commands/boot.c commands/cmp.c commands/cat.c,
normal/arg.c.
(pkgdata_MODULES): Add ls.mod, boot.mod, cmp.mod, cat.mod and
terminal.mod.
(normal_mod_SOURCES): Add normal/arg.c and normal/arg.c.
(boot_mod_SOURCES): New variable.
(terminal_mod_SOURCES): Likewise.
(ls_mod_SOURCES): Likewise.
(cmp_mod_SOURCES): Likewise.
(cat_mod_SOURCES): Likewise.
* normal/arg.c: New file.
* kern/env.c: Likewise.
* include/pupa/arg.h: Likewise.
* include/pupa/env.h: Likewise.
* font/manager.c (font_command): Changed to match argument parsing
interface changes.
(PUPA_MOD_INIT): Likewise.
* hello/hello.c (pupa_cmd_hello): Likewise.
(PUPA_MOD_INIT): Likewise.
* include/pupa/disk.h: Include <pupa/device.h>.
(pupa_print_partinfo): New prototype.
* include/pupa/dl.h (pupa_dl_set_prefix): Prototype removed.
(pupa_dl_get_prefix): Likewise.
* include/pupa/misc.h: Include <pupa/err.h>.
(pupa_isgraph): New prototype.
(pupa_isdigit): Likewise.
(pupa_split_cmdline): Likewise.
* include/pupa/normal.h: Include <pupa/arg.h>.
(pupa_command): Changed the prototype of the member `func' to
match the argument parsing interface. Added member `options'.
(pupa_register_command): Updated to match function.
(pupa_arg_parse): New prototype.
(pupa_hello_init) [PUPA_UTIL]: New prototype.
(pupa_hello_fini) [PUPA_UTIL]: Likewise.
(pupa_ls_init) [PUPA_UTIL]: Likewise.
(pupa_ls_fini) [PUPA_UTIL]: Likewise.
(pupa_cat_init) [PUPA_UTIL]: Likewise.
(pupa_cat_fini) [PUPA_UTIL]: Likewise.
(pupa_boot_init) [PUPA_UTIL]: Likewise.
(pupa_boot_fini) [PUPA_UTIL]: Likewise.
(pupa_cmp_init) [PUPA_UTIL]: Likewise.
(pupa_cmp_fini) [PUPA_UTIL]: Likewise.
(pupa_terminal_init) [PUPA_UTIL]: Likewise.
(pupa_terminal_fini) [PUPA_UTIL]: Likewise.
* kern/disk.c: Include <pupa/file.h>.
(pupa_print_partinfo): New function.
* kern/dl.c: Include <pupa/env.h>.
(pupa_dl_dir): Variable removed.
(pupa_dl_load): Use the environment variable `prefix' instead of
the variable pupa_dl_dir.
(pupa_dl_set_prefix): Function removed.
(pupa_dl_get_prefix): Likewise.
* kern/i386/pc/init.c: Include <pupa/env.h>.
(pupa_machine_init): Use the environment variable `prefix' instead of
using pupa_dl_set_prefix to set the prefix.
* kern/main.c: Include <pupa/env.h>.
(pupa_set_root_dev): Use the environment variable `prefix' instead of
using pupa_dl_get_prefix to get the prefix.
* kern/misc.c: Include <pupa/env.h>.
(pupa_isdigit): New function.
(pupa_isgraph): Likewise.
(pupa_ftoa): Likewise.
(pupa_vsprintf): Added support for printing values of the type
`double'. Make it possible to format variable output when using
formatting like `%1.2%f'.
(pupa_split_cmdline): New function.
* kern/rescue.c: Include <pupa/env.h>.
(next_word): Removed function.
(pupa_rescue_cmd_prefix): Likewise.
(pupa_rescue_cmd_set): New function.
(pupa_rescue_cmd_unset): New function.
(pupa_enter_rescue_mode): Use the `pupa_split_cmdline' function to
split the command line instead of splitting it here. Added
support for setting variables using the syntax `foo=bar'. Don't
initialize the prefix command anymore. Initialized the set and
unset commands.
* normal/cmdline.c: Include <pupa/env.h>.
(pupa_tab_complete): Added prototypes for print_simple_completion,
print_partition_completion, add_completion, iterate_commands,
iterate_dev, iterate_part and iterate_dir. Moved code to print
partition information from here to kern/disk.c.
(pupa_cmdline_run): Don't check if the funtion exists anymore.
* normal/main.c: Include <pupa/env.h>.
(pupa_rescue_cmd_normal): Use the environment variable `prefix'
instead of using pupa_dl_get_prefix to get the prefix.
* term/i386/pc/vga.c: Include <pupa/arg.h>.
(check_vga_mem): Cast pointers to `void *' to silence a gcc
warning.
(pupa_vga_putchar) [! DEBUG_VGA]: Removed for this case.
(pupa_vga_setcolor): Declare unused variables with `__attribute__
((unused))' to silence a gcc warning.
(pupa_vga_setcolor): Likewise.
(debug_command): Changed to match argument parsing
interface changes.
* util/pupa-emu.c: Include <pupa/env.h>.
(options): Added 0's for unused fields to silence a gcc warning.
(argp): Likewise.
(main): Use the environment variable `prefix' instead of using
pupa_dl_set_prefix to set the prefix. Initialize the commands ls,
boot, cmp, cat and terminal. Finish the commands boot, cmp, cat
and terminal.
* util/i386/pc/getroot.c: Include <pupa/i386/pc/util/biosdisk.h>.
* util/misc.c: Include <malloc.h>.
(pupa_malloc): Rewritten so errors are correctly reported.
(pupa_realloc): Likewise.
(pupa_memalign): Likewise.
(pupa_mm_init_region): Declare unused variables with
`__attribute__ ((unused))' to silence a gcc warning.
* normal/i386/setjmp.S: Remove tab at the end of the file to
silence a gcc warning.
* loader/i386/pc/linux.c (pupa_rescue_cmd_initrd): Declare unused
variables with `__attribute__ ((unused))' to silence a gcc
warning.
* loader/i386/pc/multiboot.c (pupa_multiboot_unload): Make the
local variable i unsigned to silence a gcc warning.
* kern/term.c: Include <pupa/misc.h>.
(pupa_more_lines): New variable.
(pupa_more): Likewise.
(pupa_putcode): When the pager is active pause at the end of every
screen.
(pupa_set_more): New function.
* include/pupa/term.h (pupa_set_more): New prototype.
2004-03-13 13:59:25 +00:00
|
|
|
# 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)
|
|
|
|
|
|
2005-01-31 21:40:25 +00:00
|
|
|
# For help.mod.
|
|
|
|
|
help_mod_SOURCES = commands/help.c
|
|
|
|
|
help_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
|
|
|
|
# For reboot.mod.
|
|
|
|
|
reboot_mod_SOURCES = commands/i386/pc/reboot.c
|
|
|
|
|
reboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
|
|
|
|
# For halt.mod.
|
|
|
|
|
halt_mod_SOURCES = commands/i386/pc/halt.c
|
|
|
|
|
halt_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
2003-09-25 20:15:53 +00:00
|
|
|
# For vga.mod.
|
|
|
|
|
vga_mod_SOURCES = term/i386/pc/vga.c
|
|
|
|
|
vga_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
|
|
|
|
# For font.mod.
|
|
|
|
|
font_mod_SOURCES = font/manager.c
|
|
|
|
|
font_mod_CFLAGS = $(COMMON_CFLAGS)
|
2003-11-16 16:36:39 +00:00
|
|
|
|
|
|
|
|
# For _multiboot.mod.
|
|
|
|
|
_multiboot_mod_SOURCES = loader/i386/pc/multiboot.c
|
|
|
|
|
_multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
2004-09-17 09:36:52 +00:00
|
|
|
|
|
|
|
|
# For multiboot.mod.
|
|
|
|
|
multiboot_mod_SOURCES = loader/i386/pc/multiboot_normal.c
|
|
|
|
|
multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
2004-12-04 Marco Gerards <metgerards@student.han.nl>
Modulize the partition map support and add support for the amiga
partition map.
* commands/ls.c: Include <grub/partition.h> instead of
<grub/machine/partition.h>.
* kern/disk.c: Likewise.
* kern/rescue.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* normal/cmdline.c: Likewise.
* kern/powerpc/ieee1275/init.c: Likewise.
(grub_machine_init): Call `grub_pc_partition_map_init',
`grub_amiga_partition_map_init' and
`grub_apple_partition_map_init'.
* conf/i386-pc.rmk (kernel_img_SOURCES): Remove
`disk/i386/pc/partition.c'. Add `kern/partition.c'.
(kernel_img_HEADERS): Remove `machine/partition.h'. Add
`partition.h' and `pc_partition.h'.
(grub_setup_SOURCES): Remove
`disk/i386/pc/partition.c'. Add `kern/partition.c',
`partmap/amiga.c', `partmap/apple.c' and `partmap/pc.c'.
(grub_emu_SOURCES): Likewise.
(pkgdata_MODULES): Add `amiga.mod', `apple.mod' and `pc.mod'.
(amiga_mod_SOURCES, amiga_mod_CFLAGS, apple_mod_SOURCES)
(apple_mod_CFLAGS, pc_mod_SOURCES, pc_mod_CFLAGS): New variables.
* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Remove
`disk/powerpc/ieee1275/partition.c'. Add `kern/partition.c',
`partmap/amiga.c', `partmap/apple.c' and `partmap/pc.c'.
(grubof_SOURCES): Likewise.
* disk/i386/pc/partition.c: File removed.
* disk/powerpc/ieee1275/partition.c: Likewise.
* include/grub/powerpc/ieee1275/partition.h: Likewise.
* include/grub/i386/pc/partition.h: Likewise.
* kern/partition.c: New file.
* partmap/amiga.c: Likewise.
* partmap/apple.c: Likewise.
* partmap/pc.c: Likewise.
* include/grub/partition.h: Likewise..
* include/grub/pc_partition.h: Likewise.
* util/grub-emu.c: Include <grub/partition.h> instead of
<grub/machine/partition.h>.
(main): Call `grub_pc_partition_map_init',
`grub_amiga_partition_map_init' and
`grub_apple_partition_map_init' and deinitialize afterwards.
* util/i386/pc/biosdisk.c: Include `#include
<grub/partition.h>' and `include <grub/pc_partition.h>' instead of
`<grub/machine/partition.h>'.
* util/i386/pc/grub-setup.c: Likewise.
* util/i386/pc/biosdisk.c: Likewise.
(grub_util_biosdisk_get_grub_dev): Only access the PC specific
partition information in case of a PC partition.
* util/i386/pc/grub-setup.c: Include `#include
<grub/partition.h>' and `include <grub/pc_partition.h>' instead of
`<grub/machine/partition.h>'.
(setup): Only access the PC specific partition information in case
of a PC partition.
2004-12-04 18:45:46 +00:00
|
|
|
|
|
|
|
|
# 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)
|
2005-01-21 21:32:03 +00:00
|
|
|
|
2005-02-21 22:00:32 +00:00
|
|
|
# For sun.mod
|
|
|
|
|
sun_mod_SOURCES = partmap/sun.c
|
|
|
|
|
sun_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
2005-01-21 21:32:03 +00:00
|
|
|
# For loopback.mod
|
|
|
|
|
loopback_mod_SOURCES = disk/loopback.c
|
|
|
|
|
loopback_mod_CFLAGS = $(COMMON_CFLAGS)
|
2005-02-27 21:19:06 +00:00
|
|
|
|
|
|
|
|
# For default.mod
|
|
|
|
|
default_mod_SOURCES = commands/default.c
|
2005-03-02 20:12:46 +00:00
|
|
|
default_mod_CFLAGS = $(COMMON_CFLAGS)
|
2005-02-27 21:19:06 +00:00
|
|
|
|
|
|
|
|
# For timeout.mod
|
|
|
|
|
timeout_mod_SOURCES = commands/timeout.c
|
2005-03-02 20:12:46 +00:00
|
|
|
timeout_mod_CFLAGS = $(COMMON_CFLAGS)
|
|
|
|
|
|
|
|
|
|
# For configfile.mod
|
|
|
|
|
configfile_mod_SOURCES = commands/configfile.c
|
|
|
|
|
configfile_mod_CFLAGS = $(COMMON_CFLAGS)
|