Merge branch 'f19'

Conflicts:
	grub2.spec
This commit is contained in:
Peter Jones 2013-06-20 13:35:21 -04:00
commit 88a90466d2
487 changed files with 32909 additions and 1908 deletions

View File

@ -1,7 +1,7 @@
From 8c5886df17cdfb148d4e17bddf38143ed65fe674 Mon Sep 17 00:00:00 2001 From 8c5886df17cdfb148d4e17bddf38143ed65fe674 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 28 Jun 2012 15:27:54 +0200 Date: Thu, 28 Jun 2012 15:27:54 +0200
Subject: [PATCH 001/364] Add monochrome text support (mda_text, aka Subject: [PATCH 001/482] Add monochrome text support (mda_text, aka
`hercules' in grub-legacy). `hercules' in grub-legacy).
* grub-core/Makefile.core.def (mda_text): New module. * grub-core/Makefile.core.def (mda_text): New module.
@ -608,5 +608,5 @@ index a7b13ee..1a666a1 100644
GRUB_VGA_IO_ARX_READ = 0x3c1, GRUB_VGA_IO_ARX_READ = 0x3c1,
GRUB_VGA_IO_MISC_WRITE = 0x3c2, GRUB_VGA_IO_MISC_WRITE = 0x3c2,
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From d72015266eb5f1cf712db5edec3aa6926447f668 Mon Sep 17 00:00:00 2001 From d72015266eb5f1cf712db5edec3aa6926447f668 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 28 Jun 2012 15:36:48 +0200 Date: Thu, 28 Jun 2012 15:36:48 +0200
Subject: [PATCH 002/364] missing file from last commit Subject: [PATCH 002/482] missing file from last commit
--- ---
grub-core/term/i386/pc/mda_text.c | 3 +++ grub-core/term/i386/pc/mda_text.c | 3 +++
@ -18,5 +18,5 @@ index 0000000..907a36e
+#include "vga_text.c" +#include "vga_text.c"
+ +
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From ec6a8c449294b215a2c4019f42110a0c1f770ac2 Mon Sep 17 00:00:00 2001 From ec6a8c449294b215a2c4019f42110a0c1f770ac2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 2 Jul 2012 11:14:37 +0200 Date: Mon, 2 Jul 2012 11:14:37 +0200
Subject: [PATCH 003/364] * grub-core/loader/i386/linux.c Subject: [PATCH 003/482] * grub-core/loader/i386/linux.c
(find_efi_mmap_size): Don't decrease efi_mmap_size. Reported by: Stuart (find_efi_mmap_size): Don't decrease efi_mmap_size. Reported by: Stuart
Hayes. Hayes.
@ -54,5 +54,5 @@ index 62087cf..d34b2f8 100644
} }
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From d2ccb3209c62de4292107df4207c02ee59dc11a9 Mon Sep 17 00:00:00 2001 From d2ccb3209c62de4292107df4207c02ee59dc11a9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 2 Jul 2012 11:19:22 +0200 Date: Mon, 2 Jul 2012 11:19:22 +0200
Subject: [PATCH 004/364] * include/grub/list.h Subject: [PATCH 004/482] * include/grub/list.h
(FOR_LIST_ELEMENTS_SAFE): New macro. * include/grub/command.h (FOR_LIST_ELEMENTS_SAFE): New macro. * include/grub/command.h
(FOR_COMMANDS_SAFE): Likewise. * grub-core/commands/help.c (FOR_COMMANDS_SAFE): Likewise. * grub-core/commands/help.c
(grub_cmd_help): Use FOR_COMMANDS_SAFE. (grub_cmd_help): Use FOR_COMMANDS_SAFE.
@ -57,5 +57,5 @@ index cadb2d9..6f6dec0 100644
static inline void * static inline void *
grub_bad_type_cast_real (int line, const char *file) grub_bad_type_cast_real (int line, const char *file)
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 21c2f856cbdf4a98d015ed05bb6b9b16c021af9c Mon Sep 17 00:00:00 2001 From 21c2f856cbdf4a98d015ed05bb6b9b16c021af9c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 2 Jul 2012 11:20:51 +0200 Date: Mon, 2 Jul 2012 11:20:51 +0200
Subject: [PATCH 005/364] * gentpl.py: Make mans depend on Subject: [PATCH 005/482] * gentpl.py: Make mans depend on
grub-mkconfig_lib. grub-mkconfig_lib.
--- ---
@ -43,5 +43,5 @@ index 13a6081..bab4a8a 100644
PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +] PATH=$(builddir):$$PATH pkgdatadir=$(builddir) $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
""") """)
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 8ec34c46a3cc4cacce65e3a2a671e08548c6a95e Mon Sep 17 00:00:00 2001 From 8ec34c46a3cc4cacce65e3a2a671e08548c6a95e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 2 Jul 2012 11:22:50 +0200 Date: Mon, 2 Jul 2012 11:22:50 +0200
Subject: [PATCH 006/364] * grub-core/net/tftp.c (ack): Fix endianness Subject: [PATCH 006/482] * grub-core/net/tftp.c (ack): Fix endianness
problem. (tftp_receive): Likewise. Reported by: Michael problem. (tftp_receive): Likewise. Reported by: Michael
Davidsaver. Davidsaver.
@ -49,5 +49,5 @@ index 9c70efb..d0f39ea 100644
{ {
file->device->net->stall = 1; file->device->net->stall = 1;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From c545d0bb2fe87b5a8ea6a903e4e9c113595ccfff Mon Sep 17 00:00:00 2001 From c545d0bb2fe87b5a8ea6a903e4e9c113595ccfff Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 2 Jul 2012 11:28:42 +0200 Date: Mon, 2 Jul 2012 11:28:42 +0200
Subject: [PATCH 007/364] * grub-core/fs/ext2.c: Experimental support Subject: [PATCH 007/482] * grub-core/fs/ext2.c: Experimental support
for 64-bit. for 64-bit.
--- ---
@ -178,5 +178,5 @@ index c50e379..bd1ab24 100644
data->disk = disk; data->disk = disk;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 2cce795e46cef6c5f057d46bae9a845621ca4a95 Mon Sep 17 00:00:00 2001 From 2cce795e46cef6c5f057d46bae9a845621ca4a95 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 2 Jul 2012 11:30:04 +0200 Date: Mon, 2 Jul 2012 11:30:04 +0200
Subject: [PATCH 008/364] * grub-core/term/efi/serial.c: Support 1.5 Subject: [PATCH 008/482] * grub-core/term/efi/serial.c: Support 1.5
stop bits. stop bits.
--- ---
@ -44,5 +44,5 @@ index da8c3ce..dc5f33b 100644
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
N_("unsupported serial port stop bits number")); N_("unsupported serial port stop bits number"));
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 134e4df1335b0498684d093b55332f87c2e8a301 Mon Sep 17 00:00:00 2001 From 134e4df1335b0498684d093b55332f87c2e8a301 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 2 Jul 2012 11:31:31 +0200 Date: Mon, 2 Jul 2012 11:31:31 +0200
Subject: [PATCH 009/364] * grub-core/lib/legacy_parse.c: Support clear Subject: [PATCH 009/482] * grub-core/lib/legacy_parse.c: Support clear
and testload. and testload.
--- ---
@ -103,5 +103,5 @@ index 14768b8..ddfaec4 100644
char * char *
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From f1c2b05162cc583ec64ae0b3cdf5ef128d2ca05c Mon Sep 17 00:00:00 2001 From f1c2b05162cc583ec64ae0b3cdf5ef128d2ca05c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 7 Jul 2012 14:29:01 +0200 Date: Sat, 7 Jul 2012 14:29:01 +0200
Subject: [PATCH 010/364] * grub-core/Makefile.am: Fix path to Subject: [PATCH 010/482] * grub-core/Makefile.am: Fix path to
boot/i386/pc/startup_raw.S. boot/i386/pc/startup_raw.S.
--- ---
@ -35,5 +35,5 @@ index 7dc2519..cc4fb68 100644
CLEANFILES += grub_script.yy.c grub_script.yy.h CLEANFILES += grub_script.yy.c grub_script.yy.h
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From a7fa3c8e8c7b2dab5a704493b7965bbc60f84bed Mon Sep 17 00:00:00 2001 From a7fa3c8e8c7b2dab5a704493b7965bbc60f84bed Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Jul 2012 16:21:24 +0200 Date: Sun, 22 Jul 2012 16:21:24 +0200
Subject: [PATCH 011/364] Fix coreboot compilation. Subject: [PATCH 011/482] Fix coreboot compilation.
* grub-core/term/i386/pc/vga_text.c (grub_vga_text_init): Rename to ... * grub-core/term/i386/pc/vga_text.c (grub_vga_text_init): Rename to ...
(grub_vga_text_init_real): ... this. (grub_vga_text_init_real): ... this.
@ -63,5 +63,5 @@ index d1e4ef9..74c155c 100644
.getwh = grub_vga_text_getwh, .getwh = grub_vga_text_getwh,
.getxy = grub_vga_text_getxy, .getxy = grub_vga_text_getxy,
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 1f75c529d5309defb33c8c216422003eee1248a5 Mon Sep 17 00:00:00 2001 From 1f75c529d5309defb33c8c216422003eee1248a5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Jul 2012 16:23:46 +0200 Date: Sun, 22 Jul 2012 16:23:46 +0200
Subject: [PATCH 012/364] * grub-core/normal/autofs.c Subject: [PATCH 012/482] * grub-core/normal/autofs.c
(autoload_fs_module): Save and restore filter state. (autoload_fs_module): Save and restore filter state.
--- ---
@ -64,5 +64,5 @@ index 0b27abf..721b9c3 100644
/* Read the file fs.lst for auto-loading. */ /* Read the file fs.lst for auto-loading. */
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 4942f9b133e52828d2441309beea0e9278e8b80c Mon Sep 17 00:00:00 2001 From 4942f9b133e52828d2441309beea0e9278e8b80c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Jul 2012 16:27:03 +0200 Date: Sun, 22 Jul 2012 16:27:03 +0200
Subject: [PATCH 013/364] * grub-core/lib/xzembed/xz_dec_stream.c Subject: [PATCH 013/482] * grub-core/lib/xzembed/xz_dec_stream.c
(hash_validate): Fix behaviour if hash function is unavailable. (hash_validate): Fix behaviour if hash function is unavailable.
(dec_stream_header): Likewise. (dec_stream_header): Likewise.
@ -69,5 +69,5 @@ index 0d79b1f..6170b0c 100644
} }
else else
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 6a6140eac9a2d0889dcf6d118979d4af242b8060 Mon Sep 17 00:00:00 2001 From 6a6140eac9a2d0889dcf6d118979d4af242b8060 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Jul 2012 16:30:48 +0200 Date: Sun, 22 Jul 2012 16:30:48 +0200
Subject: [PATCH 014/364] * grub-core/loader/i386/bsd.c Subject: [PATCH 014/482] * grub-core/loader/i386/bsd.c
(grub_bsd_elf32_size_hook): Fix mask. (grub_bsd_elf32_hook): Likewise. (grub_bsd_elf32_size_hook): Fix mask. (grub_bsd_elf32_hook): Likewise.
(grub_bsd_elf64_size_hook): Likewise. (grub_bsd_elf64_hook): Likewise. (grub_bsd_elf64_size_hook): Likewise. (grub_bsd_elf64_hook): Likewise.
(grub_bsd_load_elf): Likewise. (grub_bsd_load_elf): Likewise.
@ -79,5 +79,5 @@ index 0fd4df0..6e024e4 100644
grub_bsd_elf32_size_hook, NULL); grub_bsd_elf32_size_hook, NULL);
if (err) if (err)
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From c0be2c2099805c621f27d5b3ced224db437a582c Mon Sep 17 00:00:00 2001 From c0be2c2099805c621f27d5b3ced224db437a582c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Jul 2012 19:59:06 +0200 Date: Sun, 22 Jul 2012 19:59:06 +0200
Subject: [PATCH 015/364] New command `lsefi'. Subject: [PATCH 015/482] New command `lsefi'.
* grub-core/Makefile.core.def (lsefi): New module. * grub-core/Makefile.core.def (lsefi): New module.
* grub-core/commands/efi/lsefi.c: New file. * grub-core/commands/efi/lsefi.c: New file.
@ -364,5 +364,5 @@ index 26127de..9e7a8d8 100644
#define GRUB_EFI_ACPI_TABLE_GUID \ #define GRUB_EFI_ACPI_TABLE_GUID \
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 14589a819717d1d6614687202159a0070bba1f8f Mon Sep 17 00:00:00 2001 From 14589a819717d1d6614687202159a0070bba1f8f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Jul 2012 20:02:17 +0200 Date: Sun, 22 Jul 2012 20:02:17 +0200
Subject: [PATCH 016/364] * util/grub-mkconfig_lib.in (grub_quote): Subject: [PATCH 016/482] * util/grub-mkconfig_lib.in (grub_quote):
Remove extra layer of escape. * util/grub.d/10_hurd.in: Add missing quoting. Remove extra layer of escape. * util/grub.d/10_hurd.in: Add missing quoting.
* util/grub.d/10_illumos.in: Likewise. * util/grub.d/10_kfreebsd.in: * util/grub.d/10_illumos.in: Likewise. * util/grub.d/10_kfreebsd.in:
Likewise. * util/grub.d/10_linux.in: Likewise. * Likewise. * util/grub.d/10_linux.in: Likewise. *
@ -158,5 +158,5 @@ index 1d94502..33f1592 100644
EOF EOF
fi fi
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 6054ac4ca1ce5f3e4589bfead3c9c05af89f9ace Mon Sep 17 00:00:00 2001 From 6054ac4ca1ce5f3e4589bfead3c9c05af89f9ace Mon Sep 17 00:00:00 2001
From: starous <starous@pracovna> From: starous <starous@pracovna>
Date: Sun, 22 Jul 2012 21:09:30 +0200 Date: Sun, 22 Jul 2012 21:09:30 +0200
Subject: [PATCH 017/364] EHCI and OHCI PCI bus master Subject: [PATCH 017/482] EHCI and OHCI PCI bus master
--- ---
ChangeLog | 5 +++++ ChangeLog | 5 +++++
@ -55,5 +55,5 @@ index 23cf631..6fabb4b 100644
class, subclass, interf); class, subclass, interf);
} }
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 8d7ed36e113b21de18a1b4a2bf81d218d79114d2 Mon Sep 17 00:00:00 2001 From 8d7ed36e113b21de18a1b4a2bf81d218d79114d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com> From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Wed, 1 Aug 2012 00:18:57 +0200 Date: Wed, 1 Aug 2012 00:18:57 +0200
Subject: [PATCH 018/364] Update manual NetBSD-wise. Subject: [PATCH 018/482] Update manual NetBSD-wise.
--- ---
ChangeLog | 5 +++++ ChangeLog | 5 +++++
@ -111,5 +111,5 @@ index b5954da..b0e7f59 100644
@subsection DOS/Windows @subsection DOS/Windows
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 8b2ef54da3e28cf66637a09c2a2afad9ee56a535 Mon Sep 17 00:00:00 2001 From 8b2ef54da3e28cf66637a09c2a2afad9ee56a535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com> From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Wed, 1 Aug 2012 01:06:53 +0200 Date: Wed, 1 Aug 2012 01:06:53 +0200
Subject: [PATCH 019/364] Regenerate po/POTFILES.in with the following commmand Subject: [PATCH 019/482] Regenerate po/POTFILES.in with the following commmand
in a clean tree: in a clean tree:
export LC_ALL=en_US.UTF-8 export LC_ALL=en_US.UTF-8
@ -64,5 +64,5 @@ index 987b37a..01cc53c 100644
./include/grub/video.h ./include/grub/video.h
./include/grub/x86_64/at_keyboard.h ./include/grub/x86_64/at_keyboard.h
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From cb6d50b03d383cae32b0fbe308acc76c9d041fc6 Mon Sep 17 00:00:00 2001 From cb6d50b03d383cae32b0fbe308acc76c9d041fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com> From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sun, 5 Aug 2012 16:49:03 +0200 Date: Sun, 5 Aug 2012 16:49:03 +0200
Subject: [PATCH 020/364] Strengthen the configure test for working -nostdinc Subject: [PATCH 020/482] Strengthen the configure test for working -nostdinc
-isystem. -isystem.
--- ---
@ -34,5 +34,5 @@ index 91b36d0..190665d 100644
[grub_cv_cc_isystem=yes], [grub_cv_cc_isystem=yes],
[grub_cv_cc_isystem=no]) [grub_cv_cc_isystem=no])
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 96aea00a1794415ecc4f01d3e05569927df19420 Mon Sep 17 00:00:00 2001 From 96aea00a1794415ecc4f01d3e05569927df19420 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 4 Sep 2012 18:33:33 +0100 Date: Tue, 4 Sep 2012 18:33:33 +0100
Subject: [PATCH 021/364] * .bzrignore: Add grub-bios-setup, grub-ofpathname, Subject: [PATCH 021/482] * .bzrignore: Add grub-bios-setup, grub-ofpathname,
and grub-sparc64-setup. and grub-sparc64-setup.
--- ---
@ -9,6 +9,34 @@ Subject: [PATCH 021/364] * .bzrignore: Add grub-bios-setup, grub-ofpathname,
ChangeLog | 5 +++++ ChangeLog | 5 +++++
2 files changed, 8 insertions(+) 2 files changed, 8 insertions(+)
diff --git a/.bzrignore b/.bzrignore
index 64aa4c9..e05e5d9 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -34,6 +34,7 @@ genkernsyms.sh
gensymlist.sh
gentrigtables
grub-bin2h
+grub-bios-setup
grub_cmd_echo
grub_cmd_regexp
grub-editenv
@@ -49,6 +50,7 @@ grub-macho2img
grub-menulst2cfg
grub-mk*
grub-mount
+grub-ofpathname
grub-pe2elf
grub-probe
grub_probe_init.c
@@ -86,6 +88,7 @@ grub_setup_init.c
grub_setup_init.h
grub-shell
grub-shell-tester
+grub-sparc64-setup
*.img
*.image
include/grub/cpu
diff --git a/ChangeLog b/ChangeLog diff --git a/ChangeLog b/ChangeLog
index a0a81b1..ed23d17 100644 index a0a81b1..ed23d17 100644
--- a/ChangeLog --- a/ChangeLog
@ -23,5 +51,5 @@ index a0a81b1..ed23d17 100644
* configure.ac: Strengthen the test for working -nostdinc -isystem. * configure.ac: Strengthen the test for working -nostdinc -isystem.
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From cec2f4441396afd4c6abad10e51e5f0fe1dad686 Mon Sep 17 00:00:00 2001 From cec2f4441396afd4c6abad10e51e5f0fe1dad686 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 4 Sep 2012 18:39:40 +0100 Date: Tue, 4 Sep 2012 18:39:40 +0100
Subject: [PATCH 022/364] * docs/man/grub-mkdevicemap.h2m: Remove, since Subject: [PATCH 022/482] * docs/man/grub-mkdevicemap.h2m: Remove, since
grub-mkdevicemap is gone. grub-mkdevicemap is gone.
--- ---
@ -34,5 +34,5 @@ index 3ef8e97..0000000
-[SEE ALSO] -[SEE ALSO]
-.BR grub-install (8) -.BR grub-install (8)
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 9023fdb4b0f75d3c8e1d0e1b0199ecd416a18c59 Mon Sep 17 00:00:00 2001 From 9023fdb4b0f75d3c8e1d0e1b0199ecd416a18c59 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 4 Sep 2012 18:56:13 +0100 Date: Tue, 4 Sep 2012 18:56:13 +0100
Subject: [PATCH 023/364] * grub-core/mmap/mips/loongson: Remove empty Subject: [PATCH 023/482] * grub-core/mmap/mips/loongson: Remove empty
directory. directory.
--- ---
@ -23,5 +23,5 @@ index 09ffe65..5a938ae 100644
* docs/man/grub-mkdevicemap.h2m: Remove, since grub-mkdevicemap is * docs/man/grub-mkdevicemap.h2m: Remove, since grub-mkdevicemap is
gone. gone.
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 75887218d652d578af29494dd54cd8733643653b Mon Sep 17 00:00:00 2001 From 75887218d652d578af29494dd54cd8733643653b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 4 Sep 2012 18:59:41 +0100 Date: Tue, 4 Sep 2012 18:59:41 +0100
Subject: [PATCH 024/364] * Makefile.am (EXTRA_DIST): Add Subject: [PATCH 024/482] * Makefile.am (EXTRA_DIST): Add
grub-core/tests/boot/linux.init-mips.S, grub-core/tests/boot/linux.init-mips.S,
grub-core/tests/boot/linux.init-ppc.S, and grub-core/tests/boot/linux.init-ppc.S, and
grub-core/tests/boot/linux-ppc.cfg. grub-core/tests/boot/linux-ppc.cfg.
@ -42,5 +42,5 @@ index db9e930..3bb911c 100644
.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \ .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \ bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From e8ec492c1f16328149e2e2c1eed6c300529bcb7a Mon Sep 17 00:00:00 2001 From e8ec492c1f16328149e2e2c1eed6c300529bcb7a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 4 Sep 2012 23:35:38 +0100 Date: Tue, 4 Sep 2012 23:35:38 +0100
Subject: [PATCH 025/364] * Makefile.am (EXTRA_DIST): Add linguas.sh. It's Subject: [PATCH 025/482] * Makefile.am (EXTRA_DIST): Add linguas.sh. It's
only strictly required for checkouts from bzr, but it may be useful for users only strictly required for checkouts from bzr, but it may be useful for users
or distributors wishing to update translations against a tarball or distributors wishing to update translations against a tarball
distribution, and it can be helpful for the tarball to be a superset of distribution, and it can be helpful for the tarball to be a superset of
@ -41,5 +41,5 @@ index 3bb911c..30aa5a7 100644
+ +
+EXTRA_DIST += linguas.sh +EXTRA_DIST += linguas.sh
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 981361e1db432371d895ac1339cc4a940cd6830e Mon Sep 17 00:00:00 2001 From 981361e1db432371d895ac1339cc4a940cd6830e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 Sep 2012 08:45:07 +0200 Date: Wed, 5 Sep 2012 08:45:07 +0200
Subject: [PATCH 026/364] * grub-core/fs/xfs.c (grub_xfs_read_block): Subject: [PATCH 026/482] * grub-core/fs/xfs.c (grub_xfs_read_block):
Make keys a const pointer. Make keys a const pointer.
--- ---
@ -35,5 +35,5 @@ index 2c6b00c..1ed048f 100644
leaf = grub_malloc (node->data->bsize); leaf = grub_malloc (node->data->bsize);
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 33437c4676de37bf30679b5874813af38e5c00c2 Mon Sep 17 00:00:00 2001 From 33437c4676de37bf30679b5874813af38e5c00c2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 Sep 2012 08:47:39 +0200 Date: Wed, 5 Sep 2012 08:47:39 +0200
Subject: [PATCH 027/364] * grub-core/partmap/dvh.c (grub_dvh_is_valid): Subject: [PATCH 027/482] * grub-core/partmap/dvh.c (grub_dvh_is_valid):
Add missing byteswap. Add missing byteswap.
--- ---
@ -37,5 +37,5 @@ index c8f467e..79ec01b 100644
return ! sum; return ! sum;
} }
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From b7ae222dae310111f17da6e1fc072237977ac417 Mon Sep 17 00:00:00 2001 From b7ae222dae310111f17da6e1fc072237977ac417 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 Sep 2012 08:51:31 +0200 Date: Wed, 5 Sep 2012 08:51:31 +0200
Subject: [PATCH 028/364] * grub-core/script/yylex.l: Ignore Subject: [PATCH 028/482] * grub-core/script/yylex.l: Ignore
unused-function and sign-compare warnings. unused-function and sign-compare warnings.
--- ---
@ -38,5 +38,5 @@ index f6a39c5..8fdcfef 100644
#define yyfree grub_lexer_yyfree #define yyfree grub_lexer_yyfree
#define yyalloc grub_lexer_yyalloc #define yyalloc grub_lexer_yyalloc
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 41596a656df83fe0bd72944b711c127c68d28a94 Mon Sep 17 00:00:00 2001 From 41596a656df83fe0bd72944b711c127c68d28a94 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 Sep 2012 08:56:08 +0200 Date: Wed, 5 Sep 2012 08:56:08 +0200
Subject: [PATCH 029/364] * grub-core/disk/ieee1275/ofdisk.c (scan): Subject: [PATCH 029/482] * grub-core/disk/ieee1275/ofdisk.c (scan):
Check function return value. * grub-core/lib/ieee1275/datetime.c Check function return value. * grub-core/lib/ieee1275/datetime.c
(grub_get_datetime): Likewise. (grub_set_datetime): Likewise. (grub_get_datetime): Likewise. (grub_set_datetime): Likewise.
@ -63,5 +63,5 @@ index 1947135..8792429 100644
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 53a8f5760591b14160bc07ef10f083882516ad27 Mon Sep 17 00:00:00 2001 From 53a8f5760591b14160bc07ef10f083882516ad27 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 5 Sep 2012 09:00:39 +0100 Date: Wed, 5 Sep 2012 09:00:39 +0100
Subject: [PATCH 030/364] * util/import_gcry.py: Sort cipher_files, to make Subject: [PATCH 030/482] * util/import_gcry.py: Sort cipher_files, to make
build system generation more deterministic. build system generation more deterministic.
--- ---
@ -36,5 +36,5 @@ index 18966a6..64c5870 100644
conf.write ("AutoGen definitions Makefile.tpl;\n\n") conf.write ("AutoGen definitions Makefile.tpl;\n\n")
confutil = codecs.open ("Makefile.utilgcry.def", "w", "utf-8") confutil = codecs.open ("Makefile.utilgcry.def", "w", "utf-8")
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From f333a71c6c02232151d9af98a8beae3b5e23e102 Mon Sep 17 00:00:00 2001 From f333a71c6c02232151d9af98a8beae3b5e23e102 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 5 Sep 2012 13:55:54 +0100 Date: Wed, 5 Sep 2012 13:55:54 +0100
Subject: [PATCH 031/364] * NEWS: Fix typo. Subject: [PATCH 031/482] * NEWS: Fix typo.
--- ---
ChangeLog | 4 ++++ ChangeLog | 4 ++++
@ -35,5 +35,5 @@ index f9b06ab..4bb5f98 100644
* Menu is organised with submenus. * Menu is organised with submenus.
* Better default video mode selection using EDID. * Better default video mode selection using EDID.
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 4b13dd6c2fe6f75027c51f4b2616509040a5ea33 Mon Sep 17 00:00:00 2001 From 4b13dd6c2fe6f75027c51f4b2616509040a5ea33 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz> From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 5 Sep 2012 16:09:41 +0200 Date: Wed, 5 Sep 2012 16:09:41 +0200
Subject: [PATCH 032/364] * configure.ac: Add SuSe path. Subject: [PATCH 032/482] * configure.ac: Add SuSe path.
--- ---
ChangeLog | 4 ++++ ChangeLog | 4 ++++
@ -34,5 +34,5 @@ index 190665d..ea3830a 100644
FONT_SOURCE="$dir/unifont.$ext" FONT_SOURCE="$dir/unifont.$ext"
break 2 break 2
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 9e9382ece3511ff530cfb3e1c1e7a7dbaa3416b6 Mon Sep 17 00:00:00 2001 From 9e9382ece3511ff530cfb3e1c1e7a7dbaa3416b6 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com> From: Peter Jones <pjones@redhat.com>
Date: Sat, 8 Sep 2012 09:40:24 +0200 Date: Sat, 8 Sep 2012 09:40:24 +0200
Subject: [PATCH 033/364] * grub-core/Makefile.core.def (efifwsetup): Subject: [PATCH 033/482] * grub-core/Makefile.core.def (efifwsetup):
New module. * grub-core/commands/efi/efifwsetup.c: New file. * New module. * grub-core/commands/efi/efifwsetup.c: New file. *
grub-core/kern/efi/efi.c (grub_efi_set_variable): New function * grub-core/kern/efi/efi.c (grub_efi_set_variable): New function *
include/grub/efi/api.h (GRUB_EFI_OS_INDICATIONS_BOOT_TO_FW_UI): New include/grub/efi/api.h (GRUB_EFI_OS_INDICATIONS_BOOT_TO_FW_UI): New
@ -218,5 +218,5 @@ index e67d92b..489cf9e 100644
EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1, EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
const grub_efi_device_path_t *dp2); const grub_efi_device_path_t *dp2);
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 8f779ade959a72267dcc045ad71012bf37cb96e0 Mon Sep 17 00:00:00 2001 From 8f779ade959a72267dcc045ad71012bf37cb96e0 Mon Sep 17 00:00:00 2001
From: Benoit Gschwind <gschwind> From: Benoit Gschwind <gschwind>
Date: Mon, 10 Sep 2012 09:34:29 +0200 Date: Mon, 10 Sep 2012 09:34:29 +0200
Subject: [PATCH 034/364] * grub-core/loader/efi/appleloader.c Subject: [PATCH 034/482] * grub-core/loader/efi/appleloader.c
(devpath_8): New var. (devs): Add devpath_8. (devpath_8): New var. (devs): Add devpath_8.
--- ---
@ -46,5 +46,5 @@ index e2de89f..56d5538 100644
}; };
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 56348e90bcc1076de7b2aba73b52fa1bafee4478 Mon Sep 17 00:00:00 2001 From 56348e90bcc1076de7b2aba73b52fa1bafee4478 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 11 Sep 2012 07:53:26 +0200 Date: Tue, 11 Sep 2012 07:53:26 +0200
Subject: [PATCH 035/364] * grub-core/disk/diskfilter.c (free_array) Subject: [PATCH 035/482] * grub-core/disk/diskfilter.c (free_array)
[GRUB_UTIL]: Fix memory leak. * util/getroot.c (grub_find_device): Likewise. [GRUB_UTIL]: Fix memory leak. * util/getroot.c (grub_find_device): Likewise.
(get_mdadm_uuid): Likewise. (grub_util_is_imsm): Likewise. (get_mdadm_uuid): Likewise. (grub_util_is_imsm): Likewise.
(grub_util_pull_device): Likewise. * util/grub-probe.c (probe): Likewise. (grub_util_pull_device): Likewise. * util/grub-probe.c (probe): Likewise.
@ -102,5 +102,5 @@ index 6dd1073..c2a0f62 100644
} }
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From c7d45a90490c5f3337a6412a6ebe500e3a41a63b Mon Sep 17 00:00:00 2001 From c7d45a90490c5f3337a6412a6ebe500e3a41a63b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 12 Sep 2012 08:27:26 +0200 Date: Wed, 12 Sep 2012 08:27:26 +0200
Subject: [PATCH 036/364] Don't require grub-mkconfig_lib to generate Subject: [PATCH 036/482] Don't require grub-mkconfig_lib to generate
manpages for programs. manpages for programs.
* gentpl.py (manpage): Additional argument adddeps. Add adddeps to * gentpl.py (manpage): Additional argument adddeps. Add adddeps to
@ -66,5 +66,5 @@ index bab4a8a..6d7f613 100644
r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """ r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 085ef74104c8f1a5d2cc68a0d1a2e0569827d6f4 Mon Sep 17 00:00:00 2001 From 085ef74104c8f1a5d2cc68a0d1a2e0569827d6f4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 12 Sep 2012 08:31:05 +0200 Date: Wed, 12 Sep 2012 08:31:05 +0200
Subject: [PATCH 037/364] * include/grub/efi/api.h Subject: [PATCH 037/482] * include/grub/efi/api.h
(grub_efi_runtime_services): Make vendor_guid a const pointer. * (grub_efi_runtime_services): Make vendor_guid a const pointer. *
grub-core/efiemu/runtime/efiemu.c (efiemu_memcpy): Make from a const grub-core/efiemu/runtime/efiemu.c (efiemu_memcpy): Make from a const
pointer. (efiemu_set_variable): Make vendor_guid a const pointer. pointer. (efiemu_set_variable): Make vendor_guid a const pointer.
@ -86,5 +86,5 @@ index ae61730..2917d14 100644
grub_efi_uintn_t data_size, grub_efi_uintn_t data_size,
void *data); void *data);
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 5ba7247c064336767ee6b0ad9465b547ac90322a Mon Sep 17 00:00:00 2001 From 5ba7247c064336767ee6b0ad9465b547ac90322a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 14 Sep 2012 11:23:36 +0100 Date: Fri, 14 Sep 2012 11:23:36 +0100
Subject: [PATCH 038/364] * grub-core/term/terminfo.c: Only fix up powerpc key Subject: [PATCH 038/482] * grub-core/term/terminfo.c: Only fix up powerpc key
repeat on IEEE1275 machines. Fixes powerpc-emu compilation. * repeat on IEEE1275 machines. Fixes powerpc-emu compilation. *
include/grub/terminfo.h: Likewise. include/grub/terminfo.h: Likewise.
@ -70,5 +70,5 @@ index c081a92..20541a9 100644
grub_uint64_t last_key_time; grub_uint64_t last_key_time;
#endif #endif
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 7efa81764aa812d1f44ff53fb42472befea19f0b Mon Sep 17 00:00:00 2001 From 7efa81764aa812d1f44ff53fb42472befea19f0b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 17 Sep 2012 16:58:50 +0100 Date: Mon, 17 Sep 2012 16:58:50 +0100
Subject: [PATCH 039/364] * util/grub-mkconfig_lib.in (grub_quote): Remove Subject: [PATCH 039/482] * util/grub-mkconfig_lib.in (grub_quote): Remove
outdated sentence from comment. outdated sentence from comment.
--- ---
@ -40,5 +40,5 @@ index beb52ee..a9f5809 100644
sed "s/'/'\\\\''/g" sed "s/'/'\\\\''/g"
} }
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 1f5027bb0ec48851cc2f9c54552a6ec1f1145930 Mon Sep 17 00:00:00 2001 From 1f5027bb0ec48851cc2f9c54552a6ec1f1145930 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 Sep 2012 11:44:29 +0200 Date: Tue, 18 Sep 2012 11:44:29 +0200
Subject: [PATCH 040/364] * grub-core/loader/i386/linux.c Subject: [PATCH 040/482] * grub-core/loader/i386/linux.c
(grub_cmd_linux): Fix incorrect le-conversion. Reported by: BURETTE, (grub_cmd_linux): Fix incorrect le-conversion. Reported by: BURETTE,
Bernard. Bernard.
@ -38,5 +38,5 @@ index d34b2f8..bcb037c 100644
return grub_error(GRUB_ERR_BAD_OS, return grub_error(GRUB_ERR_BAD_OS,
"kernel does not support 64-bit addressing"); "kernel does not support 64-bit addressing");
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 731ae0c1c7c0458a257e75c55b7739881dc2d5ed Mon Sep 17 00:00:00 2001 From 731ae0c1c7c0458a257e75c55b7739881dc2d5ed Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 Sep 2012 11:52:19 +0200 Date: Tue, 18 Sep 2012 11:52:19 +0200
Subject: [PATCH 041/364] * grub-core/kern/ieee1275/cmain.c Subject: [PATCH 041/482] * grub-core/kern/ieee1275/cmain.c
(grub_ieee1275_find_options): Set (grub_ieee1275_find_options): Set
GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN on mac. * GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN on mac. *
grub-core/term/ieee1275/console.c (grub_console_init_lately): Use grub-core/term/ieee1275/console.c (grub_console_init_lately): Use
@ -117,5 +117,5 @@ index 38a75fd..ee9b707 100644
extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag); extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From f46ac5e6c44d2fed8dcd8451196e6141d89cd90d Mon Sep 17 00:00:00 2001 From f46ac5e6c44d2fed8dcd8451196e6141d89cd90d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 Sep 2012 13:04:06 +0200 Date: Tue, 18 Sep 2012 13:04:06 +0200
Subject: [PATCH 042/364] * util/grub-mkconfig_lib.in (grub_tab): New Subject: [PATCH 042/482] * util/grub-mkconfig_lib.in (grub_tab): New
variable. (grub_add_tab): New function. * util/grub.d/10_hurd.in: variable. (grub_add_tab): New function. * util/grub.d/10_hurd.in:
Replace \t with $grub_tab orgrub_add_tab. * util/grub.d/10_illumos.in: Replace \t with $grub_tab orgrub_add_tab. * util/grub.d/10_illumos.in:
Likewise. * util/grub.d/10_kfreebsd.in: Likewise. * Likewise. * util/grub.d/10_kfreebsd.in: Likewise. *
@ -356,5 +356,5 @@ index bcc6c25..bf47dc3 100644
mach_device="`echo "${grub_device}" | sed -e 's/(\(hd.*\),msdos\(.*\))/\1s\2/'`" mach_device="`echo "${grub_device}" | sed -e 's/(\(hd.*\),msdos\(.*\))/\1s\2/'`"
grub_fs="`${grub_probe} --device ${DEVICE} --target=fs`" grub_fs="`${grub_probe} --device ${DEVICE} --target=fs`"
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From fc8c72d6ad43b3fd7a960e67bbacd6fe8d68e48a Mon Sep 17 00:00:00 2001 From fc8c72d6ad43b3fd7a960e67bbacd6fe8d68e48a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 19 Sep 2012 02:41:51 +0100 Date: Wed, 19 Sep 2012 02:41:51 +0100
Subject: [PATCH 043/364] * util/grub-setup.c (write_rootdev): Remove unused Subject: [PATCH 043/482] * util/grub-setup.c (write_rootdev): Remove unused
core_img parameter. Update all callers. (setup): Define core_sectors only if core_img parameter. Update all callers. (setup): Define core_sectors only if
GRUB_SETUP_BIOS, to appease 'gcc -Wunused-but-set-variable'. Remove GRUB_SETUP_BIOS, to appease 'gcc -Wunused-but-set-variable'. Remove
unnecessary nested #ifdef GRUB_SETUP_BIOS. unnecessary nested #ifdef GRUB_SETUP_BIOS.
@ -105,5 +105,5 @@ index 085e8df..de0417f 100644
/* Write the first two sectors of the core image onto the disk. */ /* Write the first two sectors of the core image onto the disk. */
grub_util_info ("opening the core image `%s'", core_path); grub_util_info ("opening the core image `%s'", core_path);
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From fbc6f5faf45f489125f98a11f3593cd43b4d6b76 Mon Sep 17 00:00:00 2001 From fbc6f5faf45f489125f98a11f3593cd43b4d6b76 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 19 Sep 2012 02:44:54 +0100 Date: Wed, 19 Sep 2012 02:44:54 +0100
Subject: [PATCH 044/364] * grub-core/partmap/msdos.c (pc_partition_map_embed): Subject: [PATCH 044/482] * grub-core/partmap/msdos.c (pc_partition_map_embed):
Revert incorrect off-by-one fix from 2011-02-12. A 62-sector core image Revert incorrect off-by-one fix from 2011-02-12. A 62-sector core image
should fit before end == 63. should fit before end == 63.
@ -48,5 +48,5 @@ index 6e54a74..10ca3f0 100644
if (*nsectors > max_nsectors) if (*nsectors > max_nsectors)
*nsectors = max_nsectors; *nsectors = max_nsectors;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From b37a32bb89c476b0ead4c40900de29fe8d73d27e Mon Sep 17 00:00:00 2001 From b37a32bb89c476b0ead4c40900de29fe8d73d27e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 22 Sep 2012 21:19:58 +0100 Date: Sat, 22 Sep 2012 21:19:58 +0100
Subject: [PATCH 045/364] Fix grub-emu build on FreeBSD. Subject: [PATCH 045/482] Fix grub-emu build on FreeBSD.
* Makefile.util.def (grub-mount): Add LIBGEOM to ldadd. * Makefile.util.def (grub-mount): Add LIBGEOM to ldadd.
* grub-core/net/drivers/emu/emunet.c: Only include Linux-specific * grub-core/net/drivers/emu/emunet.c: Only include Linux-specific
@ -121,5 +121,5 @@ index b97bea6..c2a25c9 100644
unsigned int i; unsigned int i;
char *device = 0; char *device = 0;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From e6f215afa8ff4d586f71276fc12ea14eb1e6cd8b Mon Sep 17 00:00:00 2001 From e6f215afa8ff4d586f71276fc12ea14eb1e6cd8b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 24 Sep 2012 18:50:35 +0100 Date: Mon, 24 Sep 2012 18:50:35 +0100
Subject: [PATCH 046/364] * util/grub-install.in: Make the error message if Subject: [PATCH 046/482] * util/grub-install.in: Make the error message if
$source_dir doesn't exist more useful. $source_dir doesn't exist more useful.
--- ---
@ -36,5 +36,5 @@ index e19f1cd..56be98f 100644
fi fi
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From d36c4c3115977beb5f9247c6c6f0a2a209389f45 Mon Sep 17 00:00:00 2001 From d36c4c3115977beb5f9247c6c6f0a2a209389f45 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 26 Sep 2012 09:33:41 +0200 Date: Wed, 26 Sep 2012 09:33:41 +0200
Subject: [PATCH 047/364] * grub-core/fs/affs.c (grub_affs_mount): Subject: [PATCH 047/482] * grub-core/fs/affs.c (grub_affs_mount):
Support AFFS bootblock in sector 1. Support AFFS bootblock in sector 1.
--- ---
@ -198,5 +198,5 @@ index ef65479..848a455 100644
grub_free (data); grub_free (data);
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 9196249442d3d9b360b77a5bd35ffb6c49935c78 Mon Sep 17 00:00:00 2001 From 9196249442d3d9b360b77a5bd35ffb6c49935c78 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 26 Sep 2012 13:12:20 +0100 Date: Wed, 26 Sep 2012 13:12:20 +0100
Subject: [PATCH 048/364] * util/grub-mkconfig_lib.in Subject: [PATCH 048/482] * util/grub-mkconfig_lib.in
(is_path_readable_by_grub): Redirect errors from grub-probe to /dev/null, not (is_path_readable_by_grub): Redirect errors from grub-probe to /dev/null, not
stdout. stdout.
@ -37,5 +37,5 @@ index 8f21eb2..3574839 100644
else else
return 1 return 1
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 42593e7230fad9f87732c1687cb5daff918f2fa1 Mon Sep 17 00:00:00 2001 From 42593e7230fad9f87732c1687cb5daff918f2fa1 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 26 Sep 2012 13:51:13 +0100 Date: Wed, 26 Sep 2012 13:51:13 +0100
Subject: [PATCH 049/364] * Makefile.util.def (grub-mknetdir): Move to Subject: [PATCH 049/482] * Makefile.util.def (grub-mknetdir): Move to
$prefix/bin. Reported by: Daniel Kahn Gillmor. Fixes Debian bug #688799. $prefix/bin. Reported by: Daniel Kahn Gillmor. Fixes Debian bug #688799.
--- ---
@ -40,5 +40,5 @@ index 72057cf..8324ede 100644
common = util/grub-mknetdir.in; common = util/grub-mknetdir.in;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 8c38cb1283a0cf1c8eae465bff26e0ca966ac43a Mon Sep 17 00:00:00 2001 From 8c38cb1283a0cf1c8eae465bff26e0ca966ac43a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 5 Oct 2012 13:09:19 +0100 Date: Fri, 5 Oct 2012 13:09:19 +0100
Subject: [PATCH 050/364] * grub-core/loader/i386/linux.c (allocate_pages): Fix Subject: [PATCH 050/482] * grub-core/loader/i386/linux.c (allocate_pages): Fix
spelling of preferred_address. (grub_cmd_linux): Likewise. * spelling of preferred_address. (grub_cmd_linux): Likewise. *
grub-core/net/icmp6.c (struct prefix_option): Fix spelling of grub-core/net/icmp6.c (struct prefix_option): Fix spelling of
preferred_lifetime. Update all users. preferred_lifetime. Update all users.
@ -128,5 +128,5 @@ index 4fc343d..9ded94b 100644
opt->prefixlen != 64); opt->prefixlen != 64);
continue; continue;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From a940b1492cc0c066725e5e49882602fb0e5c7399 Mon Sep 17 00:00:00 2001 From a940b1492cc0c066725e5e49882602fb0e5c7399 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 12 Oct 2012 15:34:33 +0100 Date: Fri, 12 Oct 2012 15:34:33 +0100
Subject: [PATCH 052/364] * grub-core/commands/configfile.c (GRUB_MOD_INIT): Subject: [PATCH 051/482] * grub-core/commands/configfile.c (GRUB_MOD_INIT):
Correct description of extract_entries_configfile. Correct description of extract_entries_configfile.
--- ---
@ -38,5 +38,5 @@ index 99c0a24..f2d2abb 100644
cmd_dot = cmd_dot =
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 331fdad4315282f8e367e291131e048593a3a068 Mon Sep 17 00:00:00 2001 From bcc11ed025a0e09e2c79cb0a4a60d7f4d574f24f Mon Sep 17 00:00:00 2001
From: Christoph Junghans <ottxor@gentoo.org> From: Christoph Junghans <ottxor@gentoo.org>
Date: Fri, 12 Oct 2012 15:04:02 +0200 Date: Fri, 12 Oct 2012 15:04:02 +0200
Subject: [PATCH 051/364] * grub-core/Makefile.am (moddep.lst): Use $(AWK) Subject: [PATCH 052/482] * grub-core/Makefile.am (moddep.lst): Use $(AWK)
instead of awk instead of awk
--- ---
@ -22,5 +22,5 @@ index cc4fb68..9cb14e2 100644
CLEANFILES += config.log syminfo.lst moddep.lst CLEANFILES += config.log syminfo.lst moddep.lst
-- --
1.8.1.4 1.8.2.1

View File

@ -0,0 +1,25 @@
From 3fdb3a7b38a0cd0179a48790eb1272f9c8e60cd1 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 3 Jun 2013 14:12:46 -0400
Subject: [PATCH 053/482] Add missing ChangeLog
---
ChangeLog | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 9280dba..c7b07bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-12 Christoph Junghans <ottxor@gentoo.org>
+
+ * grub-core/Makefile.am (moddep.lst): Use $(AWK) rather than awk.
+ Fixes Savannah bug #37558.
+
2012-10-12 Colin Watson <cjwatson@ubuntu.com>
* grub-core/commands/configfile.c (GRUB_MOD_INIT): Correct
--
1.8.2.1

View File

@ -1,7 +1,7 @@
From 5bf54ea7bf0fc7d1c2b9806a57566ad25179d07c Mon Sep 17 00:00:00 2001 From 8109764f605afbc888760e323d19110ccef84e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com> From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sun, 28 Oct 2012 11:55:22 +0100 Date: Sun, 28 Oct 2012 11:55:22 +0100
Subject: [PATCH 053/364] Fix ordering and tab indentation of NetBSD boot menu Subject: [PATCH 054/482] Fix ordering and tab indentation of NetBSD boot menu
entries. entries.
--- ---
@ -19,9 +19,9 @@ index c7b07bb..caea96d 100644
+ * util/grub.d/10_netbsd.in: Fix tab indentation and make sure + * util/grub.d/10_netbsd.in: Fix tab indentation and make sure
+ that /netbsd appears first (when it exists). + that /netbsd appears first (when it exists).
+ +
2012-10-12 Colin Watson <cjwatson@ubuntu.com> 2012-10-12 Christoph Junghans <ottxor@gentoo.org>
* grub-core/commands/configfile.c (GRUB_MOD_INIT): Correct * grub-core/Makefile.am (moddep.lst): Use $(AWK) rather than awk.
diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
index b76332b..dead5c1 100644 index b76332b..dead5c1 100644
--- a/util/grub.d/10_netbsd.in --- a/util/grub.d/10_netbsd.in
@ -67,5 +67,5 @@ index b76332b..dead5c1 100644
continue continue
fi fi
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From ae12080106554c5dd5e2d19799f08a0aa72c9be9 Mon Sep 17 00:00:00 2001 From e64acf0c9e709e2f2fc4908f2123ad908371839b Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com> From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Wed, 28 Nov 2012 14:14:20 +0100 Date: Wed, 28 Nov 2012 14:14:20 +0100
Subject: [PATCH 054/364] * grub-core/net/bootp.c (parse_dhcp_vendor): Subject: [PATCH 055/482] * grub-core/net/bootp.c (parse_dhcp_vendor):
Fix double increment. Fix double increment.
--- ---
@ -35,5 +35,5 @@ index bc07d53..f36d4cd 100644
set_env_limn_ro (name, "hostname", (char *) ptr, taglength); set_env_limn_ro (name, "hostname", (char *) ptr, taglength);
break; break;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From aa3830c409ca40e6f0b71279ddb3409262a7bd96 Mon Sep 17 00:00:00 2001 From e2638674dca6e5c31624057734bff69f3bba2e80 Mon Sep 17 00:00:00 2001
From: Leif Lindholm <leif.lindholm@arm.com> From: Leif Lindholm <leif.lindholm@arm.com>
Date: Wed, 28 Nov 2012 14:18:45 +0100 Date: Wed, 28 Nov 2012 14:18:45 +0100
Subject: [PATCH 055/364] * include/grub/types.h: Fix functionality Subject: [PATCH 056/482] * include/grub/types.h: Fix functionality
unaffecting typo in GRUB_TARGET_WORDSIZE conditional macro. unaffecting typo in GRUB_TARGET_WORDSIZE conditional macro.
--- ---
@ -36,5 +36,5 @@ index 3e677c6..22d1be7 100644
# define GRUB_TARGET_WORDSIZE 32 # define GRUB_TARGET_WORDSIZE 32
# elif GRUB_TARGET_SIZEOF_VOID_P == 8 # elif GRUB_TARGET_SIZEOF_VOID_P == 8
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From b4ec418af5d77275f3b3cf5e7566eaa4ecd713bd Mon Sep 17 00:00:00 2001 From f507bf51532d6523dc7ef142058149a17fec5db7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 8 Dec 2012 20:56:58 +0100 Date: Sat, 8 Dec 2012 20:56:58 +0100
Subject: [PATCH 056/364] Support big-endian UFS1. Subject: [PATCH 057/482] Support big-endian UFS1.
* Makefile.util.def (libgrubmods): Add ufs_be.c * Makefile.util.def (libgrubmods): Add ufs_be.c
* grub-core/Makefile.core.def (ufs1_be): New module. * grub-core/Makefile.core.def (ufs1_be): New module.
@ -303,5 +303,5 @@ index 0000000..a58f75a
+#define MODE_BIGENDIAN 1 +#define MODE_BIGENDIAN 1
+#include "ufs.c" +#include "ufs.c"
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 32776fea2049a8b8198fdd59d49e18b4f8916d28 Mon Sep 17 00:00:00 2001 From 10519a65aaf196c32e687a681b9565a763d772dc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 8 Dec 2012 21:14:08 +0100 Date: Sat, 8 Dec 2012 21:14:08 +0100
Subject: [PATCH 057/364] Fix big-endian mtime. Subject: [PATCH 058/482] Fix big-endian mtime.
* grub-core/fs/ufs.c (grub_ufs_inode): Split improperly attached * grub-core/fs/ufs.c (grub_ufs_inode): Split improperly attached
together sec and usec. together sec and usec.
@ -75,5 +75,5 @@ index 3f2dba1..c862336 100644
if (hook (filename, &info)) if (hook (filename, &info))
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 5361431d3faa4ddbbd5d5c6a1fa10e0cebc60623 Mon Sep 17 00:00:00 2001 From 64ab320166410339edd8ae49b19780f1a793f450 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 10 Dec 2012 09:22:40 +0100 Date: Mon, 10 Dec 2012 09:22:40 +0100
Subject: [PATCH 058/364] * grub-core/fs/ufs.c (grub_ufs_dir): Stop if Subject: [PATCH 059/482] * grub-core/fs/ufs.c (grub_ufs_dir): Stop if
direntlen is 0 to avoid infinite loop on corrupted FS. direntlen is 0 to avoid infinite loop on corrupted FS.
--- ---
@ -37,5 +37,5 @@ index c862336..74a4a40 100644
namelen = dirent.namelen_bsd; namelen = dirent.namelen_bsd;
#else #else
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From d2634650c732823bd304e0413f84d383c2689117 Mon Sep 17 00:00:00 2001 From 62bded903da0a8a30155a757f0a89c3e39b7238c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 10 Dec 2012 11:12:38 +0100 Date: Mon, 10 Dec 2012 11:12:38 +0100
Subject: [PATCH 059/364] * util/getroot.c Subject: [PATCH 060/482] * util/getroot.c
(convert_system_partition_to_system_disk): Support nbd disks. (convert_system_partition_to_system_disk): Support nbd disks.
--- ---
@ -48,5 +48,5 @@ index c2a25c9..24ce6aa 100644
if (strncmp ("vdisk", p, 5) == 0 if (strncmp ("vdisk", p, 5) == 0
&& p[5] >= 'a' && p[5] <= 'z') && p[5] >= 'a' && p[5] <= 'z')
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 18c470fb212991eea8749327b7baa44ebefc4215 Mon Sep 17 00:00:00 2001 From 601e4870ed17abe682d5581c8ece9adc61184713 Mon Sep 17 00:00:00 2001
From: Vladimir Testov <vladimir.testov@rosalab.ru> From: Vladimir Testov <vladimir.testov@rosalab.ru>
Date: Mon, 10 Dec 2012 11:45:00 +0100 Date: Mon, 10 Dec 2012 11:45:00 +0100
Subject: [PATCH 060/364] * util/grub-mkfont.c (argp_parser): Fix a typo Subject: [PATCH 061/482] * util/grub-mkfont.c (argp_parser): Fix a typo
which prevented --asce from working. which prevented --asce from working.
--- ---
@ -36,5 +36,5 @@ index 4e2c5e4..83fb2d2 100644
break; break;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From c54df09cdb44ab19f9f7d5ece0f6568f4c19e46f Mon Sep 17 00:00:00 2001 From ce0e3665b2afdab0e43cf7c0a0aa55149af42a6e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 10 Dec 2012 16:07:33 +0100 Date: Mon, 10 Dec 2012 16:07:33 +0100
Subject: [PATCH 061/364] * grub-core/term/gfxterm.c Subject: [PATCH 062/482] * grub-core/term/gfxterm.c
(grub_virtual_screen_setup): Get font as argument rather than font (grub_virtual_screen_setup): Get font as argument rather than font
name. All users updated. (grub_gfxterm_set_window): Likewise. name. All users updated. (grub_gfxterm_set_window): Likewise.
@ -144,5 +144,5 @@ index 3fc8d92..361f73e 100644
typedef void (*grub_gfxterm_repaint_callback_t)(int x, int y, typedef void (*grub_gfxterm_repaint_callback_t)(int x, int y,
int width, int height); int width, int height);
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 592fe36daf0064866bbee740383cbf7bd2156639 Mon Sep 17 00:00:00 2001 From 92e7e2d5571844ef1604386f442eaf1e4085ed64 Mon Sep 17 00:00:00 2001
From: "Dr. Tilmann Bubeck" <t.bubeck@reinform.de> From: "Dr. Tilmann Bubeck" <t.bubeck@reinform.de>
Date: Mon, 10 Dec 2012 16:14:12 +0100 Date: Mon, 10 Dec 2012 16:14:12 +0100
Subject: [PATCH 062/364] * grub-core/gfxmenu/view.c (init_terminal): Subject: [PATCH 063/482] * grub-core/gfxmenu/view.c (init_terminal):
Avoid making terminal window too small. Avoid making terminal window too small.
--- ---
@ -83,5 +83,5 @@ index c005773..1918ea4 100644
} }
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From acfa4335f7ed7310e7ee2da1f68443785f7f7913 Mon Sep 17 00:00:00 2001 From 188fddf6f99533505a0f8c7c4f8223ba19d8ef6a Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com> From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Mon, 10 Dec 2012 16:23:16 +0100 Date: Mon, 10 Dec 2012 16:23:16 +0100
Subject: [PATCH 063/364] * grub-core/kern/ieee1275/init.c Subject: [PATCH 064/482] * grub-core/kern/ieee1275/init.c
(grub_machine_get_bootlocation): Use dynamic allocation for the bootpath (grub_machine_get_bootlocation): Use dynamic allocation for the bootpath
buffer. buffer.
@ -71,5 +71,5 @@ index 7d03a8a..14dcdf0 100644
/* Claim some available memory in the first /memory node. */ /* Claim some available memory in the first /memory node. */
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From b21a644e810f7c20844b828150d24d58ad0b776e Mon Sep 17 00:00:00 2001 From 5ed1ee18ef11a1aa0922ce35f56e44cc0cab5da5 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com> From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Mon, 10 Dec 2012 17:00:56 +0100 Date: Mon, 10 Dec 2012 17:00:56 +0100
Subject: [PATCH 064/364] * util/grub-install.in: Remove stale TODO. Subject: [PATCH 065/482] * util/grub-install.in: Remove stale TODO.
--- ---
ChangeLog | 4 ++++ ChangeLog | 4 ++++
@ -34,5 +34,5 @@ index 56be98f..a2cf07a 100644
efidir="$efidir/EFI/$efi_distributor" efidir="$efidir/EFI/$efi_distributor"
mkdir -p "$efidir" || exit 1 mkdir -p "$efidir" || exit 1
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 28e8ed1fc8a89e3d4c71be6b27166b26b4e61570 Mon Sep 17 00:00:00 2001 From 421249fda0ae1b6138ccf14b34fa4c58fd3296d4 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com> From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Mon, 10 Dec 2012 17:07:01 +0100 Date: Mon, 10 Dec 2012 17:07:01 +0100
Subject: [PATCH 065/364] * util/grub-install.in: Follow the symbolic Subject: [PATCH 066/482] * util/grub-install.in: Follow the symbolic
link parameter added to the file command. link parameter added to the file command.
--- ---
@ -36,5 +36,5 @@ index a2cf07a..9dc4e0b 100644
gettext "Failed to copy Grub to the PReP partition." 1>&2 gettext "Failed to copy Grub to the PReP partition." 1>&2
echo 1>&2 echo 1>&2
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 08a1459a9534fa2337744a32dda511d496e9d6cf Mon Sep 17 00:00:00 2001 From dc089e5e9c9bf5ba1fa00cf8166f9628804741d9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 10 Dec 2012 19:15:51 +0100 Date: Mon, 10 Dec 2012 19:15:51 +0100
Subject: [PATCH 066/364] * grub-core/disk/cryptodisk.c Subject: [PATCH 067/482] * grub-core/disk/cryptodisk.c
(grub_cmd_cryptomount): Strip brackets around device name if (grub_cmd_cryptomount): Strip brackets around device name if
necessarry. necessarry.
@ -50,5 +50,5 @@ index 1ac906d..3de3b86 100644
return grub_errno; return grub_errno;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 80fa6c9eaeb13ed950d44bae4890c5b2da7ea6f1 Mon Sep 17 00:00:00 2001 From 3db2aa0adc7c356df7baff39b53212c735fff042 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 10 Dec 2012 22:22:23 +0100 Date: Mon, 10 Dec 2012 22:22:23 +0100
Subject: [PATCH 067/364] * docs/grub.texi (Network): Update Subject: [PATCH 068/482] * docs/grub.texi (Network): Update
instructions on generating netboot image. instructions on generating netboot image.
--- ---
@ -82,5 +82,5 @@ index b0e7f59..39d9614 100644
GRUB provides several environment variables which may be used to inspect or GRUB provides several environment variables which may be used to inspect or
change the behaviour of the PXE device: change the behaviour of the PXE device:
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 34cb801ec4d1999babf5f7fe65cd70a149746137 Mon Sep 17 00:00:00 2001 From bd049427e99ec99447426c2264a432f08b156e4c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 11 Dec 2012 17:40:35 +0100 Date: Tue, 11 Dec 2012 17:40:35 +0100
Subject: [PATCH 068/364] * util/grub.d/20_linux_xen.in: Addmissing Subject: [PATCH 069/482] * util/grub.d/20_linux_xen.in: Addmissing
assignment to machine. Reported by: Eriks Latosheks <foresterlv>. assignment to machine. Reported by: Eriks Latosheks <foresterlv>.
--- ---
@ -36,5 +36,5 @@ index d4d0110..ac05ee4 100644
i?86) GENKERNEL_ARCH="x86" ;; i?86) GENKERNEL_ARCH="x86" ;;
mips|mips64) GENKERNEL_ARCH="mips" ;; mips|mips64) GENKERNEL_ARCH="mips" ;;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From d09689a5a2863043d007c1acb9bf0a8d1d3b776d Mon Sep 17 00:00:00 2001 From 44fc4a3f10e315aecc593f0642e1fbccbb466bc9 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 28 Dec 2012 06:43:35 +0000 Date: Fri, 28 Dec 2012 06:43:35 +0000
Subject: [PATCH 069/364] Backport gnulib fixes for C11. Fixes Savannah bug Subject: [PATCH 070/482] Backport gnulib fixes for C11. Fixes Savannah bug
#37738. #37738.
* grub-core/gnulib/stdio.in.h (gets): Warn on use only if * grub-core/gnulib/stdio.in.h (gets): Warn on use only if
@ -62,5 +62,5 @@ index f5650cd..8458bec 100644
]) ])
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 6db544ab2cdff7e5821558d150ac848c28c3fc93 Mon Sep 17 00:00:00 2001 From 899f59e4357a2a3bfb5a2e58ad83700f16d347a7 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 28 Dec 2012 06:57:17 +0000 Date: Fri, 28 Dec 2012 06:57:17 +0000
Subject: [PATCH 070/364] Apply program name transformations at build-time Subject: [PATCH 071/482] Apply program name transformations at build-time
rather than at run-time. Fixes Debian bug #696465. rather than at run-time. Fixes Debian bug #696465.
* acinclude.m4 (grub_TRANSFORM): New macro. * acinclude.m4 (grub_TRANSFORM): New macro.
@ -512,5 +512,5 @@ index b3b88f0..2615cab 100644
export TEXTDOMAIN=@PACKAGE@ export TEXTDOMAIN=@PACKAGE@
export TEXTDOMAINDIR="@localedir@" export TEXTDOMAINDIR="@localedir@"
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 25b73b33cdaafb3f21c5014b090a71f8449653c5 Mon Sep 17 00:00:00 2001 From e933ab46a2f423c4c0f62283404a7d7787efd30f Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 28 Dec 2012 07:13:34 +0000 Date: Fri, 28 Dec 2012 07:13:34 +0000
Subject: [PATCH 071/364] neater gnulib backport Subject: [PATCH 072/482] neater gnulib backport
--- ---
m4/stdio_h.m4 | 2 +- m4/stdio_h.m4 | 2 +-
@ -21,5 +21,5 @@ index 8458bec..d3edb42 100644
]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat ]], [dprintf fpurge fseeko ftello getdelim getline gets popen renameat
snprintf tmpfile vdprintf vsnprintf]) snprintf tmpfile vdprintf vsnprintf])
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 2572b7c6ff8be58b10b3b9d13e35b50a535ee2ac Mon Sep 17 00:00:00 2001 From 66f89845c04cc5cc358c6bb2cd9c4ac512136698 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 28 Dec 2012 07:21:17 +0000 Date: Fri, 28 Dec 2012 07:21:17 +0000
Subject: [PATCH 072/364] * util/grub-mkconfig.in: Accept Subject: [PATCH 073/482] * util/grub-mkconfig.in: Accept
GRUB_TERMINAL_OUTPUT=vga_text. Fixes Savannah bug #37821. GRUB_TERMINAL_OUTPUT=vga_text. Fixes Savannah bug #37821.
--- ---
@ -38,5 +38,5 @@ index 4263367..8decc1d 100644
export LANG=C;; export LANG=C;;
*) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;; *) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From a0e1ddf87544a8371fff110c451576016ca81fb3 Mon Sep 17 00:00:00 2001 From 97478894ed1ee9cad7e40ff8d9cd12247747b899 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 30 Dec 2012 09:57:58 +0000 Date: Sun, 30 Dec 2012 09:57:58 +0000
Subject: [PATCH 073/364] * grub-core/bus/usb/ehci.c (grub_ehci_pci_iter): Subject: [PATCH 074/482] * grub-core/bus/usb/ehci.c (grub_ehci_pci_iter):
Remove incorrect __attribute__ ((unused)). * grub-core/video/bochs.c Remove incorrect __attribute__ ((unused)). * grub-core/video/bochs.c
(find_card): Likewise. * grub-core/video/cirrus.c (find_card): Likewise. * (find_card): Likewise. * grub-core/video/cirrus.c (find_card): Likewise. *
grub-core/video/radeon_fuloong2e.c (find_card): Likewise. * grub-core/video/radeon_fuloong2e.c (find_card): Likewise. *
@ -122,5 +122,5 @@ index 5f22c40..d780983 100644
grub_pci_address_t addr; grub_pci_address_t addr;
grub_uint32_t class; grub_uint32_t class;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From a3564dd3f793d2677584a93284966b6b9f14ebdb Mon Sep 17 00:00:00 2001 From 78def2574a02429cb43d5f6a44a607315cdcee68 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 31 Dec 2012 17:31:38 +0000 Date: Mon, 31 Dec 2012 17:31:38 +0000
Subject: [PATCH 074/364] Remove several trivially-unnecessary uses of nested Subject: [PATCH 075/482] Remove several trivially-unnecessary uses of nested
functions. functions.
* grub-core/commands/i386/pc/sendkey.c * grub-core/commands/i386/pc/sendkey.c
@ -813,5 +813,5 @@ index 8e2b4da..33b644b 100644
grub_free (script); grub_free (script);
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From bf9d0c7cfcc093b873d6d4c594cd407dc6bca69c Mon Sep 17 00:00:00 2001 From ea42a4554351f4a695bf24f208ec0ad769f05e5c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 2 Jan 2013 09:29:48 +0000 Date: Wed, 2 Jan 2013 09:29:48 +0000
Subject: [PATCH 075/364] * docs/grub.texi (configfile): Explain environment Subject: [PATCH 076/482] * docs/grub.texi (configfile): Explain environment
variable handling. (source): New section. Reported by: Arbiel Perlacremaz. variable handling. (source): New section. Reported by: Arbiel Perlacremaz.
Fixes Savannah bug #35564. Fixes Savannah bug #35564.
@ -69,5 +69,5 @@ index 39d9614..e9af377 100644
@subsection true @subsection true
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From bd0f06eea6be3f3e2efb07069f853741867a320f Mon Sep 17 00:00:00 2001 From 36cf49ba9881811dec77be5564bf001b2667220b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 2 Jan 2013 12:48:31 +0000 Date: Wed, 2 Jan 2013 12:48:31 +0000
Subject: [PATCH 076/364] Fix failing printf test. Subject: [PATCH 077/482] Fix failing printf test.
* grub-core/kern/misc.c (grub_vsnprintf_real): Parse '-', '.', and * grub-core/kern/misc.c (grub_vsnprintf_real): Parse '-', '.', and
'$' in the correct order when collecting type information. '$' in the correct order when collecting type information.
@ -66,5 +66,5 @@ index 95d4624..c3203a0 100644
fmt++; fmt++;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 1fb2a38cdc4278a0c65e9b0cbca6fdaae3343564 Mon Sep 17 00:00:00 2001 From a87f3af8a497842210564db7fa5d922c4a2be9c8 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 2 Jan 2013 16:42:48 +0000 Date: Wed, 2 Jan 2013 16:42:48 +0000
Subject: [PATCH 077/364] * grub-core/tests/lib/test.c (grub_test_run): Return Subject: [PATCH 078/482] * grub-core/tests/lib/test.c (grub_test_run): Return
non-zero on test failures, so that a failing unit test correctly causes 'make non-zero on test failures, so that a failing unit test correctly causes 'make
check' to fail. check' to fail.
@ -51,5 +51,5 @@ index aac77e9..1d2cb8c 100644
+ } + }
} }
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 9a3cdbccd18ddda45d3e69de75d6c4865da72aae Mon Sep 17 00:00:00 2001 From d964d1d7d0a8805e9a2cdf63b5124846e5301897 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 3 Jan 2013 10:32:57 +0000 Date: Thu, 3 Jan 2013 10:32:57 +0000
Subject: [PATCH 078/364] * docs/grub.texi (Invoking grub-mount): New section. Subject: [PATCH 079/482] * docs/grub.texi (Invoking grub-mount): New section.
Reported by: Filipus Klutiero. Fixes Debian bug #666427. Reported by: Filipus Klutiero. Fixes Debian bug #666427.
--- ---
@ -146,5 +146,5 @@ index e9af377..60b18b5 100644
@chapter Invoking grub-probe @chapter Invoking grub-probe
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 3d109c87aec982045fd78e0937589af98eb0ad38 Mon Sep 17 00:00:00 2001 From 24c95595badc668ca9444155261d67b290b87c84 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 3 Jan 2013 10:53:53 +0000 Date: Thu, 3 Jan 2013 10:53:53 +0000
Subject: [PATCH 079/364] * docs/grub.texi (Invoking grub-mkrelpath): New Subject: [PATCH 080/482] * docs/grub.texi (Invoking grub-mkrelpath): New
section. (Invoking grub-script-check): Likewise. section. (Invoking grub-script-check): Likewise.
--- ---
@ -121,5 +121,5 @@ index 60b18b5..e23cecc 100644
@appendix How to obtain and build GRUB @appendix How to obtain and build GRUB
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 7adc96e903f5581b38ba397a6d4d93f923b2fc5e Mon Sep 17 00:00:00 2001 From d814e848e1800f4571addb7ca2c548d67c470b30 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 3 Jan 2013 21:27:00 +0100 Date: Thu, 3 Jan 2013 21:27:00 +0100
Subject: [PATCH 080/364] * grub-core/fs/iso9660.c Subject: [PATCH 081/482] * grub-core/fs/iso9660.c
(grub_iso9660_susp_iterate): Avoid hang if entry->len = 0. (grub_iso9660_susp_iterate): Avoid hang if entry->len = 0.
--- ---
@ -36,5 +36,5 @@ index cd4acc8..547e156 100644
((char *) entry + entry->len)) ((char *) entry + entry->len))
{ {
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 242ce139276b9de1e5f960070e433111a3ab5194 Mon Sep 17 00:00:00 2001 From 496d8726590f4ad432d40ed8e3aad7e92bb3147c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 3 Jan 2013 21:34:34 +0100 Date: Thu, 3 Jan 2013 21:34:34 +0100
Subject: [PATCH 081/364] * configure.ac: Extend -Wno-trampolines to Subject: [PATCH 082/482] * configure.ac: Extend -Wno-trampolines to
host. host.
--- ---
@ -52,5 +52,5 @@ index a41f117..dde954e 100644
# Check for host and build compilers. # Check for host and build compilers.
# #
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 98701532f45165422f45b8cdf405a7f0abf03fba Mon Sep 17 00:00:00 2001 From ce13f1ebba58c7d78dea2b63843eb77818baf566 Mon Sep 17 00:00:00 2001
From: Yuta Satoh <nigoro> From: Yuta Satoh <nigoro>
Date: Thu, 3 Jan 2013 23:06:07 +0100 Date: Thu, 3 Jan 2013 23:06:07 +0100
Subject: [PATCH 082/364] * util/grub.d/10_kfreebsd.in: Fix improper Subject: [PATCH 083/482] * util/grub.d/10_kfreebsd.in: Fix improper
references to grub-probe by ${grub_probe} references to grub-probe by ${grub_probe}
--- ---
@ -54,5 +54,5 @@ index 260dda8..2a48b52 100644
kfreebsd_device="${kfreebsd_device}$(${grub_mkrelpath} / | sed -e "s,/*@$,,")" kfreebsd_device="${kfreebsd_device}$(${grub_mkrelpath} / | sed -e "s,/*@$,,")"
;; ;;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 40951063e5fd8c4ae34b942039d38bfe69ffecb3 Mon Sep 17 00:00:00 2001 From aaf55113bb7174787ffe8aa6878086943238a63e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 3 Jan 2013 23:19:19 +0100 Date: Thu, 3 Jan 2013 23:19:19 +0100
Subject: [PATCH 083/364] * util/grub.d/10_kfreebsd.in: Correct the Subject: [PATCH 084/482] * util/grub.d/10_kfreebsd.in: Correct the
patch to zpool.cache as it's always in /boot/zfs. Reported by: Yuta patch to zpool.cache as it's always in /boot/zfs. Reported by: Yuta
Satoh. Satoh.
@ -42,5 +42,5 @@ index 2a48b52..c123ceb 100644
;; ;;
esac esac
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From d064a7c4f3cc8a5faba4d4bc4f4ba82677c7b1d7 Mon Sep 17 00:00:00 2001 From ba8109f7402ff763cbed5607841d438aab56e2cf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 5 Jan 2013 15:10:46 +0100 Date: Sat, 5 Jan 2013 15:10:46 +0100
Subject: [PATCH 084/364] * grub-core/disk/diskfilter.c Subject: [PATCH 085/482] * grub-core/disk/diskfilter.c
(grub_diskfilter_write): Call grub_error properly. * (grub_diskfilter_write): Call grub_error properly. *
grub-core/disk/ieee1275/nand.c (grub_nand_write): Likewise. * grub-core/disk/ieee1275/nand.c (grub_nand_write): Likewise. *
grub-core/disk/loopback.c (grub_loopback_write): Likewise. grub-core/disk/loopback.c (grub_loopback_write): Likewise.
@ -71,5 +71,5 @@ index f3b19ef..fffd1bb 100644
static struct grub_disk_dev grub_loopback_dev = static struct grub_disk_dev grub_loopback_dev =
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 3ba196532002293027a6a3e96f8eb1960c70e00c Mon Sep 17 00:00:00 2001 From 7c6640d26459b059d1f6854907351e90070e643e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 5 Jan 2013 16:53:04 +0100 Date: Sat, 5 Jan 2013 16:53:04 +0100
Subject: [PATCH 085/364] * grub-core/fs/nilfs2.c Subject: [PATCH 086/482] * grub-core/fs/nilfs2.c
(-grub_nilfs2_palloc_groups_per_desc_block): Rename to ... (-grub_nilfs2_palloc_groups_per_desc_block): Rename to ...
(grub_nilfs2_palloc_log_groups_per_desc_block): ... this. Return log of (grub_nilfs2_palloc_log_groups_per_desc_block): ... this. Return log of
groups_per_block. All users updated. groups_per_block. All users updated.
@ -89,5 +89,5 @@ index f36c513..5b34486 100644
return grub_nilfs2_palloc_desc_block_offset_log (data, group, log_entry_size) return grub_nilfs2_palloc_desc_block_offset_log (data, group, log_entry_size)
+ 1 + 1
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From aa380d4323bcc4dae0f8bafdd074466f8bc5bcf5 Mon Sep 17 00:00:00 2001 From e92606660e0fa6a9cf85eaf62677187965094506 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 5 Jan 2013 17:36:04 +0100 Date: Sat, 5 Jan 2013 17:36:04 +0100
Subject: [PATCH 086/364] * grub-core/fs/ntfs.c: Eliminate useless Subject: [PATCH 087/482] * grub-core/fs/ntfs.c: Eliminate useless
divisions in favor of shifts. * grub-core/fs/ntfscomp.c: Likewise. * divisions in favor of shifts. * grub-core/fs/ntfscomp.c: Likewise. *
include/grub/ntfs.h (grub_ntfs_data): Replace spc with log_spc. include/grub/ntfs.h (grub_ntfs_data): Replace spc with log_spc.
(grub_ntfs_comp): Likewise. (grub_ntfs_comp): Likewise.
@ -326,5 +326,5 @@ index 0935342..cc28a01 100644
}; };
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From af8a6a082c9ac9fab22f3eff9e81b5e7085debc4 Mon Sep 17 00:00:00 2001 From 40eeced3fb25780be27799b2a72a2264ef64163b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 5 Jan 2013 18:37:34 +0100 Date: Sat, 5 Jan 2013 18:37:34 +0100
Subject: [PATCH 087/364] * grub-core/fs/ext2.c (grub_ext2_read_block): Subject: [PATCH 088/482] * grub-core/fs/ext2.c (grub_ext2_read_block):
Use shifts rather than divisions. Use shifts rather than divisions.
--- ---
@ -99,5 +99,5 @@ index bd1ab24..cf2e2f4 100644
else else
{ {
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 8c3fd8eea724a1490d29937b1d23cde259bf63cb Mon Sep 17 00:00:00 2001 From 55a1c78a484d48c96291f0f2891745d8b60c2201 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 7 Jan 2013 11:27:18 +0100 Date: Mon, 7 Jan 2013 11:27:18 +0100
Subject: [PATCH 088/364] * grub-core/fs/minix.c (grub_minix_read_file): Subject: [PATCH 089/482] * grub-core/fs/minix.c (grub_minix_read_file):
Simplify arithmetics. Simplify arithmetics.
--- ---
@ -43,5 +43,5 @@ index 1e1c13b..a622533 100644
/ (data->block_size << GRUB_DISK_SECTOR_BITS)); / (data->block_size << GRUB_DISK_SECTOR_BITS));
blockoff = (((grub_uint32_t) pos) blockoff = (((grub_uint32_t) pos)
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 05f5634a5c5a66d535962a96635a9c153cf67e8f Mon Sep 17 00:00:00 2001 From 53580ba03c453b315d716fdf6539c4150d0089c3 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jan 2013 10:43:00 +0000 Date: Mon, 7 Jan 2013 10:43:00 +0000
Subject: [PATCH 089/364] * docs/grub.texi (grub_cpu): New subsection. Subject: [PATCH 090/482] * docs/grub.texi (grub_cpu): New subsection.
(grub_platform): Likewise. (grub_platform): Likewise.
--- ---
@ -57,5 +57,5 @@ index e23cecc..a92bd96 100644
@subsection icondir @subsection icondir
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From c86f86069fd8d600ebc4ffbd8a786c58fccff886 Mon Sep 17 00:00:00 2001 From 00e72549c724d80285041e5dac8adc310dd2c746 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jan 2013 10:45:05 +0000 Date: Mon, 7 Jan 2013 10:45:05 +0000
Subject: [PATCH 090/364] * grub-core/io/bufio.c (grub_bufio_open): Use Subject: [PATCH 091/482] * grub-core/io/bufio.c (grub_bufio_open): Use
grub_zalloc instead of explicitly zeroing elements. * grub-core/io/gzio.c grub_zalloc instead of explicitly zeroing elements. * grub-core/io/gzio.c
(grub_gzio_open): Likewise. * grub-core/io/lzopio.c (grub_lzopio_open): (grub_gzio_open): Likewise. * grub-core/io/lzopio.c (grub_lzopio_open):
Remove explicit zeroing of elements in a structure already allocated using Remove explicit zeroing of elements in a structure already allocated using
@ -137,5 +137,5 @@ index ae30e6f..27657d8 100644
/* FIXME: don't test footer on not easily seekable files. */ /* FIXME: don't test footer on not easily seekable files. */
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 1ed52ffd389d28a8c1711fedcd9a841258c30e28 Mon Sep 17 00:00:00 2001 From 2aa6a4fce53d2a43cc00fde2362eb39d1fdb9f4d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 10 Jan 2013 08:09:26 +0100 Date: Thu, 10 Jan 2013 08:09:26 +0100
Subject: [PATCH 091/364] * grub-core/kern/disk.c (grub_disk_write): Fix Subject: [PATCH 092/482] * grub-core/kern/disk.c (grub_disk_write): Fix
sector number on 4K sector devices. sector number on 4K sector devices.
--- ---
@ -55,5 +55,5 @@ index 1f55f90..94318af 100644
buf = (const char *) buf + len; buf = (const char *) buf + len;
size -= len; size -= len;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 474f5d13721ed87fde38bdad282164ee84c1be0a Mon Sep 17 00:00:00 2001 From 9b1eeacef1a590c4bb1cd99f24b7038e77c3de33 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 10 Jan 2013 12:50:01 +0100 Date: Thu, 10 Jan 2013 12:50:01 +0100
Subject: [PATCH 092/364] Support Apple FAT binaries on non-Apple Subject: [PATCH 093/482] Support Apple FAT binaries on non-Apple
platforms. platforms.
* include/grub/macho.h (GRUB_MACHO_FAT_EFI_MAGIC): New define. * include/grub/macho.h (GRUB_MACHO_FAT_EFI_MAGIC): New define.
@ -146,5 +146,5 @@ index 6a98b6e..21f0714 100644
typedef grub_uint32_t grub_macho_cpu_type_t; typedef grub_uint32_t grub_macho_cpu_type_t;
typedef grub_uint32_t grub_macho_cpu_subtype_t; typedef grub_uint32_t grub_macho_cpu_subtype_t;
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 75bd81540fab6830213d51e024b53d51f3fe6dcb Mon Sep 17 00:00:00 2001 From 6ec699808b2c156f52ec3867b2cc20c8a66116d3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 11 Jan 2013 07:41:05 +0100 Date: Fri, 11 Jan 2013 07:41:05 +0100
Subject: [PATCH 093/364] * grub-core/fs/ntfs.c: Ue more appropriate Subject: [PATCH 094/482] * grub-core/fs/ntfs.c: Ue more appropriate
types. * grub-core/fs/ntfscomp.c: Likewise. * include/grub/ntfs.h: types. * grub-core/fs/ntfscomp.c: Likewise. * include/grub/ntfs.h:
Likewise. Likewise.
@ -624,5 +624,5 @@ index cc28a01..37983c4 100644
grub_size_t len, grub_size_t len,
struct grub_ntfs_rlst * ctx, struct grub_ntfs_rlst * ctx,
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 5d27e1e9a4819f8f791a43c968ad49f11615d67a Mon Sep 17 00:00:00 2001 From e64d71f2706db5a3a99c174a3ee7bf3885fb6e35 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 11 Jan 2013 21:32:42 +0100 Date: Fri, 11 Jan 2013 21:32:42 +0100
Subject: [PATCH 094/364] Import gcrypt public-key cryptography and Subject: [PATCH 095/482] Import gcrypt public-key cryptography and
implement signature checking. implement signature checking.
--- ---
@ -44056,5 +44056,5 @@ index 0000000..1cf31bd
+p +p
\ No newline at end of file \ No newline at end of file
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From d803dd359dd431cad08e95952f90c3f4f5acc9b7 Mon Sep 17 00:00:00 2001 From d1a9a3ec88483b5f1aa1e4a6c8bc38d47efa73af Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com> From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 12 Jan 2013 13:30:37 +0000 Date: Sat, 12 Jan 2013 13:30:37 +0000
Subject: [PATCH 095/364] Clean up dangling references to grub-setup. Fixes Subject: [PATCH 096/482] Clean up dangling references to grub-setup. Fixes
Ubuntu bug #1082045. Ubuntu bug #1082045.
* docs/grub.texi (Images): Refer generally to grub-install rather * docs/grub.texi (Images): Refer generally to grub-install rather
@ -220,5 +220,5 @@ index 218bbd9..aac27c7 100644
gettext "Report bugs to <bug-grub@gnu.org>."; echo gettext "Report bugs to <bug-grub@gnu.org>."; echo
} }
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From dc00947d8ca3b793b23cf0c3c3c3af24ae57e043 Mon Sep 17 00:00:00 2001 From babdc8b1ff0e83bb9c03fa7b28240adbdd8bba34 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 12 Jan 2013 16:14:09 +0100 Date: Sat, 12 Jan 2013 16:14:09 +0100
Subject: [PATCH 096/364] * autogen.sh: Do not try to delete nonexistant Subject: [PATCH 097/482] * autogen.sh: Do not try to delete nonexistant
files. * util/import_gcrypth.sed: Add some missing header removals. files. * util/import_gcrypth.sed: Add some missing header removals.
--- ---
@ -72,5 +72,5 @@ index 1cf31bd..dead8e6 100644
p p
\ No newline at end of file \ No newline at end of file
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 1a2fd466e880636d53969b1c614d223ed94cf35b Mon Sep 17 00:00:00 2001 From 4f807b753f72016b58e78342cf218ac14ff5204a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 12 Jan 2013 16:17:31 +0100 Date: Sat, 12 Jan 2013 16:17:31 +0100
Subject: [PATCH 097/364] Remove autogenerated files from VCS Subject: [PATCH 098/482] Remove autogenerated files from VCS
--- ---
.bzrignore | 2 + .bzrignore | 2 +
@ -9,6 +9,16 @@ Subject: [PATCH 097/364] Remove autogenerated files from VCS
2 files changed, 2 insertions(+), 1333 deletions(-) 2 files changed, 2 insertions(+), 1333 deletions(-)
delete mode 100644 include/grub/gcrypt/gcrypt.h delete mode 100644 include/grub/gcrypt/gcrypt.h
diff --git a/.bzrignore b/.bzrignore
index e05e5d9..c6797ad 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -172,3 +172,5 @@ Makefile.utilgcry.def
po/*.po
po/*.gmo
po/LINGUAS
+include/grub/gcrypt/gcrypt.h
+include/grub/gcrypt/g10lib.h
diff --git a/include/grub/gcrypt/gcrypt.h b/include/grub/gcrypt/gcrypt.h diff --git a/include/grub/gcrypt/gcrypt.h b/include/grub/gcrypt/gcrypt.h
deleted file mode 100644 deleted file mode 100644
index fc83571..0000000 index fc83571..0000000
@ -1349,5 +1359,5 @@ index fc83571..0000000
-@emacs_local_vars_end@ -@emacs_local_vars_end@
-*/ -*/
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From a718c4254f78dd96e9fa1c1e704ba337f8e009e0 Mon Sep 17 00:00:00 2001 From 9042354c7f7656b6d21cc99241dc637e702e1962 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 12 Jan 2013 16:21:06 +0100 Date: Sat, 12 Jan 2013 16:21:06 +0100
Subject: [PATCH 098/364] * grub-core/lib/libgcrypt_wrap/mem.c Subject: [PATCH 099/482] * grub-core/lib/libgcrypt_wrap/mem.c
(_gcry_log_bug): Make gcrypt bugs fatal. (_gcry_log_bug): Make gcrypt bugs fatal.
--- ---
@ -37,5 +37,5 @@ index a9f0aff..64e8b62 100644
gcry_err_code_t gcry_err_code_t
-- --
1.8.1.4 1.8.2.1

View File

@ -1,7 +1,7 @@
From 076ad04668ff689b023166931edca6fa03530bf9 Mon Sep 17 00:00:00 2001 From 4cdf790013d4c087da018961e5081562df307bbf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 12 Jan 2013 16:27:37 +0100 Date: Sat, 12 Jan 2013 16:27:37 +0100
Subject: [PATCH 099/364] * grub-core/lib/libgcrypt_wrap/mem.c Subject: [PATCH 100/482] * grub-core/lib/libgcrypt_wrap/mem.c
(gcry_x*alloc): Make out of memory fatal. (gcry_x*alloc): Make out of memory fatal.
--- ---
@ -86,5 +86,5 @@ index 64e8b62..94f9d65 100644
void void
-- --
1.8.1.4 1.8.2.1

Some files were not shown because too many files have changed in this diff Show More