BVK Chaitanya
8c41176882
automake commit without merge history
2010-05-06 11:34:04 +05:30
Grégoire Sutre
50479febcf
* util/grub-install.in: Use mkdir -p to create grub directory.
...
* util/i386/efi/grub-install.in: Likewise.
* util/ieee1275/grub-install.in: Likewise.
2010-04-03 20:48:36 +02:00
Grégoire Sutre
bd5a6415b0
* util/i386/efi/grub-dumpdevtree: replaced the non-portable `==' by
...
`=' and added double quotes on operands of this equality test.
2010-04-03 20:23:21 +02:00
Vladimir 'phcoder' Serbinenko
c9ea504d25
merge mainline into nestpart
2010-03-26 15:44:13 +01:00
Colin Watson
bed1d3524e
* util/grub-install.in: Copy .mo files from @datadir@/locale, to
...
match where 'make install' puts them.
* util/i386/efi/grub-install.in: Likewise.
2010-03-21 23:04:02 +00:00
Vladimir 'phcoder' Serbinenko
08dcd91370
2010-03-04 Vladimir Serbinenko <phcoder@gmail.com>
...
* util/i386/efi/grub-install.in: Copy gettext files.
2010-03-04 15:12:34 +01:00
Vladimir 'phcoder' Serbinenko
85f90358b1
Remove part_ prefix
2010-02-06 19:33:53 +01:00
carles
409ae1c92a
2010-01-16 Carles Pina i Estany <carles@pina.cat>
...
* util/grub-editenv.c (usage): Use `program_name' instead of hardcoded
string.
* util/grub-emu.c (usage): Likewise.
* util/grub-mkpasswd-pbkdf2.c (usage): Likewise.
* util/i386/efi/grub-mkimage.c (usage): Likewise.
* util/i386/pc/grub-mkimage.c (usage): Likewise.
* util/i386/pc/grub-setup.c (usage): Likewise.
2010-01-16 00:39:14 +00:00
carles
70a14d3d49
2010-01-16 Carles Pina i Estany <carles@pina.cat>
...
* util/misc.c (grub_util_warn): Gettextizze, print full stop after
the message.
(grub_util_info): Likewise.
(grub_util_error): Likewise.
* util/elf/grub-mkimage.c: Fix capitalisation, quotes, full stops
and/or new lines in `grub_util_warna', `grub_util_info',
`grub_util_error' calls.
* util/getroot.c: Likewise.
* util/grub-editenv.c: Likewise.
* util/grub-emu.c: Likewise.
* util/grub-fstest.c: Likewise.
* util/grub-mkdevicemap.c: Likewise.
* util/grub-mkfont.c: Likewise.
* util/grub-mkpasswd-pbkdf2.c: Likewise.
* util/grub-mkrelpath.c: Likewise.
* util/grub-pe2elf.c: Likewise.
* util/grub-probe.c: Likewise.
* util/hostdisk.c: Likewise.
* util/i386/efi/grub-mkimage.c: Likewise.
* util/i386/pc/grub-mkimage.c: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/ieee1275/ofpath.c: Likewise.
* util/mkisofs/eltorito.c: Likewise.
* util/mkisofs/rock.c: Likewise.
* util/mkisofs/write.c: Likewise.
* util/raid.c: Likewise.
* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
* util/sparc64/ieee1275/grub-setup.c: Likewise.
2010-01-16 00:26:52 +00:00
Colin Watson
bc11fee9f5
merge from trunk
2010-01-05 10:53:03 +00:00
Robert Millan
d0e158c2f3
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-install.in (host_os): New variable.
* util/i386/efi/grub-install.in (host_os): Likewise.
2009-12-24 22:23:22 +00:00
Vladimir 'phcoder' Serbinenko
68693c0743
Reimpliment grub-dumpdevtree
2009-12-18 04:57:29 +01:00
Vladimir 'phcoder' Serbinenko
7ea73643f5
merge mtrunk into xnu
2009-12-18 03:57:32 +01:00
Colin Watson
e8b2988803
merge from trunk
2009-12-08 00:55:17 +00:00
Vladimir 'phcoder' Serbinenko
c8dea671ff
2009-12-02 Vladimir Serbinenko <phcoder@gmail.com>
...
Rename kernel.mod to kernel.img.
* conf/i386-efi.rmk (pkglib_MODULES): Change kernel.mod to kernel.img.
(kernel_mod_EXPORTS): Rename to ...
(kernel_img_EXPORTS): ... this.
(kernel_mod_SOURCES): Rename to ...
(kernel_img_SOURCES): ... this.
(kernel_mod_HEADERS): Rename to ...
(kernel_img_HEADERS): ... this. All users updated.
(kernel_mod_CFLAGS): Rename to ...
(kernel_img_CFLAGS): ... this.
(kernel_mod_ASFLAGS): Rename to ...
(kernel_img_ASFLAGS): ... this.
(kernel_mod_LDFLAGS): Rename to ...
(kernel_img_LDFLAGS): ... this.
* conf/x86_64-efi.rmk: Likewise.
* util/i386/efi/grub-mkimage.c (read_kernel_module): Rename to ...
(read_kernel_image): ... this. All users updated.
(read_kernel_image): Read "kernel.img" instead of "kernel.mod".
2009-12-02 17:13:45 +01:00
Felix Zielcke
242668a26a
2009-11-26 Felix Zielcke <fzielcke@z-51.de>
...
* util/i386/efi/grub-mkimage.c: Include "progname.h".
(main): Use `program_name' instead of nonexistent `progname'.
2009-11-26 17:15:16 +01:00
Colin Watson
242f0731c7
reimported savedefault by cjwatson and myself
...
Also-By: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
2009-11-20 09:41:20 +01:00
Vladimir 'phcoder' Serbinenko
1d3c6f1de7
Manually reimported XNU branch
2009-11-09 18:43:53 +01:00
robertmh
6b9b6276d4
2009-09-24 Pavel Roskin <proski@gnu.org>
...
* include/grub/kernel.h (struct grub_module_header): Remove
`grub_module_header_types'. Make `type' unsigned. Make `size'
32-bit on all platforms.
* util/elf/grub-mkimage.c (load_modules): Treat `type' as an
8-bit field. Use grub_host_to_target32() for `size'.
* util/i386/efi/grub-mkimage.c (make_mods_section): Likewise.
* util/i386/pc/grub-mkimage.c (generate_image): Likewise.
* util/sparc64/ieee1275/grub-mkimage.c (generate_image): Likewise.
2009-09-24 13:40:40 +00:00
phcoder
0b8e386c09
Revert 2 previous commits.
...
2009-08-23 Vladimir Serbinenko <phcoder@gmail.com>
Fix grub-install.
* util/grub-probe.c (probe_partmap): Prefix partmap with 'part_'.
2009-08-23 23:40:29 +00:00
phcoder
af0f0beafa
2009-08-23 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix grub-install.
* util/i386/efi/grub-install.in: Add 'part_' to partmap_module.
* util/sparc64/ieee1275/grub-install.in: Likewise.
2009-08-23 23:24:33 +00:00
robertmh
f5d35e7a4b
2009-08-08 Robert Millan <rmh.grub@aybabtu.com>
...
* util/grub-dumpdevtree: Moved from here ...
* util/i386/efi/grub-dumpdevtree: ... to here.
(hexify): New function. Converts a string to its hex version.
Generate hex versions of "efi" and "device-properties" by calling
hexify() on the ASCII strings rather than by hardcoding numbers.
2009-08-08 19:24:58 +00:00
proski
c402ab1734
2009-06-26 Pavel Roskin <proski@gnu.org>
...
* include/grub/types.h: Define GRUB_TARGET_WORDSIZE.
* include/grub/elf.h: Define symbols without "32" or "64" based
on GRUB_TARGET_WORDSIZE.
* include/grub/multiboot2.h: Use GRUB_TARGET_WORDSIZE.
* efiemu/loadcore32.c: Redefine GRUB_TARGET_WORDSIZE, remove own
ELF definitions.
* efiemu/loadcore64.c: Likewise.
* loader/i386/bsd32.c: Likewise.
* loader/i386/bsd64.c: Likewise.
* kern/dl.c: Remove own ELF definitions.
* util/i386/efi/grub-mkimage.c: Likewise.
2009-06-27 03:01:42 +00:00
fzielcke
1bd265f306
2009-06-17 Colin Watson <cjwatson@ubuntu.com>
...
* util/elf/grub-mkimage.c (usage): Prefix each option line with two
spaces, for the benefit of help2man.
* util/i386/efi/grub-mkimage.c (usage): Likewise.
2009-06-17 06:07:36 +00:00
fzielcke
b39f9d20a9
remove all trailing whitespace
2009-06-10 21:04:23 +00:00
phcoder
fd2bf2e388
2009-06-04 Vladimir Serbinenko <phcoder@gmail.com>
...
Fix wrong assumptions with grub-mkimage on EFI
* i386/efi/grub-mkimage.c (read_kernel_module): don't write prefox here
(relocate_addresses): consider both r_addend and value at offset
(make_mods_section): zerofill modinfo and header
(convert_elf): write prefix here
2009-06-04 19:32:46 +00:00
bean
6e09b8b72e
2009-02-24 Bean <bean123ch@gmail.com>
...
* configure.ac: Check for -mcmodel=large in x86_64 target.
* include/grub/efi/api.h (efi_call_10): New macro.
(efi_wrap_10): New function.
* include/grub/efi/pe32.h (GRUB_PE32_REL_BASE_HIGH): New macro.
(GRUB_PE32_REL_BASED_HIGH): Likewise.
(GRUB_PE32_REL_BASED_LOW): Likewise.
(GRUB_PE32_REL_BASED_HIGHLOW): Likewise.
(GRUB_PE32_REL_BASED_HIGHADJ): Likewise.
(GRUB_PE32_REL_BASED_MIPS_JMPADDR): Likewise.
(GRUB_PE32_REL_BASED_SECTION): Likewise.
(GRUB_PE32_REL_BASED_REL): Likewise.
(GRUB_PE32_REL_BASED_IA64_IMM64): Likewise.
(GRUB_PE32_REL_BASED_DIR64): Likewise.
(GRUB_PE32_REL_BASED_HIGH3ADJ): Likewise.
* kern/x86_64/dl.c (grub_arch_dl_relocate_symbols): Fixed relocation
issue.
* kern/x86_64/efi/callwrap.S (efi_wrap_6): Bug fix.
(efi_wrap_10): New function.
* kern/x86_64/efi/startup.S (codestart): Use relative addressing.
* loader/efi/appleloader.c (devpath_5): Add support for late 2008
MB/MBP model (NV chipset).
(devdata_devs): Add devpath_5 to the list.
* load/i386/efi/linux.c (video_base): Remove variable.
(RGB_MASK): New macro.
(RGB_MAGIC): Likewise.
(LINE_MIN): Likewise.
(LINE_MAX): Likewise.
(FBTEST_STEP): Likewise.
(FBTEST_COUNT): Likewise.
(fb_list): New variable.
(grub_find_video_card): Remove function.
(find_framebuf): New function.
(grub_linux_setup_video): Use find_framebuf to get frame buffer and
line length.
* util/i386/efi/grub-mkimage.c (grub_reloc_section): Fix relocation
problem for x86_64.
2009-02-24 13:19:46 +00:00
robertmh
f36cc10867
2009-01-10 Robert Millan <rmh@aybabtu.com>
...
Update a few copyright years which we forgot to do in 2008 (only for
files whose changes made in 2008 were copyright-significant)
* Makefile.in: Add 2008 to Copyright line.
* disk/ieee1275/ofdisk.c: Likewise.
* disk/efi/efidisk.c: Likewise.
* kern/dl.c: Likewise.
* kern/sparc64/ieee1275/init.c: Likewise.
* kern/mm.c: Likewise.
* kern/efi/mm.c: Likewise.
* boot/i386/pc/boot.S: Likewise.
* genfslist.sh: Likewise.
* fs/iso9660.c: Likewise.
* fs/hfs.c: Likewise.
* fs/jfs.c: Likewise.
* fs/minix.c: Likewise.
* fs/ufs.c: Likewise.
* gensymlist.sh.in: Likewise.
* genkernsyms.sh.in: Likewise.
* include/grub/misc.h: Likewise.
* include/grub/types.h: Likewise.
* include/grub/symbol.h: Likewise.
* include/grub/elf.h: Likewise.
* include/grub/kernel.h: Likewise.
* include/grub/disk.h: Likewise.
* include/grub/dl.h: Likewise.
* include/grub/i386/linux.h: Likewise.
* include/grub/i386/pc/biosdisk.h: Likewise.
* include/grub/efi/api.h: Likewise.
* include/grub/efi/pe32.h: Likewise.
* include/grub/util/misc.h: Likewise.
* normal/execute.c: Likewise.
* normal/arg.c: Likewise.
* normal/completion.c: Likewise.
* normal/lexer.c: Likewise.
* normal/parser.y: Likewise.
* normal/misc.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/hexdump.c: Likewise.
* commands/terminal.c: Likewise.
* commands/ls.c: Likewise.
* commands/help.c: Likewise.
* partmap/pc.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/multiboot_loader.c: Likewise.
* loader/i386/pc/multiboot2.c: Likewise.
* term/efi/console.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* util/lvm.c: Likewise.
* util/console.c: Likewise.
* util/i386/efi/grub-mkimage.c: Likewise.
* util/raid.c: Likewise.
2009-01-10 13:07:44 +00:00
robertmh
3bd0a12aca
2008-08-02 Robert Millan <rmh@aybabtu.com>
...
* disk/memdisk.c (memdisk_size): Don't initialize.
(GRUB_MOD_INIT(memdisk)): Find memdisk using grub_module_iterate().
* include/grub/i386/pc/kernel.h
(GRUB_KERNEL_MACHINE_MEMDISK_IMAGE_SIZE): Remove macro.
(GRUB_KERNEL_MACHINE_PREFIX, GRUB_KERNEL_MACHINE_DATA_END): Shift.
(grub_memdisk_image_size, grub_arch_memdisk_addr)
(grub_arch_memdisk_size): Remove.
* include/grub/kernel.h (struct grub_module_header): Remove `offset'
field (was only used to transfer a constant). Add `type' field to
support multiple module types.
(grub_module_iterate): New function.
* kern/device.c (grub_device_open): Do not hide error messages
when grub_disk_open() fails. Use grub_print_error() instead.
* kern/i386/pc/init.c (grub_arch_modules_addr)
(grub_arch_memdisk_size): Remove functions.
(grub_arch_modules_addr): Return the module address in high memory
(now that it isn't copied anymore).
* kern/i386/pc/startup.S (grub_memdisk_image_size): Remove variable.
(codestart): Don't add grub_memdisk_image_size to %ecx in LZMA
decompression routine (grub_total_module_size already includes that
now). Don't copy modules back to low memory.
* kern/main.c: Include `<grub/mm.h>'.
(grub_load_modules): Split out (and use) ...
(grub_module_iterate): ... this function, which iterates through
module objects and runs a hook.
Comment out grub_mm_init_region() call, as it would cause non-ELF
modules to be overwritten.
* util/i386/pc/grub-mkimage.c (generate_image): Instead of appending
the memdisk image in its own region, make it part of the module list.
* util/elf/grub-mkimage.c (options): Add "memdisk"|'m' option.
(main): Parse --memdisk|-m option, and pass user-provided path as
parameter to generate_image().
(add_segments): Pass `memdisk_path' down to load_modules().
(load_modules): Embed memdisk image in module section when requested.
* util/i386/efi/grub-mkimage.c (make_mods_section): Initialize
`header.type' instead of `header.offset'.
* conf/powerpc-ieee1275.rmk (pkglib_MODULES): Add `memdisk.mod'.
(memdisk_mod_SOURCES, memdisk_mod_CFLAGS)
(memdisk_mod_LDFLAGS): New variables.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
2008-08-02 12:17:44 +00:00
bean
2001169405
2008-07-17 Bean <bean123ch@gmail.com>
...
* conf/i386/efi.rmk (pkglib_MODULES): add pci.mod and lspci.mod.
(appleldr_mod_SOURCE): New variavle.
(appleldr_mod_CFLAGS): Likewise.
(appleldr_mod_LDFLAGS): Likewise.
(pci_mod_SOURCES): Likewise.
(pci_mod_CFLAGS): Likewise.
(pci_mod_LDFLAGS): Likewise.
(lspci_mod_SOURCES): Likewise.
(lspci_mod_CFLAGS): Likewise.
(lspci_mod_LDFLAGS): Likewise.
* conf/x86_64-efi.rmk: New file.
* disk/efi/efidisk.c (grub_efidisk_read): Wrap efi calls with efi_call_N
macro.
(grub_efidisk_write): Likewise.
* include/efi/api.h (efi_call_0): New macro.
(efi_call_1): Likewise.
(efi_call_2): Likewise.
(efi_call_3): Likewise.
(efi_call_4): Likewise.
(efi_call_5): Likewise.
(efi_call_6): Likewise.
* include/grub/efi/chainloader.h (grub_chainloader_cmd): Rename to
grub_rescue_cmd_chainloader.
* include/grub/efi/pe32.h (GRUB_PE32_MACHINE_X86_64): New macro.
(grub_pe32_optional_header): Change some fields based on i386 or
x86_64 platform.
(GRUB_PE32_PE32_MAGIC): Likewise.
* include/grub/efi/uga_draw.h: New file.
* include/grub/elf.h (STN_ABS): New constant.
(R_X86_64_NONE): Relocation constant for x86_64.
(R_X86_64_64): Likewise.
(R_X86_64_PC32): Likewise.
(R_X86_64_GOT32): Likewise.
(R_X86_64_PLT32): Likewise.
(R_X86_64_COPY): Likewise.
(R_X86_64_GLOB_DAT): Likewise.
(R_X86_64_JUMP_SLOT): Likewise.
(R_X86_64_RELATIVE): Likewise.
(R_X86_64_GOTPCREL): Likewise.
(R_X86_64_32): Likewise.
(R_X86_64_32S): Likewise.
(R_X86_64_16): Likewise.
(R_X86_64_PC16): Likewise.
(R_X86_64_8): Likewise.
(R_X86_64_PC8): Likewise.
* include/grub/i386/efi/pci.h: New file.
* include/grub/i386/linux.h (GRUB_LINUX_EFI_SIGNATURE):
Change it value based on platform.
(GRUB_LINUX_EFI_SIGNATURE_0204): New constant.
(GRUB_E820_RAM): Likewise.
(GRUB_E820_RESERVED): Likewise.
(GRUB_E820_ACPI): Likewise.
(GRUB_E820_NVS): Likewise.
(GRUB_E820_EXEC_CODE): Likewise.
(GRUB_E820_MAX_ENTRY): Likewise.
(grub_e820_mmap): New structure.
(linux_kernel_header): Change the efi field according to different
kernel version, also field from linux_kernel_header.
* include/grub/kernel.h (grub_module_info): Add padding for x86_64.
* include/grub/pci.h (GRUB_PCI_ADDR_SPACE_MASK): New constant.
(GRUB_PCI_ADDR_SPACE_MEMORY): Likewise.
(GRUB_PCI_ADDR_SPACE_IO): Likewise.
(GRUB_PCI_ADDR_MEM_TYPE_MASK): Likewise.
(GRUB_PCI_ADDR_MEM_TYPE_32): Likewise.
(GRUB_PCI_ADDR_MEM_TYPE_1M): Likewise.
(GRUB_PCI_ADDR_MEM_TYPE_64): Likewise.
(GRUB_PCI_ADDR_MEM_PREFETCH): Likewise.
(GRUB_PCI_ADDR_MEM_MASK): Likewise.
(GRUB_PCI_ADDR_IO_MASK): Likewise.
* include/grub/x86_64/efi/kernel.h: New file.
* include/grub/x86_64/efi/loader.h: Likewise.
* include/grub/x86_64/efi/machine.h: Likewise.
* include/grub/x86_64/efi/pci.h: Likewise.
* include/grub/x86_64/efi/time.h: Likewise.
* include/grub/x86_64/linux.h: Likewise.
* include/grub/x86_64/setjmp.h: Likewise.
* include/grub/x86_64/time.h: Likewise.
* include/grub/x86_64/types.h: Likewise.
* kern/dl.c (GRUB_CPU_SIZEOF_VOID_P): Changed to
GRUB_TARGET_SIZEOF_VOID_P.
* kern/efi/efi.c (grub_efi_locate_protocol): Wrap efi calls.
(grub_efi_locate_handle): Likewise.
(grub_efi_open_protocol): Likewise.
(grub_efi_set_text_mode): Likewise.
(grub_efi_stall): Likewise.
(grub_exit): Likewise.
(grub_reboot): Likewise.
(grub_halt): Likewise.
(grub_efi_exit_boot_services): Likewise.
(grub_get_rtc): Likewise.
* kern/efi/mm.c (MEMORY_MAP_SIZE): Change to 0x3000 for new models.
(GRUB_CPU_SIZEOF_VOID_P): Changed to GRUB_TARGET_SIZEOF_VOID_P.
(grub_efi_allocate_pages): Wrap efi calls.
(grub_efi_free_pages): Wrap efi calls.
(grub_efi_get_memory_map): Wrap efi calls.
* kern/x86_64/dl.c: New file.
* kern/x86_64/efi/callwrap.S: Likewise.
* kern/x86_64/efi/startup.S: Likewise.
* loader/efi/appleloader.c: Likewise.
* loader/efi/chainloader.c (cmdline): New variable.
(grub_chainloader_unload): Wrap efi calls.
(grub_chainloader_boot): Likewise.
(grub_rescue_cmd_chainloader): Wrap efi calls, handle
command line.
* loader/efi/chainloader_normal.c (chainloader_command):
Change grub_chainloader_cmd to grub_rescue_cmd_chainloader, pass
command line.
* loader/i386/efi/linux.c (allocate_pages): Change allocation
method.
(grub_e820_add_region): New function.
(grub_linux_boot): Construct e820 map from efi map, handle x86_64
booting.
(grub_find_video_card): New function.
(grub_linux_setup_video): New function.
(grub_rescue_cmd_linux): Probe for video information.
* normal/x86_64/setjmp.S: New file.
* term/efi/console.c (map_char): New function.
(grub_console_putchar): Map unicode char.
(grub_console_checkkey): Wrap efi calls.
(grub_console_getkey): Likewise.
(grub_console_getwh): Likewise.
(grub_console_gotoxy): Likewise.
(grub_console_cls): Likewise.
(grub_console_setcolorstate): Likewise.
(grub_console_setcursor): Likewise.
* util/i386/efi/grub-mkimage.c: Add support for x86_64.
2008-07-17 09:50:26 +00:00
proski
59652a208f
2008-07-16 Pavel Roskin <proski@gnu.org>
...
* util/i386/efi/grub-mkimage.c (get_target_address): Return a
pointer, not an integer. This fixes a warning and prevents
precision loss on 64-bit systems.
(relocate_addresses): Remove unneeded cast.
2008-07-16 06:55:42 +00:00
proski
fe9870876d
Fix typos in ChangeLog and comments
2008-07-13 18:13:36 +00:00
robertmh
23a64d8eaf
2008-06-14 Robert Millan <rmh@aybabtu.com>
...
* util/i386/efi/grub-install.in (modules): Remove `_chain'.
* util/i386/pc/grub-install.in (modules): Likewise.
2008-06-14 19:04:44 +00:00
proski
828a27686e
2008-04-01 Pavel Roskin <proski@gnu.org>
...
* util/grub-fstest.c (cmd_cmp): Use fseeko(), not fseek(). The
later is obsolete, potentially dangerous and sets a bad example.
* util/i386/efi/grub-mkimage.c (make_header): Likewise.
* util/misc.c (grub_util_get_image_size): Likewise.
2008-04-02 01:49:18 +00:00
robertmh
1eb8c80241
2008-01-12 Robert Millan <rmh@aybabtu.com>
...
* include/grub/util/getroot.h (grub_dev_abstraction_types): New enum.
(grub_util_get_dev_abstraction): New function prototype.
* util/getroot.c: Include `<grub/util/getroot.h>'
(grub_util_get_grub_dev): Move detection of abstraction type to ...
(grub_util_get_dev_abstraction): ... here (new function).
* util/grub-probe.c: Convert PRINT_* to an enum. Add
`PRINT_ABSTRACTION'.
(probe): Probe for abstraction type when requested.
(main): Understand `--target=abstraction'.
* util/i386/efi/grub-install.in: Add abstraction module to core
image when it is found to be necessary.
* util/i386/pc/grub-install.in: Likewise.
* util/powerpc/ieee1275/grub-install.in: Likewise.
* util/update-grub_lib.in (font_path): Return system path without
converting to GRUB path.
* util/update-grub.in: Convert system path returned by font_path()
to a GRUB path. Use `grub-probe -t abstraction' to determine what
abstraction module is needed for loading fonts (if any). Export
that as `GRUB_PRELOAD_MODULES'.
* util/grub.d/00_header.in: Process `GRUB_PRELOAD_MODULES' (print
insmod commands).
2008-01-12 15:11:57 +00:00
proski
cc85c3c340
Typo fixes in comments and variable names.
2007-12-30 08:52:06 +00:00
okuji
5a79f472c7
2007-07-22 Yoshinori K. Okuji <okuji@enbug.org>
...
Migrate to GNU General Public License Version 3.
* COPYING: Replaced with the plain text version of GPLv3.
* config.guess: Updated from gnulib.
* config.sub: Likewise.
* geninit.sh: Output a GPLv3 copyright notice.
* geninitheader.sh: Likewise.
* genmodsrc.sh: Likewise.
* gensymlist.sh.in: Likewise.
* boot/i386/pc/boot.S: Upgraded to GPLv3.
* boot/i386/pc/diskboot.S: Likewise.
* boot/i386/pc/pxeboot.S: Likewise.
* commands/blocklist.c: Likewise.
* commands/boot.c: Likewise.
* commands/cat.c: Likewise.
* commands/cmp.c: Likewise.
* commands/configfile.c: Likewise.
* commands/echo.c: Likewise.
* commands/help.c: Likewise.
* commands/ls.c: Likewise.
* commands/search.c: Likewise.
* commands/terminal.c: Likewise.
* commands/test.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/reboot.c: Likewise.
* commands/i386/pc/vbeinfo.c: Likewise.
* commands/i386/pc/vbetest.c: Likewise.
* commands/ieee1275/halt.c: Likewise.
* commands/ieee1275/reboot.c: Likewise.
* commands/ieee1275/suspend.c: Likewise.
* disk/loopback.c: Likewise.
* disk/lvm.c: Likewise.
* disk/raid.c: Likewise.
* disk/efi/efidisk.c: Likewise.
* disk/i386/pc/biosdisk.c: Likewise.
* disk/ieee1275/ofdisk.c: Likewise.
* font/manager.c: Likewise.
* fs/affs.c: Likewise.
* fs/ext2.c: Likewise.
* fs/fat.c: Likewise.
* fs/fshelp.c: Likewise.
* fs/hfs.c: Likewise.
* fs/hfsplus.c: Likewise.
* fs/iso9660.c: Likewise.
* fs/jfs.c: Likewise.
* fs/minix.c: Likewise.
* fs/sfs.c: Likewise.
* fs/ufs.c: Likewise.
* fs/xfs.c: Likewise.
* hello/hello.c: Likewise.
* include/grub/acorn_filecore.h: Likewise.
* include/grub/arg.h: Likewise.
* include/grub/bitmap.h: Likewise.
* include/grub/boot.h: Likewise.
* include/grub/cache.h: Likewise.
* include/grub/device.h: Likewise.
* include/grub/disk.h: Likewise.
* include/grub/dl.h: Likewise.
* include/grub/elfload.h: Likewise.
* include/grub/env.h: Likewise.
* include/grub/err.h: Likewise.
* include/grub/file.h: Likewise.
* include/grub/font.h: Likewise.
* include/grub/fs.h: Likewise.
* include/grub/fshelp.h: Likewise.
* include/grub/gzio.h: Likewise.
* include/grub/hfs.h: Likewise.
* include/grub/kernel.h: Likewise.
* include/grub/loader.h: Likewise.
* include/grub/lvm.h: Likewise.
* include/grub/misc.h: Likewise.
* include/grub/mm.h: Likewise.
* include/grub/net.h: Likewise.
* include/grub/normal.h: Likewise.
* include/grub/parser.h: Likewise.
* include/grub/partition.h: Likewise.
* include/grub/pc_partition.h: Likewise.
* include/grub/raid.h: Likewise.
* include/grub/rescue.h: Likewise.
* include/grub/script.h: Likewise.
* include/grub/setjmp.h: Likewise.
* include/grub/symbol.h: Likewise.
* include/grub/term.h: Likewise.
* include/grub/terminfo.h: Likewise.
* include/grub/tparm.h: Likewise.
* include/grub/types.h: Likewise.
* include/grub/video.h: Likewise.
* include/grub/efi/api.h: Likewise.
* include/grub/efi/chainloader.h: Likewise.
* include/grub/efi/console.h: Likewise.
* include/grub/efi/console_control.h: Likewise.
* include/grub/efi/disk.h: Likewise.
* include/grub/efi/efi.h: Likewise.
* include/grub/efi/pe32.h: Likewise.
* include/grub/efi/time.h: Likewise.
* include/grub/i386/linux.h: Likewise.
* include/grub/i386/setjmp.h: Likewise.
* include/grub/i386/types.h: Likewise.
* include/grub/i386/efi/kernel.h: Likewise.
* include/grub/i386/efi/loader.h: Likewise.
* include/grub/i386/efi/time.h: Likewise.
* include/grub/i386/pc/biosdisk.h: Likewise.
* include/grub/i386/pc/boot.h: Likewise.
* include/grub/i386/pc/chainloader.h: Likewise.
* include/grub/i386/pc/console.h: Likewise.
* include/grub/i386/pc/init.h: Likewise.
* include/grub/i386/pc/kernel.h: Likewise.
* include/grub/i386/pc/loader.h: Likewise.
* include/grub/i386/pc/memory.h: Likewise.
* include/grub/i386/pc/multiboot.h: Likewise.
* include/grub/i386/pc/serial.h: Likewise.
* include/grub/i386/pc/time.h: Likewise.
* include/grub/i386/pc/vbe.h: Likewise.
* include/grub/i386/pc/vbeblit.h: Likewise.
* include/grub/i386/pc/vbefill.h: Likewise.
* include/grub/i386/pc/vbeutil.h: Likewise.
* include/grub/i386/pc/vga.h: Likewise.
* include/grub/ieee1275/ieee1275.h: Likewise.
* include/grub/ieee1275/ofdisk.h: Likewise.
* include/grub/powerpc/libgcc.h: Likewise.
* include/grub/powerpc/setjmp.h: Likewise.
* include/grub/powerpc/types.h: Likewise.
* include/grub/powerpc/ieee1275/biosdisk.h: Likewise.
* include/grub/powerpc/ieee1275/console.h: Likewise.
* include/grub/powerpc/ieee1275/ieee1275.h: Likewise.
* include/grub/powerpc/ieee1275/kernel.h: Likewise.
* include/grub/powerpc/ieee1275/loader.h: Likewise.
* include/grub/powerpc/ieee1275/multiboot.h: Likewise.
* include/grub/powerpc/ieee1275/time.h: Likewise.
* include/grub/powerpc/ieee1275/util/biosdisk.h: Likewise.
* include/grub/sparc64/libgcc.h: Likewise.
* include/grub/sparc64/setjmp.h: Likewise.
* include/grub/sparc64/types.h: Likewise.
* include/grub/sparc64/ieee1275/console.h: Likewise.
* include/grub/sparc64/ieee1275/ieee1275.h: Likewise.
* include/grub/sparc64/ieee1275/kernel.h: Likewise.
* include/grub/sparc64/ieee1275/time.h: Likewise.
* include/grub/util/biosdisk.h: Likewise.
* include/grub/util/getroot.h: Likewise.
* include/grub/util/lvm.h: Likewise.
* include/grub/util/misc.h: Likewise.
* include/grub/util/raid.h: Likewise.
* include/grub/util/resolve.h: Likewise.
* io/gzio.c: Likewise.
* kern/device.c: Likewise.
* kern/disk.c: Likewise.
* kern/dl.c: Likewise.
* kern/elf.c: Likewise.
* kern/env.c: Likewise.
* kern/err.c: Likewise.
* kern/file.c: Likewise.
* kern/fs.c: Likewise.
* kern/loader.c: Likewise.
* kern/main.c: Likewise.
* kern/misc.c: Likewise.
* kern/mm.c: Likewise.
* kern/parser.c: Likewise.
* kern/partition.c: Likewise.
* kern/rescue.c: Likewise.
* kern/term.c: Likewise.
* kern/efi/efi.c: Likewise.
* kern/efi/init.c: Likewise.
* kern/efi/mm.c: Likewise.
* kern/i386/dl.c: Likewise.
* kern/i386/efi/init.c: Likewise.
* kern/i386/efi/startup.S: Likewise.
* kern/i386/pc/init.c: Likewise.
* kern/i386/pc/lzo1x.S: Likewise.
* kern/i386/pc/startup.S: Likewise.
* kern/ieee1275/ieee1275.c: Likewise.
* kern/powerpc/cache.S: Likewise.
* kern/powerpc/dl.c: Likewise.
* kern/powerpc/ieee1275/cmain.c: Likewise.
* kern/powerpc/ieee1275/crt0.S: Likewise.
* kern/powerpc/ieee1275/init.c: Likewise.
* kern/powerpc/ieee1275/openfw.c: Likewise.
* kern/sparc64/cache.S: Likewise.
* kern/sparc64/dl.c: Likewise.
* kern/sparc64/ieee1275/init.c: Likewise.
* kern/sparc64/ieee1275/openfw.c: Likewise.
* loader/efi/chainloader.c: Likewise.
* loader/efi/chainloader_normal.c: Likewise.
* loader/i386/efi/linux.c: Likewise.
* loader/i386/efi/linux_normal.c: Likewise.
* loader/i386/pc/chainloader.c: Likewise.
* loader/i386/pc/chainloader_normal.c: Likewise.
* loader/i386/pc/linux.c: Likewise.
* loader/i386/pc/linux_normal.c: Likewise.
* loader/i386/pc/multiboot.c: Likewise.
* loader/i386/pc/multiboot_normal.c: Likewise.
* loader/powerpc/ieee1275/linux.c: Likewise.
* loader/powerpc/ieee1275/linux_normal.c: Likewise.
* normal/arg.c: Likewise.
* normal/cmdline.c: Likewise.
* normal/command.c: Likewise.
* normal/completion.c: Likewise.
* normal/execute.c: Likewise.
* normal/function.c: Likewise.
* normal/lexer.c: Likewise.
* normal/main.c: Likewise.
* normal/menu.c: Likewise.
* normal/menu_entry.c: Likewise.
* normal/misc.c: Likewise.
* normal/parser.y: Likewise.
* normal/script.c: Likewise.
* normal/i386/setjmp.S: Likewise.
* normal/powerpc/setjmp.S: Likewise.
* normal/sparc64/setjmp.S: Likewise.
* partmap/acorn.c: Likewise.
* partmap/amiga.c: Likewise.
* partmap/apple.c: Likewise.
* partmap/gpt.c: Likewise.
* partmap/pc.c: Likewise.
* partmap/sun.c: Likewise.
* term/gfxterm.c: Likewise.
* term/terminfo.c: Likewise.
* term/efi/console.c: Likewise.
* term/i386/pc/console.c: Likewise.
* term/i386/pc/serial.c: Likewise.
* term/i386/pc/vesafb.c: Likewise.
* term/i386/pc/vga.c: Likewise.
* term/ieee1275/ofconsole.c: Likewise.
* util/biosdisk.c: Likewise.
* util/console.c: Likewise.
* util/genmoddep.c: Likewise.
* util/getroot.c: Likewise.
* util/grub-emu.c: Likewise.
* util/grub-mkdevicemap.c: Likewise.
* util/grub-probe.c: Likewise.
* util/lvm.c: Likewise.
* util/misc.c: Likewise.
* util/raid.c: Likewise.
* util/resolve.c: Likewise.
* util/update-grub.in: Likewise.
* util/update-grub_lib.in: Likewise.
* util/grub.d/00_header.in: Likewise.
* util/grub.d/10_hurd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/i386/efi/grub-install.in: Likewise.
* util/i386/efi/grub-mkimage.c: Likewise.
* util/i386/pc/grub-install.in: Likewise.
* util/i386/pc/grub-mkimage.c: Likewise.
* util/i386/pc/grub-mkrescue.in: Likewise.
* util/i386/pc/grub-setup.c: Likewise.
* util/i386/pc/misc.c: Likewise.
* util/powerpc/ieee1275/grub-install.in: Likewise.
* util/powerpc/ieee1275/grub-mkimage.c: Likewise.
* util/powerpc/ieee1275/misc.c: Likewise.
* video/bitmap.c: Likewise.
* video/video.c: Likewise.
* video/i386/pc/vbe.c: Likewise.
* video/i386/pc/vbeblit.c: Likewise.
* video/i386/pc/vbefill.c: Likewise.
* video/i386/pc/vbeutil.c: Likewise.
* video/readers/tga.c: Likewise.
2007-07-21 23:32:33 +00:00
robertmh
2c2a681b39
2007-07-02 Robert Millan <rmh@aybabtu.com>
...
* util/i386/efi/grub-install.in: Allow `grub_probe --target=partmap'
invocation to fail, in order to support partition-less media.
* util/i386/pc/grub-install.in: Likewise.
* util/powerpc/ieee1275/grub-install.in: Use grub-probe to determine
which fs or partmap modules are needed (akin to its sister scripts).
Also use grub-probe to get rid of unportable /proc/mounts check.
Print the same informational message that the other scripts do, before
exitting.
2007-07-02 13:58:03 +00:00
robertmh
bf697e2831
2007-06-21 Robert Millan <rmh@aybabtu.com>
...
* include/grub/i386/pc/kernel.h: Define GRUB_KERNEL_MACHINE_DATA_END to
indicate end of data section in kernel image.
* include/grub/i386/efi/kernel.h: Define GRUB_KERNEL_MACHINE_PREFIX and
GRUB_KERNEL_MACHINE_DATA_END.
* kern/i386/pc/startup.S: Do not initialize grub_prefix, only reserve
space for it.
* kern/i386/efi/startup.S: Likewise.
* util/i386/pc/grub-mkimage.c: Initialize grub_prefix to /boot/grub
during image generation. Implement --prefix option to override this
patch.
* util/i386/efi/grub-mkimage.c: Likewise.
* util/update-grub_lib.in (convert_system_path_to_grub_path): Split
code to make path relative to its root into a separate function.
* util/i386/pc/grub-install.in: Use newly provided
make_system_path_relative_to_its_root() to convert ${grubdir}, then
pass the result to grub-install --prefix.
2007-06-21 21:01:11 +00:00
robertmh
46b9d12846
2007-05-16 Robert Millan <rmh@aybabtu.com>
...
* util/i386/efi/grub-install.in: New.
* conf/i386-efi.rmk: Enable grub-mkdevicemap, grub-probe and the
newly added grub-install.
* util/biosdisk.c: Remove unnecessary grub/machine/biosdisk.h
include.
* util/getroot.c: Replace grub/i386/pc/util/biosdisk.h with
grub/util/biosdisk.h.
* util/grub-probe.c: Replace grub/machine/util/biosdisk.h with
grub/util/biosdisk.h.
2007-05-16 15:05:02 +00:00
okuji
05568c2e85
2006-05-08 Yoshinori K. Okuji <okuji@enbug.org>
...
Add --with-platform to configure. Use pkglibdir instead of
pkgdatadir. This is reported by Roger Leigh.
* util/powerpc/ieee1275/grub-install.in (datadir): Removed.
(host_vendor): Likewise.
(host_os): Likewise.
(pkgdatadir): Likewise.
(platform): New variable.
(pkglibdir): Likewise.
Use PKGLIBDIR instead of PKGDATADIR.
* util/i386/pc/grub-install.in (datadir): Removed.
(host_vendor): Likewise.
(host_os): Likewise.
(pkgdatadir): Likewise.
(platform): New variable.
(pkglibdir): Likewise.
Use PKGLIBDIR instead of PKGDATADIR.
* util/powerpc/ieee1275/grub-mkimage.c (usage): Use GRUB_LIBDIR
instead of GRUB_DATADIR.
(main): Likewise.
* util/i386/pc/grub-mkimage.c (usage): Likewise.
(main): Likewise.
* util/i386/efi/grub-mkimage.c (usage): Likewise.
(main): Likewise.
* configure.ac (--with-platform): New option.
Use PLATFORM instead of HOST_VENDOR to specify a platform.
* Makefile.in: Include a makefile based on PLATFORM instead of
HOST_VENDOR.
(pkgdatadir): Not appended by the machine type.
(pkglibdir): Appended by the machine type.
(host_vendor): Removed.
(platform): New variable.
(BUILD_CPPFLAGS): Specify GRUB_LIBDIR instead of GRUB_DATADIR.
(install-local): Use PKGLIBDIR instead of PKGDATADIR.
(uninstall): Likewise.
2006-05-08 19:29:10 +00:00
okuji
2eab1c0dad
2006-04-20 Yoshinori K. Okuji <okuji@enbug.org>
...
Add support for pre-loaded modules into the EFI port.
* util/i386/efi/grub-mkimage.c (make_mods_section): Rewritten
completely. Accept one more argument DIR. The caller has changed.
* kern/i386/efi/init.c (grub_arch_modules_addr): Removed.
* kern/efi/efi.c: Include grub/efi/pe32.h and grub/kernel.h.
(grub_efi_loaded_image_guid): New variable.
(grub_efi_get_loaded_image): New function.
(grub_arch_modules_addr): Likewise.
* include/grub/efi/efi.h (grub_efi_get_loaded_image): New
prototype.
* include/grub/efi/api.h (GRUB_EFI_LOADED_IMAGE_GUID): New macro.
(struct grub_efi_loaded_image): New structure.
(grub_efi_loaded_image_t): New type.
2006-04-20 04:29:17 +00:00
okuji
837091258d
2006-04-18 Yoshinori K. Okuji <okuji@enbug.org>
...
* DISTLIST: Added conf/i386-efi.mk, conf/i386-efi.rmk,
include/grub/efi/api.h, include/grub/efi/console_control.h,
include/grub/efi/efi.h, include/grub/efi/pe32.h,
include/grub/i386/efi/time.h, kern/efi/efi.c,
kern/i386/efi/init.c, kern/i386/efi/startup.S,
and util/i386/efi/grub-mkimage.c.
* Makefile.in (RMKFILES): Added i386-efi.rmk.
* genmk.rb (PModule#rule): Do not export symbols if
#{prefix}_EXPORTS is set to "no".
* conf/i386-efi.mk: New file.
* conf/i386-efi.rmk: Likewise.
* include/grub/efi/api.h: Likewise.
* include/grub/efi/console_control.h: Likewise.
* include/grub/efi/efi.h: Likewise.
* include/grub/efi/pe32.h: Likewise.
* include/grub/i386/efi/time.h: Likewise.
* kern/efi/efi.c: Likewise.
* kern/i386/efi/init.c: Likewise.
* kern/i386/efi/startup.S: Likewise.
* util/i386/efi/grub-mkimage.c: Likewise.
2006-04-18 06:18:15 +00:00