]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Merge my local branch
authorRobert Millan <rmh@aybabtu.com>
Fri, 25 Dec 2009 11:43:20 +0000 (12:43 +0100)
committerRobert Millan <rmh@aybabtu.com>
Fri, 25 Dec 2009 11:43:20 +0000 (12:43 +0100)
1  2 
ChangeLog
loader/i386/multiboot.c
loader/multiboot_loader.c

diff --cc ChangeLog
index e32efc6d99cd73fcbeccb81f200e19cba36a5218,d9fb2cb1f890c67dfa39bf246c88b99fad703e71..10b83e3c1ecea9575ce93f3f7c5120ca346e9b8e
+++ b/ChangeLog
+ 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  Robert Millan  <rmh.grub@aybabtu.com>
+       * util/mkisofs/write.c (padblock_write): Abort when given an
+       excedingly large embed image, instead of silently truncating it.
+ 2009-12-24  Robert Millan  <rmh.grub@aybabtu.com>
+       * include/multiboot.h: Indentation fixes.
+ 2009-12-24  Robert Millan  <rmh.grub@aybabtu.com>
+       * include/multiboot.h (struct multiboot_aout_symbol_table)
+       (struct multiboot_elf_section_header_table): New structure
+       declarations (stolen from GRUB Legacy).
+       (struct multiboot_info): Replace opaque `syms' with a.out and ELF
+       table information.
+       (multiboot_aout_symbol_table_t, multiboot_elf_section_header_table_t)
+       (multiboot_info_t, multiboot_memory_map_t, multiboot_module_t): New
+       type aliases.
+ 2009-12-24  Robert Millan  <rmh.grub@aybabtu.com>
+       * include/multiboot.h: Make comments src2texi-friendly.
+ 2009-12-24  Robert Millan  <rmh.grub@aybabtu.com>
+       For consistency with [multiboot]/docs/boot.S.
+       * include/multiboot.h (MULTIBOOT_MAGIC): Rename from this ...
+       (MULTIBOOT_HEADER_MAGIC): ... to this.  Update all users.
+       (MULTIBOOT_MAGIC2): Rename from this ...
+       (MULTIBOOT_BOOTLOADER_MAGIC): ... to this.  Update all users.
+ 2009-12-24  Robert Millan  <rmh.grub@aybabtu.com>
+       * include/multiboot.h: Remove `<grub/types.h>'.
+       (multiboot_uint16_t, multiboot_uint32_t, multiboot_uint64_t): New
+       types.  Update all users.
 +2009-12-25  Carles Pina i Estany  <carles@pina.cat>
 +
 +      * commands/efi/loadbios.c: Capitalize acronyms, replace `could not' by
 +      `couldn't' and `can not' by `cannot'.
 +      * commands/i386/pc/drivemap.c: Likewise.
 +      * disk/ata.c: Likewise.
 +      * disk/ieee1275/nand.c: Likewise.
 +      * fs/affs.c: Likewise.
 +      * fs/fat.c: Likewise.
 +      * fs/hfs.c: Likewise.
 +      * fs/hfsplus.c: Likewise.
 +      * fs/iso9660.c: Likewise.
 +      * fs/jfs.c: Likewise.
 +      * fs/minix.c: Likewise.
 +      * fs/reiserfs.c: Likewise.
 +      * fs/sfs.c: Likewise.
 +      * fs/udf.c: Likewise.
 +      * fs/ufs.c: Likewise.
 +      * fs/xfs.c: Likewise.
 +      * loader/powerpc/ieee1275/linux.c: Likewise.
 +      * loader/sparc64/ieee1275/linux.c: Likewise.
 +      * util/grub-probe.c: Likewise.
 +      * util/misc.c: Likewise.
 +
 +2009-12-24  Carles Pina i Estany  <carles@pina.cat>
 +
 +      * bus/usb/usbhub.c: Fix capitalization, fullstop and newlines in
 +      grub_errno calls.
 +      * commands/acpi.c: Likewise.
 +      * commands/blocklist.c: Likewise.
 +      * commands/efi/loadbios.c: Likewise.
 +      * commands/i386/pc/drivemap.c: Likewise.
 +      * commands/loadenv.c: Likewise.
 +      * commands/memrw.c: Likewise.
 +      * commands/password.c: Likewise.
 +      * commands/videotest.c: Likewise.
 +      * disk/ata.c: Likewise.
 +      * disk/ata_pthru.c: Likewise.
 +      * disk/dmraid_nvidia.c: Likewise.
 +      * disk/ieee1275/nand.c: Likewise.
 +      * disk/ieee1275/ofdisk.c: Likewise.
 +      * disk/loopback.c: Likewise.
 +      * disk/lvm.c: Likewise.
 +      * disk/mdraid_linux.c: Likewise.
 +      * disk/raid.c: Likewise.
 +      * disk/raid6_recover.c: Likewise.
 +      * disk/scsi.c: Likewise.
 +      * efiemu/main.c: Likewise.
 +      * efiemu/mm.c: Likewise.
 +      * efiemu/pnvram.c: Likewise.
 +      * efiemu/symbols.c: Likewise.
 +      * font/font.c: Likewise.
 +      * fs/cpio.c: Likewise.
 +      * fs/hfsplus.c: Likewise.
 +      * fs/iso9660.c: Likewise.
 +      * fs/jfs.c: Likewise.
 +      * fs/minix.c: Likewise.
 +      * fs/ntfs.c: Likewise.
 +      * fs/ntfscomp.c: Likewise.
 +      * fs/reiserfs.c: Likewise.
 +      * fs/ufs.c: Likewise.
 +      * fs/xfs.c: Likewise.
 +      * gettext/gettext.c: Likewise.
 +      * include/grub/auth.h: Likewise.
 +      * kern/elf.c: Likewise.
 +      * kern/file.c: Likewise.
 +      * kern/ieee1275/init.c: Likewise.
 +      * kern/ieee1275/mmap.c: Likewise.
 +      * kern/ieee1275/openfw.c: Likewise.
 +      * kern/powerpc/dl.c: Likewise.
 +      * kern/sparc64/dl.c: Likewise.
 +      * lib/arg.c: Likewise.
 +      * loader/i386/bsd.c: Likewise.
 +      * loader/i386/bsdXX.c: Likewise.
 +      * loader/i386/efi/linux.c: Likewise.
 +      * loader/i386/efi/xnu.c: Likewise.
 +      * loader/i386/ieee1275/linux.c: Likewise.
 +      * loader/i386/linux.c: Likewise.
 +      * loader/i386/multiboot.c: Likewise.
 +      * loader/i386/pc/linux.c: Likewise.
 +      * loader/i386/pc/multiboot2.c: Likewise.
 +      * loader/i386/xnu.c: Likewise.
 +      * loader/ieee1275/multiboot2.c: Likewise.
 +      * loader/macho.c: Likewise.
 +      * loader/machoXX.c: Likewise.
 +      * loader/multiboot2.c: Likewise.
 +      * loader/multiboot_loader.c: Likewise.
 +      * loader/powerpc/ieee1275/linux.c: Likewise.
 +      * loader/sparc64/ieee1275/linux.c: Likewise.
 +      * loader/xnu.c: Likewise.
 +      * loader/xnu_resume.c: Likewise.
 +      * mmap/i386/pc/mmap.c: Likewise.
 +      * normal/menu_viewer.c: Likewise.
 +      * partmap/acorn.c: Likewise.
 +      * partmap/amiga.c: Likewise.
 +      * partmap/apple.c: Likewise.
 +      * script/lexer.c: Likewise.
 +      * term/gfxterm.c: Likewise.
 +      * term/i386/pc/serial.c: Likewise.
 +      * term/i386/pc/vga.c: Likewise.
 +      * term/ieee1275/ofconsole.c: Likewise.
 +      * term/terminfo.c: Likewise.
 +      * video/bitmap.c: Likewise.
 +      * video/efi_gop.c: Likewise.
 +      * video/efi_uga.c: Likewise.
 +      * video/fb/video_fb.c: Likewise.
 +      * video/i386/pc/vbe.c: Likewise.
 +      * video/readers/tga.c: Likewise.
 +      * video/video.c: Likewise.
 +
  2009-12-23 Felix Zielcke <fzielcke@z-51.de>
  
        * commands/i386/pc/drivemap.c: Remove all trailing whitespace.
Simple merge
Simple merge