rpms
/
grub2
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reconcile even harder, so that it actually works. 

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2015-07-22 10:14:34 -04:00
parent 8c6b1ac71e
commit f4c76c02ae
515 changed files with 23366 additions and 34112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0432-Migrate-PPC-from-Yaboot-to-Grub2.patch → 0001-Migrate-PPC-from-Yaboot-to-Grub2.patch
View File

@ -1,7 +1,7 @@
From 08a6cb996791748ae3f628ca81ea126b98befc0d Mon Sep 17 00:00:00 2001
From 430eb790de723e12dab382bebb1bf7c4636f518c Mon Sep 17 00:00:00 2001
From: Mark Hamzy <hamzy@us.ibm.com>
Date: Wed, 28 Mar 2012 14:46:41 -0500
Subject: [PATCH 432/506] Migrate PPC from Yaboot to Grub2
Subject: [PATCH 01/74] Migrate PPC from Yaboot to Grub2
Add configuration support for serial terminal consoles. This will set the
maximum screen size so that text is not overwritten.

43
0001-fix-EFI-detection-on-Windows.patch
View File

@ -1,43 +0,0 @@
From a6e7719bbe05993613a8de69dba14fa092144925 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Wed, 25 Dec 2013 22:36:28 +0400
Subject: [PATCH 001/506] fix EFI detection on Windows
We are on legacy BIOS if GetFirmwareEnvironmentVariable fails (returns
zero) *and* extended error information is ERROR_INVALID_FUNCTION.
Cf. http://msdn.microsoft.com/en-us/library/windows/desktop/ms724325%28v=vs.85%29.aspx
---
ChangeLog | 5 +++++
grub-core/osdep/windows/platform.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 41bcebf..21ec1c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-25 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * grub-core/osdep/windows/platform.c (get_platform): Fix EFI
+ detection.
+
2013-12-24 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Set version to 2.02~beta2.
diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
index f2b9d71..d217efe 100644
--- a/grub-core/osdep/windows/platform.c
+++ b/grub-core/osdep/windows/platform.c
@@ -100,7 +100,7 @@ get_platform (void)
if (!func_GetFirmwareEnvironmentVariableW (L"BootOrder", GRUB_EFI_GLOBAL_VARIABLE_GUID_WINDOWS_STR,
buffer, sizeof (buffer))
- && GetLastError () != ERROR_INVALID_FUNCTION)
+ && GetLastError () == ERROR_INVALID_FUNCTION)
{
platform = PLAT_BIOS;
return;
--
2.4.3

4
0433-Add-fw_path-variable-revised.patch → 0002-Add-fw_path-variable-revised.patch
View File

@ -1,7 +1,7 @@
From dd00df22ba2bc9b9e388c65f98d208330020fc24 Mon Sep 17 00:00:00 2001
From 77809768ce9f984cd2359cb605456314721aca95 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Wed, 19 Sep 2012 21:22:55 -0300
Subject: [PATCH 433/506] Add fw_path variable (revised)
Subject: [PATCH 02/74] Add fw_path variable (revised)
This patch makes grub look for its config file on efi where the app was
found. It was originally written by Matthew Garrett, and adapted to fix the

43
0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch
View File

@ -1,43 +0,0 @@
From 5bda44d7f98c36f87144869ec58b518f80a69b56 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Wed, 25 Dec 2013 23:31:42 +0100
Subject: [PATCH 002/506] * grub-core/kern/arm/cache_armv6.S: Remove
.arch directive.
As these functions are used on pre-ARMv6 CPUs as well we don't want
to make assembler assume that architecture is higher than default one.
---
ChangeLog | 7 +++++++
grub-core/kern/arm/cache_armv6.S | 1 -
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 21ec1c7..153bc43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-25 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
+
+ As these functions are used on pre-ARMv6 CPUs as well we don't want
+ to make assembler assume that architecture is higher than default one.
+
2013-12-25 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/osdep/windows/platform.c (get_platform): Fix EFI
diff --git a/grub-core/kern/arm/cache_armv6.S b/grub-core/kern/arm/cache_armv6.S
index 39da1df..dfaded0 100644
--- a/grub-core/kern/arm/cache_armv6.S
+++ b/grub-core/kern/arm/cache_armv6.S
@@ -22,7 +22,6 @@
.text
.syntax unified
.arm
- .arch armv6
# define DMB mcr p15, 0, r0, c7, c10, 5
# define DSB mcr p15, 0, r0, c7, c10, 4
--
2.4.3

4
0434-Add-support-for-linuxefi.patch → 0003-Add-support-for-linuxefi.patch
View File

@ -1,7 +1,7 @@
From 5b84fbd00374f561f82277b7d22fd8a4877667e6 Mon Sep 17 00:00:00 2001
From b1ce9da47f7d73a793f8e41ad4575d09e4ef9e9b Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com>
Date: Tue, 10 Jul 2012 11:58:52 -0400
Subject: [PATCH 434/506] Add support for linuxefi
Subject: [PATCH 03/74] Add support for linuxefi
---
grub-core/Makefile.core.def | 8 +

88
0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch
View File

@ -1,88 +0,0 @@
From 51f941a0d871fe9af20d57574272e62d52b3375c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 27 Dec 2013 03:03:32 +0000
Subject: [PATCH 003/506] * INSTALL (Cross-compiling the GRUB): Fix some
spelling mistakes. * docs/grub.texi (Getting the source code): Likewise.
---
ChangeLog | 5 +++++
INSTALL | 10 +++++-----
docs/grub-dev.texi | 8 ++++----
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 21ec1c7..e61d48b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-27 Colin Watson <cjwatson@ubuntu.com>
+
+ * INSTALL (Cross-compiling the GRUB): Fix some spelling mistakes.
+ * docs/grub.texi (Getting the source code): Likewise.
+
2013-12-25 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/osdep/windows/platform.c (get_platform): Fix EFI
diff --git a/INSTALL b/INSTALL
index afc957c..db12530 100644
--- a/INSTALL
+++ b/INSTALL
@@ -140,7 +140,7 @@ If build and host are different make check isn't available.
If build and host are different man pages are not generated.
As an example imagine you have a build system running on FreeBSD on sparc
-which prepares packages for developpers running amd64 GNU/Linux laptop and
+which prepares packages for developers running amd64 GNU/Linux laptop and
they need to make images for ARM board running U-boot. In this case:
build=sparc64-freebsd
@@ -149,7 +149,7 @@ target=arm-uboot
For this example the configure line might look like (more details below)
(some options are optional and included here for completeness but some rarely
-used options are omited):
+used options are omitted):
./configure BUILD_CC=gcc BUILD_FREETYPE=freetype-config --host=amd64-linux-gnu
CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" FREETYPE=amd64-linux-gnu-freetype-config
@@ -196,9 +196,9 @@ corresponding platform are not needed for the platform in question.
11. TARGET_RANLIB= for ranlib for target.
- Additionally for emu, for host and target.
- 1. SDL is looked for in stadard linker directories (-lSDL) (optional)
- 2. libpciaccess is looked for in stadard linker directories (-lpciaccess) (optional)
- 3. libusb is looked for in stadard linker directories (-lusb) (optional)
+ 1. SDL is looked for in standard linker directories (-lSDL) (optional)
+ 2. libpciaccess is looked for in standard linker directories (-lpciaccess) (optional)
+ 3. libusb is looked for in standard linker directories (-lusb) (optional)
- Platform-agnostic tools and data.
1. make is the tool you execute after ./configure.
diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
index c796850..7c6244c 100644
--- a/docs/grub-dev.texi
+++ b/docs/grub-dev.texi
@@ -108,16 +108,16 @@ The branches available are:
@table @samp
@item master
- Main developpement branch.
+ Main development branch.
@item grub-legacy
GRUB 0.97 codebase. Kept for reference and legal reasons
@item multiboot
Multiboot specfication
@item multiboot2
Multiboot2 specfication
-@item developper branches
- Prefixed with developper name. Every developper of a team manages his own branches.
- Developper branches do not need changelog entries.
+@item developer branches
+ Prefixed with developer name. Every developer of a team manages his own branches.
+ Developer branches do not need changelog entries.
@end table
Once you have used @kbd{git clone} to fetch an initial copy of a branch, you
--
2.4.3

154
0004-NEWS-First-draft-of-2.02-entry.patch
View File

@ -1,154 +0,0 @@
From 30a338460ad97c190502a1067979dac2fc548f16 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 27 Dec 2013 03:05:38 +0000
Subject: [PATCH 004/506] * NEWS: First draft of 2.02 entry.
---
ChangeLog | 4 +++
NEWS | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 123 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index e61d48b..53f0481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-12-27 Colin Watson <cjwatson@ubuntu.com>
+ * NEWS: First draft of 2.02 entry.
+
+2013-12-27 Colin Watson <cjwatson@ubuntu.com>
+
* INSTALL (Cross-compiling the GRUB): Fix some spelling mistakes.
* docs/grub.texi (Getting the source code): Likewise.
diff --git a/NEWS b/NEWS
index 4bb5f98..577d9fd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,122 @@
+New in 2.02:
+
+* New/improved filesystem and disk support:
+ * Big-endian UFS1.
+ * Experimental 64-bit ext2 support.
+ * Various fixes for non-512-byte sector devices.
+ * New `proc' filesystem framework, used by LUKS disks.
+ * Fix DM-RAID partition handling.
+ * New `nativedisk' command to switch from firmware to native disk drivers.
+ * Compressed HFS+.
+ * DragonFly BSD labels.
+ * CBFS (coreboot).
+ * Handle partitioned LVM properly.
+ * Use LVM UUIDs whenever possible.
+ * GPT PReP.
+ * New `progress' module that shows progress information while reading
+ files.
+
+* New/improved terminal and video support:
+ * Monochrome text (matching `hercules' in GRUB Legacy).
+ * Morse code output using system speaker.
+ * `spkmodem' output (simple data protocol using system speaker).
+ * Handle Japanese special keys.
+ * coreboot framebuffer.
+ * Serial on ARC.
+ * Native vt100 handling for grub-emu, replacing the use of the curses
+ library.
+ * New gfxmenu options for terminal window positioning, theme background
+ image handling, and scrollbar padding, plus `item_pixmap_style' and
+ `highlight_overlay'.
+ * Support several more image types (paletted and greyscale).
+
+* Boot protocol improvements:
+ * Support Apple FAT binaries on non-Apple platforms.
+ * Improve FreeDOS direct loading support compatibility.
+ * Enable `linux16' on all x86 platforms, not just BIOS.
+ * New TrueCrypt ISO loader.
+
+* New/improved network support:
+ * New variables `net_default_*' containing properties of the default
+ interface.
+ * Autoload `http' and `tftp' modules if necessary.
+ * Improve TFTP robustness.
+ * Parse `nd' disk names in GRUB Legacy configuration files.
+ * Issue separate DNS queries for IPv4 and IPv6.
+
+* New/improved platform support:
+ * New `efifwsetup' and `lsefi' commands on EFI platforms.
+ * New `cmosclean', `cmosdump', and `cmosset' commands on platforms with
+ CMOS support.
+ * New `cbmemc', `coreboot_boottime', and `lscoreboot' commands on
+ coreboot.
+ * Improve opcode parsing in ACPI halt implementation.
+ * Use the TSC as a possible time source on i386-ieee1275.
+ * Merge PowerPC grub-mkrescue implementation with the common one.
+ * Support grub-mkrescue on i386-ieee1275, sparc64, bootinfo machines such
+ as pSeries, and mips-arc.
+ * Make grub-mkrescue better support Apple Intel Macs on CD.
+ * Enable GRUB Legacy configuration file parsing on EFI.
+ * Support halt for Loongson 2E.
+ * ARM U-Boot and EFI ports.
+ * Reorganise platform-dependent code in utilities to avoid #ifdef mess.
+ * AROS and Haiku support for userspace utilities.
+ * Xen PV port.
+ * Fix EFI stack alignment.
+ * ARM64 EFI port.
+ * On Linux, read partition start offsets from sysfs if possible.
+ * New grub-macbless utility, and better integration with Mac firmware in
+ grub-install.
+ * Support Yeeloong 3A.
+ * Add `cpuid --pae' option to detect Physical Address Extension on x86.
+
+* Security:
+ * Add optional facility to enforce that all files read by the core image
+ from disk have a valid detached digital signature.
+
+* Performance:
+ * Avoid costly division operations in many places.
+ * New boot time analysis framework (`./configure --enable-boot-time').
+ * Initialise USB ports in parallel.
+ * New `testspeed' command to test file read speed.
+
+* Scripting:
+ * New `eval' and `tr' commands.
+ * grub-script-check fails on scripts containing no commands.
+
+* Installation and other utility improvements:
+ * Add option to compress files on installation or image creation.
+ * Using grub-reboot no longer requires setting `GRUB_DEFAULT=saved'.
+ * Support probing EFI System Partition (requires os-prober >= 1.58).
+ * Fix inconsistent use of `GRUB_CRYPTODISK_ENABLE' and
+ `GRUB_ENABLE_CRYPTODISK'; the latter is now used consistently.
+ * grub-mount handles symbolic links to directories.
+ * Support disabling submenus with `GRUB_DISABLE_SUBMENU' configuration key
+ for grub-mkconfig.
+ * grub-install, grub-mknetdir, grub-mkrescue, and grub-mkstandalone
+ rewritten in C. They should now work in supported non-Unix-like
+ environments.
+ * Reorganise timeout handling using new `timeout_style' environment
+ variable and `GRUB_TIMEOUT_STYLE' configuration key for grub-mkconfig.
+ Menu hotkeys pressed during a hidden timeout now boot the corresponding
+ menu entry immediately.
+ * New `file' command and grub-file utility to check file types.
+ * New syslinux configuration file parser.
+
+* Build system:
+ * Remove all uses of nested functions; GRUB no longer requires an
+ executable stack.
+ * Fix documentation build with Texinfo >= 5.1.
+ * More robust and documented cross-compiling support.
+ * Partial clang support for some platforms.
+ * Eliminate the use of AutoGen. This allowed some performance
+ improvements to the build system.
+ * Fix build with FreeType >= 2.5.1.
+ * Make gentpl.py compatible with Python 3. It now requires at least
+ Python 2.6.
+
+* Revision control moved to git.
+
New in 2.00:
* Appearance:
--
2.4.3

4
0435-Use-linuxefi-and-initrdefi-where-appropriate.patch → 0004-Use-linuxefi-and-initrdefi-where-appropriate.patch
View File

@ -1,7 +1,7 @@
From 93b844d65dde67bf4dd668149bdcccab92514671 Mon Sep 17 00:00:00 2001
From 98857c979c99a85c6bb9ff758c1d17b522d150ae Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 16 Jul 2012 18:57:11 -0400
Subject: [PATCH 435/506] Use "linuxefi" and "initrdefi" where appropriate.
Subject: [PATCH 04/74] Use "linuxefi" and "initrdefi" where appropriate.
---
util/grub.d/10_linux.in | 18 ++++++++++++++++--

4
0436-Don-t-allow-insmod-when-secure-boot-is-enabled.patch → 0005-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
View File

@ -1,7 +1,7 @@
From 6ca0c8870102ed6465fd2c66fd8f6d3fae76a99e Mon Sep 17 00:00:00 2001
From c76d0d67323efe33ec2e3f44f08047545550d721 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 23 Oct 2012 10:40:49 -0400
Subject: [PATCH 436/506] Don't allow insmod when secure boot is enabled.
Subject: [PATCH 05/74] Don't allow insmod when secure boot is enabled.
Hi,

41
0005-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch
View File

@ -1,41 +0,0 @@
From 8442d3e956fa3775419b0b3ce65f4289875e7ecf Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 28 Dec 2013 02:20:27 +0000
Subject: [PATCH 005/506] * NEWS: The cmosclean command in fact dates back to
1.99. Remove mention of it from 2.02.
---
ChangeLog | 5 +++++
NEWS | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index da3c2df..c33856e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-28 Colin Watson <cjwatson@ubuntu.com>
+
+ * NEWS: The cmosclean command in fact dates back to 1.99. Remove
+ mention of it from 2.02.
+
2013-12-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/arm/cache_armv6.S: Remove .arch directive.
diff --git a/NEWS b/NEWS
index 577d9fd..b74c05f 100644
--- a/NEWS
+++ b/NEWS
@@ -46,8 +46,7 @@ New in 2.02:
* New/improved platform support:
* New `efifwsetup' and `lsefi' commands on EFI platforms.
- * New `cmosclean', `cmosdump', and `cmosset' commands on platforms with
- CMOS support.
+ * New `cmosdump' and `cmosset' commands on platforms with CMOS support.
* New `cbmemc', `coreboot_boottime', and `lscoreboot' commands on
coreboot.
* Improve opcode parsing in ACPI halt implementation.
--
2.4.3

4
0437-Pass-x-hex-hex-straight-through-unmolested.patch → 0006-Pass-x-hex-hex-straight-through-unmolested.patch
View File

@ -1,7 +1,7 @@
From e2df8fe29842472f8d49dfbfd39fca1b9c809eee Mon Sep 17 00:00:00 2001
From 468d8909c5c86fec5e676df7ca1223a370bab703 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 1 Oct 2012 13:24:37 -0400
Subject: [PATCH 437/506] Pass "\x[[:hex:]][[:hex:]]" straight through
Subject: [PATCH 06/74] Pass "\x[[:hex:]][[:hex:]]" straight through
unmolested.
---

39
0006-remove-unused-error.h-from-kern-emu-misc.c.patch
View File

@ -1,39 +0,0 @@
From 989af025829b20a19f4d3ee01e86f4ee9de7cf1e Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 28 Dec 2013 09:01:20 +0400
Subject: [PATCH 006/506] remove unused error.h from kern/emu/misc.c
Fixes compilation on mingw32, where include is apparently missing.
---
ChangeLog | 5 +++++
grub-core/kern/emu/misc.c | 1 -
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index c33856e..0401f61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-28 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * grub-core/kern/emu/misc.c: Remove unused error.h; fixes compilation
+ on mingw.
+
2013-12-28 Colin Watson <cjwatson@ubuntu.com>
* NEWS: The cmosclean command in fact dates back to 1.99. Remove
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index 43471b4..bb606da 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -20,7 +20,6 @@
#include <config.h>
#include <errno.h>
-#include <error.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
--
2.4.3

70
0007-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch
View File

@ -1,70 +0,0 @@
From 093dec7370650ecfa9b770210e21b8d6b03f1df3 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Dec 2013 17:25:14 +0100
Subject: [PATCH 007/506] Don't abort() on unavailable coreboot tables
if not running on coreboot.
---
ChangeLog | 4 ++++
grub-core/kern/i386/coreboot/cbtable.c | 2 +-
grub-core/kern/i386/coreboot/init.c | 5 +++++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 0401f61..ed6d77c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-28 Vladimir Serbinenko <phcoder@gmail.com>
+
+ Don't abort() on unavailable coreboot tables if not running on coreboot.
+
2013-12-28 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/kern/emu/misc.c: Remove unused error.h; fixes compilation
diff --git a/grub-core/kern/i386/coreboot/cbtable.c b/grub-core/kern/i386/coreboot/cbtable.c
index e3bb7b2..1669bc0 100644
--- a/grub-core/kern/i386/coreboot/cbtable.c
+++ b/grub-core/kern/i386/coreboot/cbtable.c
@@ -55,7 +55,7 @@ grub_linuxbios_table_iterate (int (*hook) (grub_linuxbios_table_item_t,
if (check_signature (table_header))
goto signature_found;
- grub_fatal ("Could not find coreboot table\n");
+ return 0;
signature_found:
diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
index 6b150b4..3314f02 100644
--- a/grub-core/kern/i386/coreboot/init.c
+++ b/grub-core/kern/i386/coreboot/init.c
@@ -51,6 +51,7 @@ grub_exit (void)
grub_addr_t grub_modbase = GRUB_KERNEL_I386_COREBOOT_MODULES_ADDR;
static grub_uint64_t modend;
+static int have_memory = 0;
/* Helper for grub_machine_init. */
static int
@@ -82,6 +83,8 @@ heap_init (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
grub_mm_init_region ((void *) (grub_addr_t) begin, (grub_size_t) (end - begin));
+ have_memory = 1;
+
return 0;
}
@@ -97,6 +100,8 @@ grub_machine_init (void)
grub_vga_text_init ();
grub_machine_mmap_iterate (heap_init, NULL);
+ if (!have_memory)
+ grub_fatal ("No memory found");
grub_video_coreboot_fb_late_init ();
--
2.4.3

4
0438-Fix-crash-on-http.patch → 0007-Fix-crash-on-http.patch
View File

@ -1,7 +1,7 @@
From cf9eb6291b60f27c247c2586b1ee57498de72607 Mon Sep 17 00:00:00 2001
From 59371cdd4588470ced7b8fbf71ecda648c52b989 Mon Sep 17 00:00:00 2001
From: Gustavo Luiz Duarte <gustavold@linux.vnet.ibm.com>
Date: Tue, 25 Sep 2012 18:40:55 -0400
Subject: [PATCH 438/506] Fix crash on http
Subject: [PATCH 07/74] Fix crash on http
Don't free file->data on receiving FIN flag since it is used all over without
checking. http_close() will be called later to free that memory.

4
0439-IBM-client-architecture-CAS-reboot-support.patch → 0008-IBM-client-architecture-CAS-reboot-support.patch
View File

@ -1,7 +1,7 @@
From 3d35130015653257ae8e65bb85d63180195a34e7 Mon Sep 17 00:00:00 2001
From 13ca7774359074df68cd1042889e44d99f85a695 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Thu, 20 Sep 2012 18:07:39 -0300
Subject: [PATCH 439/506] IBM client architecture (CAS) reboot support
Subject: [PATCH 08/74] IBM client architecture (CAS) reboot support
This is an implementation of IBM client architecture (CAS) reboot for GRUB.

121
0008-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch
View File

@ -1,121 +0,0 @@
From 0e309454f6f184c3704d7b78687e314f14a07b3c Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Dec 2013 06:49:15 +0100
Subject: [PATCH 008/506] * NEWS: Add few missing entries. Correct
existing ones.
---
ChangeLog | 4 ++++
NEWS | 27 ++++++++++++++++++++++-----
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ed6d77c..db84300 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-30 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * NEWS: Add few missing entries. Correct existing ones.
+
2013-12-28 Vladimir Serbinenko <phcoder@gmail.com>
Don't abort() on unavailable coreboot tables if not running on coreboot.
diff --git a/NEWS b/NEWS
index b74c05f..49a2459 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,8 @@ New in 2.02:
* Improve FreeDOS direct loading support compatibility.
* Enable `linux16' on all x86 platforms, not just BIOS.
* New TrueCrypt ISO loader.
+ * multiboot2 boot-services EFI specification.
+ * multiboot2 full-file specfication.
* New/improved network support:
* New variables `net_default_*' containing properties of the default
@@ -44,11 +46,17 @@ New in 2.02:
* Parse `nd' disk names in GRUB Legacy configuration files.
* Issue separate DNS queries for IPv4 and IPv6.
+* Coreboot improvements:
+ * CBFS support both in on-disk images (loopback) and flash.
+ * Ability to launch another payload from flash or disk
+ * Coreboot framebuffer
+ * CBMEMC support (both logging and inspecting logs)
+ * Inspecting coreboot timestamps.
+ * Inspecting coreboot tables.
+
* New/improved platform support:
* New `efifwsetup' and `lsefi' commands on EFI platforms.
* New `cmosdump' and `cmosset' commands on platforms with CMOS support.
- * New `cbmemc', `coreboot_boottime', and `lscoreboot' commands on
- coreboot.
* Improve opcode parsing in ACPI halt implementation.
* Use the TSC as a possible time source on i386-ieee1275.
* Merge PowerPC grub-mkrescue implementation with the common one.
@@ -68,6 +76,7 @@ New in 2.02:
grub-install.
* Support Yeeloong 3A.
* Add `cpuid --pae' option to detect Physical Address Extension on x86.
+ * Support for USB debug dongles.
* Security:
* Add optional facility to enforce that all files read by the core image
@@ -78,6 +87,7 @@ New in 2.02:
* New boot time analysis framework (`./configure --enable-boot-time').
* Initialise USB ports in parallel.
* New `testspeed' command to test file read speed.
+ * Speed-up gfxterm by storing intermediate results in more compact format.
* Scripting:
* New `eval' and `tr' commands.
@@ -95,6 +105,7 @@ New in 2.02:
* grub-install, grub-mknetdir, grub-mkrescue, and grub-mkstandalone
rewritten in C. They should now work in supported non-Unix-like
environments.
+ * Native mingw support, including ability to install on EFI under windows.
* Reorganise timeout handling using new `timeout_style' environment
variable and `GRUB_TIMEOUT_STYLE' configuration key for grub-mkconfig.
Menu hotkeys pressed during a hidden timeout now boot the corresponding
@@ -107,12 +118,19 @@ New in 2.02:
executable stack.
* Fix documentation build with Texinfo >= 5.1.
* More robust and documented cross-compiling support.
- * Partial clang support for some platforms.
+ * Partial clang support for some platforms (experimental).
+ * Partial mingw64 x86_64-efi compile support (highly experimental).
+ * Partial mingw32 i386-* (other than already present i386-pc)
+ compile support (highly experimental).
* Eliminate the use of AutoGen. This allowed some performance
improvements to the build system.
+ * Remove variable length arrays.
+ * OpenBSD compile and tools support (NetBSD and FreeBSD were already supported).
* Fix build with FreeType >= 2.5.1.
* Make gentpl.py compatible with Python 3. It now requires at least
Python 2.6.
+ * modinfo.sh contains build information now.
+ * Added many new tests to improve robustness.
* Revision control moved to git.
@@ -142,7 +160,6 @@ New in 2.00:
* IEEE1275 serial.
* EFI serial.
* Network stack for BIOS, IEEE1275, EMU and EFI, including TFTP, HTTP and DNS.
- * VBE on coreboot support.
* New filesystem, filters and disks formats:
* DVH partition map.
@@ -166,7 +183,7 @@ New in 2.00:
* multidevice, mirrored and raidz(2,3) ZFS support.
* RAID LVM (internal RAIDing) support.
* ZFS crypto support.
- * ZLE and GZIP on ZFS support.
+ * ZLE, LZ4 and GZIP on ZFS support.
* Support ZFS up to 33.
* HFS string is now treated like mac-roman and not UTF-8
* HFS mtime support.
--
2.4.3

4
0440-Add-vlan-tag-support.patch → 0009-Add-vlan-tag-support.patch
View File

@ -1,7 +1,7 @@
From eb41d0f572081eeadf04cdf22a9ef508a9dc3216 Mon Sep 17 00:00:00 2001
From b258cc2ba1f2284026b6ebcadbb972f0f0fa4de0 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 30 Oct 2012 15:19:39 -0200
Subject: [PATCH 440/506] Add vlan-tag support
Subject: [PATCH 09/74] Add vlan-tag support
This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows
multiple VLANs in a bridged network to share the same physical network link but

39
0009-strip-.eh_frame-section-from-arm64-efi-kernel.patch
View File

@ -1,39 +0,0 @@
From 668add258ff7ffcfdc2c501fe5eb32e53c69b6f4 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Mon, 30 Dec 2013 12:56:19 +0000
Subject: [PATCH 009/506] strip .eh_frame section from arm64-efi kernel
Fixes grub-mkimage error "relocation 0x105 is not implemented yet."
---
ChangeLog | 4 ++++
grub-core/Makefile.core.def | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index db84300..8c1ecec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-30 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * grub-core/Makefile.core.def: strip .eh_frame section for arm64-efi.
+
2013-12-30 Vladimir Serbinenko <phcoder@gmail.com>
* NEWS: Add few missing entries. Correct existing ones.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index c916246..42443bc 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -66,7 +66,7 @@ kernel = {
arm_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
arm64_efi_ldflags = '-Wl,-r,-d';
- arm64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';
+ arm64_efi_stripflags = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version -R .eh_frame';
i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x9000';
--
2.4.3

4
0441-Add-X-option-to-printf-functions.patch → 0010-Add-X-option-to-printf-functions.patch
View File

@ -1,7 +1,7 @@
From 29512e7fcc5500d37dff524da4a7af0c60971d65 Mon Sep 17 00:00:00 2001
From 28297386b1d3801d3a79d31e957b0fbed9eb5baa Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 27 Nov 2012 16:58:39 -0200
Subject: [PATCH 441/506] Add %X option to printf functions.
Subject: [PATCH 10/74] Add %X option to printf functions.
---
grub-core/kern/misc.c | 7 +++++--

37
0010-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch
View File

@ -1,37 +0,0 @@
From c9e839e2caaf278491f99e7d181cf20dcf5f0b75 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Tue, 7 Jan 2014 10:38:54 +0400
Subject: [PATCH 010/506] use {grub,boot}aa64.efi for boot images on AArch64
According to UEFI 2.4 specification, default boot file name on AArch64
is BOOTAA64.EFI (3.4.1.1 Removable Media Boot Behavior). Also set default
GRUB image name to grubaa64.efi to match it.
---
util/grub-install.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/grub-install.c b/util/grub-install.c
index 8cfe0ea..4608b80 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1091,7 +1091,7 @@ main (int argc, char *argv[])
efi_file = "BOOTARM.EFI";
break;
case GRUB_INSTALL_PLATFORM_ARM64_EFI:
- efi_file = "BOOTAARCH64.EFI";
+ efi_file = "BOOTAA64.EFI";
break;
default:
grub_util_error ("%s", _("You've found a bug"));
@@ -1118,7 +1118,7 @@ main (int argc, char *argv[])
efi_file = "grubarm.efi";
break;
case GRUB_INSTALL_PLATFORM_ARM64_EFI:
- efi_file = "grubarm64.efi";
+ efi_file = "grubaa64.efi";
break;
default:
efi_file = "grub.efi";
--
2.4.3

4
0442-DHCP-client-ID-and-UUID-options-added.patch → 0011-DHCP-client-ID-and-UUID-options-added.patch
View File

@ -1,7 +1,7 @@
From 0cdf813f43fff3c7dbb416e7afd3ea01fc2cb1cf Mon Sep 17 00:00:00 2001
From 8122de140b4941e6f733aa3b2789eb54284ec5b4 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 27 Nov 2012 17:18:53 -0200
Subject: [PATCH 442/506] DHCP client ID and UUID options added.
Subject: [PATCH 11/74] DHCP client ID and UUID options added.
---
grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----

45
0011-fix-32-bit-compilation-on-MinGW-w64.patch
View File

@ -1,45 +0,0 @@
From 94cee4a4c201bb506377b2c26e072eee8cb19d6f Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Tue, 7 Jan 2014 18:43:02 +0400
Subject: [PATCH 011/506] fix 32 bit compilation on MinGW-w64
Use _FILE_OFFSET_BITS macro to distinguish between native MinGW and
32 bit under MinGW-64. The latter does not require fseeko/ftello
redefinition which it already does in case of _FILE_OFFSET_BITS=64.
---
ChangeLog | 5 +++++
include/grub/osdep/hostfile_windows.h | 3 +++
2 files changed, 8 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 8c1ecec..e87f0a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-07 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * include/grub/osdep/hostfile_windows.h: Do not redefine fseeko/ftello
+ on MinGW-64 when compiling for 32 bits.
+
2013-12-30 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/Makefile.core.def: strip .eh_frame section for arm64-efi.
diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h
index 36615b2..79efcfa 100644
--- a/include/grub/osdep/hostfile_windows.h
+++ b/include/grub/osdep/hostfile_windows.h
@@ -69,8 +69,11 @@ enum grub_util_fd_open_flags_t
#if defined (__MINGW32__) && !defined (__MINGW64__)
+/* 32 bit on MinGW-64 already redefines them if _FILE_OFFSET_BITS=64 */
+#if !defined(_FILE_OFFSET_BITS)
#define fseeko fseeko64
#define ftello ftello64
+#endif
#endif
--
2.4.3

44
0012-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch
View File

@ -1,44 +0,0 @@
From e7cfa8d5e1c6d54d40731065e535889b2e8bc9a2 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Tue, 7 Jan 2014 20:34:25 +0400
Subject: [PATCH 012/506] Change grub-mkrescue to use bootaa64.efi too
Also add ChangeLog entry for previous change.
---
ChangeLog | 7 +++++++
util/grub-mkrescue.c | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index e87f0a7..0b9fa05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2014-01-07 Andrey Borzenkov <arvidjaar@gmail.com>
+ * util/grub-install.c: Use bootaa64.efi instead of bootaarch64.efi on
+ arm64 to comply with EFI specification. Also use grubaa64.efi for
+ consistency.
+ * util/grub-mkrescue.c: Change to use bootaa64.efi too.
+
+2014-01-07 Andrey Borzenkov <arvidjaar@gmail.com>
+
* include/grub/osdep/hostfile_windows.h: Do not redefine fseeko/ftello
on MinGW-64 when compiling for 32 bits.
diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
index 317879d..0d03e55 100644
--- a/util/grub-mkrescue.c
+++ b/util/grub-mkrescue.c
@@ -663,7 +663,7 @@ main (int argc, char *argv[])
make_image_fwdisk_abs (GRUB_INSTALL_PLATFORM_ARM_EFI, "arm-efi", imgname);
free (imgname);
- imgname = grub_util_path_concat (2, efidir_efi_boot, "bootaarch64.efi");
+ imgname = grub_util_path_concat (2, efidir_efi_boot, "bootaa64.efi");
make_image_fwdisk_abs (GRUB_INSTALL_PLATFORM_ARM64_EFI, "arm64-efi",
imgname);
free (imgname);
--
2.4.3

4
0443-Search-for-specific-config-file-for-netboot.patch → 0012-Search-for-specific-config-file-for-netboot.patch
View File

@ -1,7 +1,7 @@
From 6d9169d45e90c95fd17d9b42ab7ea91d18edee6b Mon Sep 17 00:00:00 2001
From 0c18485577c42381f170a9dc1ddd89836cea91b3 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 27 Nov 2012 17:22:07 -0200
Subject: [PATCH 443/506] Search for specific config file for netboot
Subject: [PATCH 12/74] Search for specific config file for netboot
This patch implements a search for a specific configuration when the config
file is on a remoteserver. It uses the following order:

43
0013-arm64-set-correct-length-of-device-path-end-entry.patch
View File

@ -1,43 +0,0 @@
From 4d21c1019904598a991e847eef049c65f9c49bd9 Mon Sep 17 00:00:00 2001
From: Leif Lindholm <leif.lindholm@linaro.org>
Date: Tue, 7 Jan 2014 17:52:50 +0000
Subject: [PATCH 013/506] arm64: set correct length of device path end entry
The length of the Device Path End entry in the grub_linux_boot()
function was incorrectly set to 0. This triggers an assert failure
in debug builds of Tianocore.
Set it to sizeof (grub_efi_device_path_t).
---
ChangeLog | 4 ++++
grub-core/loader/arm64/linux.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 0b9fa05..4ec5517 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-07 Leif Lindholm <leif.lindholm@linaro.org>
+
+ * grub-core/loader/arm64/linux.c: correctly set device path end length.
+
2014-01-07 Andrey Borzenkov <arvidjaar@gmail.com>
* util/grub-install.c: Use bootaa64.efi instead of bootaarch64.efi on
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
index 9d15aad..75ad871 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -268,7 +268,7 @@ grub_linux_boot (void)
mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE;
mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE;
- mempath[1].header.length = 0;
+ mempath[1].header.length = sizeof (grub_efi_device_path_t);
b = grub_efi_system_table->boot_services;
status = b->load_image (0, grub_efi_image_handle,
--
2.4.3

4
0444-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch → 0013-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
View File

@ -1,7 +1,7 @@
From 86baf514c1f19d223bfbfb2ad7007e64f22a0648 Mon Sep 17 00:00:00 2001
From 4b0168249752a531ddedbdc3884bc675cd24033d Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
Date: Tue, 22 Jan 2013 06:31:38 +0100
Subject: [PATCH 444/506] blscfg: add blscfg module to parse Boot Loader
Subject: [PATCH 13/74] blscfg: add blscfg module to parse Boot Loader
Specification snippets
http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec

39
0014-Makefile.util.def-grub-macbless-Change-mansection-to.patch
View File

@ -1,39 +0,0 @@
From ccd21a65ed5ebce27b1e78b56208169fbf30351e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 8 Jan 2014 11:05:20 +0000
Subject: [PATCH 014/506] * Makefile.util.def (grub-macbless): Change
mansection to 8.
---
ChangeLog | 4 ++++
Makefile.util.def | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 4ec5517..b445f12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-08 Colin Watson <cjwatson@ubuntu.com>
+
+ * Makefile.util.def (grub-macbless): Change mansection to 8.
+
2014-01-07 Leif Lindholm <leif.lindholm@linaro.org>
* grub-core/loader/arm64/linux.c: correctly set device path end length.
diff --git a/Makefile.util.def b/Makefile.util.def
index 985e76c..3c99be2 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -405,7 +405,7 @@ program = {
program = {
name = grub-macbless;
installdir = sbin;
- mansection = 1;
+ mansection = 8;
common = util/grub-macbless.c;
common = grub-core/osdep/init.c;
common = grub-core/kern/emu/argp_common.c;
--
2.4.3

4
0445-Move-bash-completion-script-922997.patch → 0014-Move-bash-completion-script-922997.patch
View File

@ -1,7 +1,7 @@
From e0c1af15ca7361a543adfe9b9d61d1cd43d7be43 Mon Sep 17 00:00:00 2001
From 74dc404ac3a93552cf3299e25ebce9e881840fec Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 3 Apr 2013 14:35:34 -0400
Subject: [PATCH 445/506] Move bash completion script (#922997)
Subject: [PATCH 14/74] Move bash completion script (#922997)
Apparently these go in a new place now.
---

48
0015-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch
View File

@ -1,48 +0,0 @@
From 0776112c5311196889a15058a3b1be4c81ba5e05 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sun, 12 Jan 2014 15:29:21 +0400
Subject: [PATCH 015/506] add part_apple to EFI rescue image to fix missing
prefix
On Mac rescue image is booted from HFS+ partition, so bootpath looks like
/ACPI(a0341d0,0)/PCI(1,1f)/ATAPI(0,0,0)/HD(3,5d1,ca3,0000000000000000,20,0)/EndEntire
grub fails to find device for this path because it cannot scan partition
table. The simplest fix is to add part_apple by default.
---
util/grub-mkrescue.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
index 0d03e55..34e0b7a 100644
--- a/util/grub-mkrescue.c
+++ b/util/grub-mkrescue.c
@@ -653,11 +653,15 @@ main (int argc, char *argv[])
make_image_fwdisk_abs (GRUB_INSTALL_PLATFORM_IA64_EFI, "ia64-efi", imgname);
free (imgname);
+ grub_install_push_module ("part_apple");
img64 = grub_util_path_concat (2, efidir_efi_boot, "bootx64.efi");
make_image_fwdisk_abs (GRUB_INSTALL_PLATFORM_X86_64_EFI, "x86_64-efi", img64);
+ grub_install_pop_module ();
+ grub_install_push_module ("part_apple");
img32 = grub_util_path_concat (2, efidir_efi_boot, "bootia32.efi");
make_image_fwdisk_abs (GRUB_INSTALL_PLATFORM_I386_EFI, "i386-efi", img32);
+ grub_install_pop_module ();
imgname = grub_util_path_concat (2, efidir_efi_boot, "bootarm.efi");
make_image_fwdisk_abs (GRUB_INSTALL_PLATFORM_ARM_EFI, "arm-efi", imgname);
@@ -707,7 +711,9 @@ main (int argc, char *argv[])
free (efidir);
}
+ grub_install_push_module ("part_apple");
make_image_fwdisk (GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275, "powerpc-ieee1275", "powerpc-ieee1275/core.elf");
+ grub_install_pop_module ();
if (source_dirs[GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275])
{
--
2.4.3

4
0446-for-ppc-reset-console-display-attr-when-clear-screen.patch → 0015-for-ppc-reset-console-display-attr-when-clear-screen.patch
View File

@ -1,7 +1,7 @@
From 2add40f1185770a5cae18187659c334090a70ef5 Mon Sep 17 00:00:00 2001
From 8c359782b598dfe24a6685fb2d181f76c9cc012f Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Wed, 24 Apr 2013 10:51:48 -0300
Subject: [PATCH 446/506] for ppc, reset console display attr when clear screen
Subject: [PATCH 15/74] for ppc, reset console display attr when clear screen
This should fix this bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=908519

4
0447-Don-t-write-messages-to-the-screen.patch → 0016-Don-t-write-messages-to-the-screen.patch
View File

@ -1,7 +1,7 @@
From e9cf038f6f4c0c94679ca290da2c12ece83b16c2 Mon Sep 17 00:00:00 2001
From fdb6df04bdd06c990498a283ddcaf0522adf8db0 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Wed, 15 May 2013 13:30:20 -0400
Subject: [PATCH 447/506] Don't write messages to the screen
Subject: [PATCH 16/74] Don't write messages to the screen
Writing messages to the screen before the menus or boot splash
happens so quickly it looks like something is wrong and isn't

48
0016-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch
View File

@ -1,48 +0,0 @@
From 09a836e59c1103ed9aa238dcd526da670c9b0d90 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 17 Jan 2014 02:30:52 +0000
Subject: [PATCH 016/506] freebsd/hostdisk.c is only ever compiled on FreeBSD
* grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
redundant preprocessor conditional.
---
ChangeLog | 5 +++++
grub-core/osdep/freebsd/hostdisk.c | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b445f12..6613b4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-17 Colin Watson <cjwatson@debian.org>
+
+ * grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
+ redundant preprocessor conditional.
+
2014-01-08 Colin Watson <cjwatson@ubuntu.com>
* Makefile.util.def (grub-macbless): Change mansection to 8.
diff --git a/grub-core/osdep/freebsd/hostdisk.c b/grub-core/osdep/freebsd/hostdisk.c
index bd5fddb..eb202dc 100644
--- a/grub-core/osdep/freebsd/hostdisk.c
+++ b/grub-core/osdep/freebsd/hostdisk.c
@@ -108,7 +108,6 @@ grub_util_fd_open (const char *os_dev, int flags)
ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if (! (sysctl_oldflags & 0x10)
&& sysctlbyname ("kern.geom.debugflags", NULL , 0, &sysctl_oldflags, sysctl_size))
{
@@ -116,7 +115,6 @@ grub_util_fd_open (const char *os_dev, int flags)
close (ret);
return GRUB_UTIL_FD_INVALID;
}
-#endif
return ret;
}
--
2.4.3

4
0448-Don-t-print-GNU-GRUB-header.patch → 0017-Don-t-print-GNU-GRUB-header.patch
View File

@ -1,7 +1,7 @@
From 58753a84c70d230beb407972706c71f1e3389e9b Mon Sep 17 00:00:00 2001
From 0d083e108f6f49c9dddc518a311f7d6718981789 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Wed, 15 May 2013 13:53:48 -0400
Subject: [PATCH 448/506] Don't print GNU GRUB header
Subject: [PATCH 17/74] Don't print GNU GRUB header
No one cares.
---

109
0017-Prefer-more-portable-test-1-constructs.patch
View File

@ -1,109 +0,0 @@
From ff66b8e7d8397c40bdd57ada31665b605c20c565 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 17 Jan 2014 15:24:50 +0000
Subject: [PATCH 017/506] Prefer more portable test(1) constructs
* util/grub.d/00_header.in (make_timeout): Use && rather than test
-a.
* util/grub.d/10_windows.in: Likewise.
* util/grub.d/10_netbsd.in (netbsd_load_fs_module): Use || rather
than test -o.
* util/grub.d/30_os-prober.in: Use && rather than test -a, and ||
rather than test -o.
---
ChangeLog | 12 +++++++++++-
util/grub.d/00_header.in | 2 +-
util/grub.d/10_netbsd.in | 2 +-
util/grub.d/10_windows.in | 4 ++--
util/grub.d/30_os-prober.in | 4 ++--
5 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6613b4e..c8e95a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-2014-01-17 Colin Watson <cjwatson@debian.org>
+2014-01-17 Colin Watson <cjwatson@ubuntu.com>
+
+ * util/grub.d/00_header.in (make_timeout): Use && rather than test
+ -a.
+ * util/grub.d/10_windows.in: Likewise.
+ * util/grub.d/10_netbsd.in (netbsd_load_fs_module): Use || rather
+ than test -o.
+ * util/grub.d/30_os-prober.in: Use && rather than test -a, and ||
+ rather than test -o.
+
+2014-01-17 Colin Watson <cjwatson@ubuntu.com>
* grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove
redundant preprocessor conditional.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 0c82f23..ce2ec81 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -285,7 +285,7 @@ make_timeout ()
if [ "x${3}" != "x" ] ; then
timeout="${2}"
style="${3}"
- elif [ "x${1}" != "x" -a "x${1}" != "x0" ] ; then
+ elif [ "x${1}" != "x" ] && [ "x${1}" != "x0" ] ; then
# Handle the deprecated GRUB_HIDDEN_TIMEOUT scheme.
timeout="${1}"
if [ "x${2}" != "x0" ] ; then
diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
index 29a0e41..9988a42 100644
--- a/util/grub.d/10_netbsd.in
+++ b/util/grub.d/10_netbsd.in
@@ -69,7 +69,7 @@ netbsd_load_fs_module ()
kversion=$(zcat -f "${kernel}" | strings | sed -n -e '/^@(#)NetBSD/ { s/^@(#)NetBSD \([0-9\.]*\) .*$/\1/g ; p ; q ; }')
kmodule="/stand/${karch}/${kversion}/modules/${kmod}/${kmod}.kmod"
- if test -z "$karch" -o -z "$kversion" -o ! -f "${kmodule}"; then
+ if test -z "$karch" || test -z "$kversion" || test ! -f "${kmodule}"; then
return
fi
diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in
index 9025914..48bd955 100644
--- a/util/grub.d/10_windows.in
+++ b/util/grub.d/10_windows.in
@@ -66,11 +66,11 @@ for drv in $drives ; do
osid=
# Check for Vista bootmgr.
- if [ -f "$dir"/bootmgr -a -f "$dir"/boot/bcd ] ; then
+ if [ -f "$dir"/bootmgr ] && [ -f "$dir"/boot/bcd ] ; then
OS="$(gettext "Windows Vista/7 (loader)")"
osid=bootmgr
# Check for NTLDR.
- elif [ -f "$dir"/ntldr -a -f "$dir"/ntdetect.com -a -f "$dir"/boot.ini ] ; then
+ elif [ -f "$dir"/ntldr ] && [ -f "$dir"/ntdetect.com ] && [ -f "$dir"/boot.ini ] ; then
OS=`get_os_name_from_boot_ini "$dir"/boot.ini` || OS="$(gettext "Windows NT/2000/XP (loader)")"
osid=ntldr
needmap=t
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 0470e66..7cf8487 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -30,7 +30,7 @@ if [ "x${GRUB_DISABLE_OS_PROBER}" = "xtrue" ]; then
exit 0
fi
-if [ -z "`which os-prober 2> /dev/null`" -o -z "`which linux-boot-prober 2> /dev/null`" ] ; then
+if [ -z "`which os-prober 2> /dev/null`" ] || [ -z "`which linux-boot-prober 2> /dev/null`" ] ; then
# missing os-prober and/or linux-boot-prober
exit 0
fi
@@ -119,7 +119,7 @@ for OS in ${OSPROBED} ; do
EXPUUID="${EXPUUID}@${DEVICE#*@}"
fi
- if [ "x${GRUB_OS_PROBER_SKIP_LIST}" != "x" -a "x`echo ${GRUB_OS_PROBER_SKIP_LIST} | grep -i -e '\b'${EXPUUID}'\b'`" != "x" ] ; then
+ if [ "x${GRUB_OS_PROBER_SKIP_LIST}" != "x" ] && [ "x`echo ${GRUB_OS_PROBER_SKIP_LIST} | grep -i -e '\b'${EXPUUID}'\b'`" != "x" ] ; then
echo "Skipped ${LONGNAME} on ${DEVICE} by user request." >&2
continue
fi
--
2.4.3

4
0449-Don-t-add-to-highlighted-row.patch → 0018-Don-t-add-to-highlighted-row.patch
View File

@ -1,7 +1,7 @@
From 36d33527138e344d957a2e589f26455078aabe7a Mon Sep 17 00:00:00 2001
From 5c30a4744e7840cb9ae135d470b45416c41bb91e Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Wed, 15 May 2013 17:49:45 -0400
Subject: [PATCH 449/506] Don't add '*' to highlighted row
Subject: [PATCH 18/74] Don't add '*' to highlighted row
It is already highlighted.
---

100
0018-NEWS-Add-few-missing-entries.patch
View File

@ -1,100 +0,0 @@
From 5acc8020b46605703a59915d4166520788dfdf00 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 18 Jan 2014 16:31:10 +0100
Subject: [PATCH 018/506] * NEWS: Add few missing entries.
---
ChangeLog | 4 ++++
NEWS | 18 +++++++++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c8e95a6..6a19f85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * NEWS: Add few missing entries.
+
2014-01-17 Colin Watson <cjwatson@ubuntu.com>
* util/grub.d/00_header.in (make_timeout): Use && rather than test
diff --git a/NEWS b/NEWS
index 49a2459..a61df94 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@ New in 2.02:
* GPT PReP.
* New `progress' module that shows progress information while reading
files.
+ * ZFS features support.
+ * ZFS LZ4 support.
* New/improved terminal and video support:
* Monochrome text (matching `hercules' in GRUB Legacy).
@@ -36,6 +38,7 @@ New in 2.02:
* Enable `linux16' on all x86 platforms, not just BIOS.
* New TrueCrypt ISO loader.
* multiboot2 boot-services EFI specification.
+ * multiboot2 EFI memory map specification.
* multiboot2 full-file specfication.
* New/improved network support:
@@ -51,12 +54,15 @@ New in 2.02:
* Ability to launch another payload from flash or disk
* Coreboot framebuffer
* CBMEMC support (both logging and inspecting logs)
- * Inspecting coreboot timestamps.
- * Inspecting coreboot tables.
+ * Command for inspecting coreboot timestamps (`coreboot_boottime').
+ * Command for inspecting coreboot tables (`lscoreboot').
+ * New target default_payload.elf.
+ * Increased maximal core size.
* New/improved platform support:
* New `efifwsetup' and `lsefi' commands on EFI platforms.
* New `cmosdump' and `cmosset' commands on platforms with CMOS support.
+ * New command `pcidump' for PCI platforms.
* Improve opcode parsing in ACPI halt implementation.
* Use the TSC as a possible time source on i386-ieee1275.
* Merge PowerPC grub-mkrescue implementation with the common one.
@@ -77,6 +83,8 @@ New in 2.02:
* Support Yeeloong 3A.
* Add `cpuid --pae' option to detect Physical Address Extension on x86.
* Support for USB debug dongles.
+ * Support for *-emu on all platforms (previously only i386/x86_64 worked).
+ * Support *-emu on Windows.
* Security:
* Add optional facility to enforce that all files read by the core image
@@ -88,6 +96,8 @@ New in 2.02:
* Initialise USB ports in parallel.
* New `testspeed' command to test file read speed.
* Speed-up gfxterm by storing intermediate results in more compact format.
+ * Lazy LVM/mdraid scan.
+ * Disk hints.
* Scripting:
* New `eval' and `tr' commands.
@@ -105,7 +115,8 @@ New in 2.02:
* grub-install, grub-mknetdir, grub-mkrescue, and grub-mkstandalone
rewritten in C. They should now work in supported non-Unix-like
environments.
- * Native mingw support, including ability to install on EFI under windows.
+ * Native mingw support.
+ * Ability to install on EFI under windows.
* Reorganise timeout handling using new `timeout_style' environment
variable and `GRUB_TIMEOUT_STYLE' configuration key for grub-mkconfig.
Menu hotkeys pressed during a hidden timeout now boot the corresponding
@@ -122,6 +133,7 @@ New in 2.02:
* Partial mingw64 x86_64-efi compile support (highly experimental).
* Partial mingw32 i386-* (other than already present i386-pc)
compile support (highly experimental).
+ * Support for grub-mkpasswd on Windows.
* Eliminate the use of AutoGen. This allowed some performance
improvements to the build system.
* Remove variable length arrays.
--
2.4.3

4
0450-Message-string-cleanups.patch → 0019-Message-string-cleanups.patch
View File

@ -1,7 +1,7 @@
From 2115d88318a56ccc03fc298533b06c18e919517c Mon Sep 17 00:00:00 2001
From 0784f9845eee9a4408334b160fe9447481ea1b55 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 11:09:04 -0400
Subject: [PATCH 450/506] Message string cleanups
Subject: [PATCH 19/74] Message string cleanups
Make use of terminology consistent. Remove jargon.
---

90
0019-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
View File

@ -1,90 +0,0 @@
From 7e7293d745ef7c0a13d8cbf12f474843edfdd0ab Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 18 Jan 2014 16:41:47 +0100
Subject: [PATCH 019/506] * grub-core/kern/efi/efi.c: Ensure that the
result starts with / and has no //.
---
ChangeLog | 5 +++++
grub-core/kern/efi/efi.c | 25 +++++++++++++++++--------
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6a19f85..b04a4ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+ * grub-core/kern/efi/efi.c: Ensure that the result starts with /
+ and has no //.
+
+2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+
* NEWS: Add few missing entries.
2014-01-17 Colin Watson <cjwatson@ubuntu.com>
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index b253141..b9eb1ab 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -309,7 +309,7 @@ grub_efi_modules_addr (void)
char *
grub_efi_get_filename (grub_efi_device_path_t *dp0)
{
- char *name = 0, *p;
+ char *name = 0, *p, *pi;
grub_size_t filesize = 0;
grub_efi_device_path_t *dp;
@@ -328,7 +328,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
grub_efi_uint16_t len;
len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4)
/ sizeof (grub_efi_char16_t));
- filesize += GRUB_MAX_UTF8_PER_UTF16 * len + 1;
+ filesize += GRUB_MAX_UTF8_PER_UTF16 * len + 2;
}
dp = GRUB_EFI_NEXT_DEVICE_PATH (dp);
@@ -356,12 +356,12 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
grub_efi_file_path_device_path_t *fp;
grub_efi_uint16_t len;
- if (p != name)
- *p++ = '/';
+ *p++ = '/';
len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4)
/ sizeof (grub_efi_char16_t));
fp = (grub_efi_file_path_device_path_t *) dp;
+
p = (char *) grub_utf16_to_utf8 ((unsigned char *) p, fp->path_name, len);
}
@@ -370,10 +370,19 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
*p = '\0';
- /* EFI breaks paths with backslashes. */
- for (p = name; *p; p++)
- if (*p == '\\')
- *p = '/';
+ for (pi = name, p = name; *pi;)
+ {
+ /* EFI breaks paths with backslashes. */
+ if (*pi == '\\' || *pi == '/')
+ {
+ *p++ = '/';
+ while (*pi == '\\' || *pi == '/')
+ pi++;
+ continue;
+ }
+ *p++ = *pi++;
+ }
+ *p = '\0';
return name;
}
--
2.4.3

4
0451-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch → 0020-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
View File

@ -1,7 +1,7 @@
From 694bfc483adcd4ef23aad0fd88d6331c1f2b8492 Mon Sep 17 00:00:00 2001
From 55197d5839d8456cd72b081e2a552e14d50611e9 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 14:08:23 -0400
Subject: [PATCH 451/506] Fix border spacing now that we aren't displaying it
Subject: [PATCH 20/74] Fix border spacing now that we aren't displaying it
---
grub-core/normal/menu_text.c | 6 +++---

47
0020-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch
View File

@ -1,47 +0,0 @@
From ae80f312700c72fcb0222a7865ea69f37517a313 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 18 Jan 2014 16:43:29 +0100
Subject: [PATCH 020/506] * util/grub-mount.c: Extend GCC warning
workaround to grub-mount.
---
ChangeLog | 4 ++++
util/grub-mount.c | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index b04a4ef..8534158 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+ * util/grub-mount.c: Extend GCC warning workaround to grub-mount.
+
+2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+
* grub-core/kern/efi/efi.c: Ensure that the result starts with /
and has no //.
diff --git a/util/grub-mount.c b/util/grub-mount.c
index 118881e..19de2e6 100644
--- a/util/grub-mount.c
+++ b/util/grub-mount.c
@@ -41,8 +41,13 @@
#include <string.h>
#include <stdlib.h>
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
+
#include "progname.h"
-#include "argp.h"
static const char *root = NULL;
grub_device_t dev = NULL;
--
2.4.3

4
0452-Use-the-correct-indentation-for-the-term-help-text.patch → 0021-Use-the-correct-indentation-for-the-term-help-text.patch
View File

@ -1,7 +1,7 @@
From 066292ef95375f1848c5e403d7ca7d73277bdbcb Mon Sep 17 00:00:00 2001
From 38947a46ac4a1c8799a9d743381067324218038f Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 14:08:49 -0400
Subject: [PATCH 452/506] Use the correct indentation for the term help text
Subject: [PATCH 21/74] Use the correct indentation for the term help text
That is consistent with the menu help text
---

153
0021-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch
View File

@ -1,153 +0,0 @@
From dcecae1a49996bbaefb4133a878215594eb5094a Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 18 Jan 2014 19:50:54 +0400
Subject: [PATCH 021/506] reintroduce BUILD_LDFLAGS for the cross-compile case
This allows providing separate LDFLAGS for build and host environments, which
are not necessary the same for cross-compile case. In particular, it allows
building host programs statically to not depend on presence of libraries at
run-time (e.g. MinGW DLLs on Windows) while continue to use default dynamic
linking at build time.
Also fix obsolete comments in confgure.ac - we do use different environment
for build and host now.
---
ChangeLog | 7 +++++++
INSTALL | 3 ++-
Makefile.am | 8 ++++----
configure.ac | 13 ++++++++-----
grub-core/Makefile.am | 6 +++---
5 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8534158..9c3ef2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-07 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * configure.ac: Add support for BUILD_LDFLAGS.
+ * Makefile.am: Use BUILD_LDFLAGS for build time programs here ...
+ * grub-core/Makefile.am: ... and here.
+ * INSTALL: Mention BUILD_LDFLAGS.
+
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mount.c: Extend GCC warning workaround to grub-mount.
diff --git a/INSTALL b/INSTALL
index db12530..b67cd7f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -168,7 +168,8 @@ corresponding platform are not needed for the platform in question.
generate sin and cos tables.
2. BUILD_CFLAGS= for C options for build.
3. BUILD_CPPFLAGS= for C preprocessor options for build.
- 4. BUILD_FREETYPE= for freetype-config for build (optional).
+ 4. BUILD_LDFLAGS= for linker options for build.
+ 5. BUILD_FREETYPE= for freetype-config for build (optional).
- For host
1. --host= to autoconf name of host.
diff --git a/Makefile.am b/Makefile.am
index 320e86f..1bbec0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,20 +67,20 @@ endif
starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu_e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starfield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir)/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfield/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/themes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcdir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_box_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/starfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfield/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(srcdir)/themes/starfield/terminal_box_sw.png $(srcdir)/themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt $(srcdir)/themes/starfield/README $(srcdir)/themes/starfield/COPYING.CC-BY-SA-3.0
build-grub-mkfont: util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c
- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs)
+ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs)
CLEANFILES += build-grub-mkfont
garbage-gen: util/garbage-gen.c
- $(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $^
+ $(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) $^
CLEANFILES += garbage-gen
EXTRA_DIST += util/garbage-gen.c
build-grub-gen-asciih: util/grub-gen-asciih.c
- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
+ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
CLEANFILES += build-grub-gen-asciih
build-grub-gen-widthspec: util/grub-gen-widthspec.c
- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
+ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
CLEANFILES += build-grub-gen-widthspec
if COND_STARFIELD
diff --git a/configure.ac b/configure.ac
index 7c5d080..2e4cf3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,11 +26,10 @@ dnl This is necessary because the target type in autoconf does not
dnl describe such a system very well.
dnl
dnl The current strategy is to use variables with no prefix (such as
-dnl CC, CFLAGS, etc.) for the host type as well as the build type,
-dnl because GRUB does not need to use those variables for the build
-dnl type, so there is no conflict. Variables with the prefix "TARGET_"
-dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
-dnl type.
+dnl CC, CFLAGS, etc.) for the host type, variables with prefix "BUILD_"
+dnl (such as BUILD_CC, BUILD_CFLAGS, etc.) for the build type and variables
+dnl with the prefix "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are
+dnl used for the target type. See INSTALL for full list of variables.
AC_INIT([GRUB],[2.02~beta2],[bug-grub@gnu.org])
@@ -477,6 +476,7 @@ AC_SUBST(HOST_CC)
AC_SUBST(BUILD_CC)
AC_SUBST(BUILD_CFLAGS)
AC_SUBST(BUILD_CPPFLAGS)
+AC_SUBST(BUILD_LDFLAGS)
AC_SUBST(TARGET_CC)
AC_SUBST(TARGET_NM)
AC_SUBST(TARGET_RANLIB)
@@ -1290,10 +1290,12 @@ SAVED_CC="$CC"
SAVED_CPP="$CPP"
SAVED_CFLAGS="$CFLAGS"
SAVED_CPPFLAGS="$CPPFLAGS"
+SAVED_LDFLAGS="$LDFLAGS"
CC="$BUILD_CC"
CPP="$BUILD_CPP"
CFLAGS="$BUILD_CFLAGS"
CPPFLAGS="$BUILD_CPPFLAGS"
+LDFLAGS="$BUILD_LDFAGS"
unset ac_cv_c_bigendian
unset ac_cv_header_ft2build_h
@@ -1356,6 +1358,7 @@ CC="$SAVED_CC"
CPP="$SAVED_CPP"
CFLAGS="$SAVED_CFLAGS"
CPPFLAGS="$SAVED_CPPFLAGS"
+LDFLAGS="$SAVED_LDFLAGS"
DJVU_FONT_SOURCE=
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 1b3142d..13b7979 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -27,14 +27,14 @@ CPPFLAGS_LIBRARY += $(CPPFLAGS_PLATFORM)
CCASFLAGS_LIBRARY += $(CCASFLAGS_PLATFORM)
build-grub-pep2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=64 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pep2elf\" $^
+ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=64 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pep2elf\" $^
build-grub-pe2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=32 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pe2elf\" $^
+ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=32 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pe2elf\" $^
# gentrigtables
gentrigtables: gentrigtables.c
- $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< $(BUILD_LIBM)
+ $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) $< $(BUILD_LIBM)
CLEANFILES += gentrigtables
# trigtables.c
--
2.4.3

4
0453-Indent-menu-entries.patch → 0022-Indent-menu-entries.patch
View File

@ -1,7 +1,7 @@
From d9479d21d4b97295000fe2268b1e6cadf301f008 Mon Sep 17 00:00:00 2001
From 2bbb261ba6fbb2024321d685429a9822f33f22d3 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 14:30:55 -0400
Subject: [PATCH 453/506] Indent menu entries
Subject: [PATCH 22/74] Indent menu entries
---
grub-core/normal/menu_text.c | 3 ++-

155
0022-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch
View File

@ -1,155 +0,0 @@
From 3abb9563712f73bc48a33d428a3ab4c756191904 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 18 Jan 2014 16:57:35 +0100
Subject: [PATCH 022/506] * grub-core/term/terminfo.c: Recognize keys
F1-F12.
---
ChangeLog | 4 +++
grub-core/term/terminfo.c | 86 +++++++++++++++++++++++++++--------------------
2 files changed, 54 insertions(+), 36 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9c3ef2e..bdfbf44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * grub-core/term/terminfo.c: Recognize keys F1-F12.
+
2014-01-07 Andrey Borzenkov <arvidjaar@gmail.com>
* configure.ac: Add support for BUILD_LDFLAGS.
diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
index 3d48b19..f0d3e3d 100644
--- a/grub-core/term/terminfo.c
+++ b/grub-core/term/terminfo.c
@@ -460,28 +460,31 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
{'@', GRUB_TERM_KEY_INSERT},
};
- static struct
- {
- char key;
- unsigned ascii;
- }
- four_code_table[] =
+ static unsigned four_code_table[] =
{
- {'1', GRUB_TERM_KEY_HOME},
- {'3', GRUB_TERM_KEY_DC},
- {'5', GRUB_TERM_KEY_PPAGE},
- {'6', GRUB_TERM_KEY_NPAGE},
- {'7', GRUB_TERM_KEY_HOME},
- {'8', GRUB_TERM_KEY_END}
+ [1] = GRUB_TERM_KEY_HOME,
+ [3] = GRUB_TERM_KEY_DC,
+ [5] = GRUB_TERM_KEY_PPAGE,
+ [6] = GRUB_TERM_KEY_NPAGE,
+ [7] = GRUB_TERM_KEY_HOME,
+ [8] = GRUB_TERM_KEY_END,
+ [17] = GRUB_TERM_KEY_F6,
+ [18] = GRUB_TERM_KEY_F7,
+ [19] = GRUB_TERM_KEY_F8,
+ [20] = GRUB_TERM_KEY_F9,
+ [21] = GRUB_TERM_KEY_F10,
+ [23] = GRUB_TERM_KEY_F11,
+ [24] = GRUB_TERM_KEY_F12,
};
char fx_key[] =
{ 'P', 'Q', 'w', 'x', 't', 'u',
- 'q', 'r', 'p', 'M', 'A', 'B' };
+ 'q', 'r', 'p', 'M', 'A', 'B', 'H', 'F' };
unsigned fx_code[] =
{ GRUB_TERM_KEY_F1, GRUB_TERM_KEY_F2, GRUB_TERM_KEY_F3,
GRUB_TERM_KEY_F4, GRUB_TERM_KEY_F5, GRUB_TERM_KEY_F6,
GRUB_TERM_KEY_F7, GRUB_TERM_KEY_F8, GRUB_TERM_KEY_F9,
- GRUB_TERM_KEY_F10, GRUB_TERM_KEY_F11, GRUB_TERM_KEY_F12 };
+ GRUB_TERM_KEY_F10, GRUB_TERM_KEY_F11, GRUB_TERM_KEY_F12,
+ GRUB_TERM_KEY_HOME, GRUB_TERM_KEY_END };
unsigned i;
if (c == '\e')
@@ -492,19 +495,13 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
{
CONTINUE_READ;
- switch (c)
- {
- case 'H':
- keys[0] = GRUB_TERM_KEY_HOME;
- *len = 1;
- return;
- case 'F':
- keys[0] = GRUB_TERM_KEY_END;
- *len = 1;
- return;
- default:
- return;
- }
+ for (i = 0; i < ARRAY_SIZE (fx_key); i++)
+ if (fx_key[i] == c)
+ {
+ keys[0] = fx_code[i];
+ *len = 1;
+ return;
+ }
}
if (c != '[')
@@ -523,6 +520,15 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
switch (c)
{
+ case '[':
+ CONTINUE_READ;
+ if (c >= 'A' && c <= 'E')
+ {
+ keys[0] = GRUB_TERM_KEY_F1 + c - 'A';
+ *len = 1;
+ return;
+ }
+ return;
case 'O':
CONTINUE_READ;
for (i = 0; i < ARRAY_SIZE (fx_key); i++)
@@ -555,18 +561,26 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
return;
}
- default:
- for (i = 0; i < ARRAY_SIZE (four_code_table); i++)
- if (four_code_table[i].key == c)
+ case '1' ... '9':
+ {
+ unsigned val = c - '0';
+ CONTINUE_READ;
+ if (c >= '0' && c <= '9')
{
+ val = val * 10 + (c - '0');
CONTINUE_READ;
- if (c != '~')
- return;
- keys[0] = four_code_table[i].ascii;
- *len = 1;
- return;
}
- return;
+ if (c != '~')
+ return;
+ if (val >= ARRAY_SIZE (four_code_table)
+ || four_code_table[val] == 0)
+ return;
+ keys[0] = four_code_table[val];
+ *len = 1;
+ return;
+ }
+ default:
+ return;
}
}
#undef CONTINUE_READ
--
2.4.3

25
0023-Fix-ChangeLog-date.patch
View File

@ -1,25 +0,0 @@
From 9b9c4686f07644eb9c4f4786ff121bb9e19e31cd Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 18 Jan 2014 20:01:16 +0400
Subject: [PATCH 023/506] Fix ChangeLog date
---
ChangeLog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index bdfbf44..fcbf220 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
* grub-core/term/terminfo.c: Recognize keys F1-F12.
-2014-01-07 Andrey Borzenkov <arvidjaar@gmail.com>
+2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
* configure.ac: Add support for BUILD_LDFLAGS.
* Makefile.am: Use BUILD_LDFLAGS for build time programs here ...
--
2.4.3

4
0454-Fix-margins.patch → 0023-Fix-margins.patch
View File

@ -1,7 +1,7 @@
From 7b246fc51139c94f68152d490e255d930b022a55 Mon Sep 17 00:00:00 2001
From 5d7922cf7cc6799bd82f7192f6bb39329888d07a Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 14:59:36 -0400
Subject: [PATCH 454/506] Fix margins
Subject: [PATCH 23/74] Fix margins
---
grub-core/normal/menu_text.c | 8 +++-----

4
0455-Add-support-for-UEFI-operating-systems-returned-by-o.patch → 0024-Add-support-for-UEFI-operating-systems-returned-by-o.patch
View File

@ -1,7 +1,7 @@
From 79f17b3b74ee1270959fb40de4ba55bb63534c1b Mon Sep 17 00:00:00 2001
From 6e6e62cc673d7ac1cdf63437c9fb14f7a5765465 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <matthew.garrett@nebula.com>
Date: Wed, 12 Jun 2013 11:51:49 -0400
Subject: [PATCH 455/506] Add support for UEFI operating systems returned by
Subject: [PATCH 24/74] Add support for UEFI operating systems returned by
os-prober
os-prober returns UEFI operating systems in the form:

47
0024-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch
View File

@ -1,47 +0,0 @@
From 5ef569df5b359048ee55c5000e2679855cb87e06 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 18 Jan 2014 20:04:11 +0400
Subject: [PATCH 024/506] Use _W64 to detect MinGW W64-32 instead of
_FILE_OFFSET_BITS
In 94cee4a4c201bb506377b2c26e072eee8cb19d6f I overlooked that config.h
unconditionally sets _FILE_OFFSET_BITS, so it cannot be used to detect
MinGW W64 environment. It looks like Emacs folks already found
solution; instead of _FILE_OFFSET_BITS use _W64 as suggested in
http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00723.html
---
ChangeLog | 5 +++++
include/grub/osdep/hostfile_windows.h | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fcbf220..5aac7c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * include/grub/osdep/hostfile_windows.h: Use _W64 instead of
+ FILE_OFFSET_BITS to differentiate between native MinGW and Mingw W64.
+
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/terminfo.c: Recognize keys F1-F12.
diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h
index 79efcfa..bf6451b 100644
--- a/include/grub/osdep/hostfile_windows.h
+++ b/include/grub/osdep/hostfile_windows.h
@@ -69,8 +69,8 @@ enum grub_util_fd_open_flags_t
#if defined (__MINGW32__) && !defined (__MINGW64__)
-/* 32 bit on MinGW-64 already redefines them if _FILE_OFFSET_BITS=64 */
-#if !defined(_FILE_OFFSET_BITS)
+/* 32 bit on Mingw-w64 already redefines them if _FILE_OFFSET_BITS=64 */
+#ifndef _W64
#define fseeko fseeko64
#define ftello ftello64
#endif
--
2.4.3

4
0456-Disable-GRUB-video-support-for-IBM-power-machines.patch → 0025-Disable-GRUB-video-support-for-IBM-power-machines.patch
View File

@ -1,7 +1,7 @@
From 49053d07add1a526a633f525933d5d17471a5989 Mon Sep 17 00:00:00 2001
From d27d2a5ba388b2d18881a7ed429d3639801251ec Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 11 Jun 2013 15:14:05 -0300
Subject: [PATCH 456/506] Disable GRUB video support for IBM power machines
Subject: [PATCH 25/74] Disable GRUB video support for IBM power machines
Should fix the problem in bugzilla:
https://bugzilla.redhat.com/show_bug.cgi?id=973205

174
0025-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch
View File

@ -1,174 +0,0 @@
From 1ecf96fcc4bd882381bf21a461a12baf3c5ecf77 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 18 Jan 2014 20:41:24 +0400
Subject: [PATCH 025/506] add BUILD_EXEEXT support to fix make clean on Windows
Add $(BUILD_EXEEXT) to ensure files are removed. Also add CLEANFILES where
appropriate.
---
ChangeLog | 7 +++++++
Makefile.am | 16 ++++++++--------
Makefile.util.def | 2 +-
configure.ac | 21 ++++++++++++++++-----
grub-core/Makefile.am | 14 ++++++++------
5 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5aac7c1..dad2da2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
+ * configure.ac: Add support for BUILD_EXEEXT and use it ...
+ * Makefile.am: ... here.
+ * Makefile.util.def: ... and here.
+ * grub-core/Makefile.am: ... and here.
+
+2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
+
* include/grub/osdep/hostfile_windows.h: Use _W64 instead of
FILE_OFFSET_BITS to differentiate between native MinGW and Mingw W64.
diff --git a/Makefile.am b/Makefile.am
index 1bbec0e..aa526f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,22 +66,22 @@ endif
starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu_e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starfield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir)/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfield/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/themes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcdir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_box_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/starfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfield/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(srcdir)/themes/starfield/terminal_box_sw.png $(srcdir)/themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt $(srcdir)/themes/starfield/README $(srcdir)/themes/starfield/COPYING.CC-BY-SA-3.0
-build-grub-mkfont: util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c
+build-grub-mkfont$(BUILD_EXEEXT): util/grub-mkfont.c grub-core/unidata.c grub-core/kern/emu/misc.c util/misc.c
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-mkfont\" $^ $(build_freetype_cflags) $(build_freetype_libs)
-CLEANFILES += build-grub-mkfont
+CLEANFILES += build-grub-mkfont$(BUILD_EXEEXT)
-garbage-gen: util/garbage-gen.c
+garbage-gen$(BUILD_EXEEXT): util/garbage-gen.c
$(BUILD_CC) -o $@ $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) $^
-CLEANFILES += garbage-gen
+CLEANFILES += garbage-gen$(BUILD_EXEEXT)
EXTRA_DIST += util/garbage-gen.c
-build-grub-gen-asciih: util/grub-gen-asciih.c
+build-grub-gen-asciih$(BUILD_EXEEXT): util/grub-gen-asciih.c
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
-CLEANFILES += build-grub-gen-asciih
+CLEANFILES += build-grub-gen-asciih$(BUILD_EXEEXT)
-build-grub-gen-widthspec: util/grub-gen-widthspec.c
+build-grub-gen-widthspec$(BUILD_EXEEXT): util/grub-gen-widthspec.c
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_MKFONT=1 -DGRUB_BUILD=1 -DGRUB_UTIL=1 $^ $(build_freetype_cflags) $(build_freetype_libs) -Wall -Werror
-CLEANFILES += build-grub-gen-widthspec
+CLEANFILES += build-grub-gen-widthspec$(BUILD_EXEEXT)
if COND_STARFIELD
starfield_DATA = dejavu_10.pf2 dejavu_12.pf2 dejavu_bold_14.pf2 dejavu_14.pf2 dejavu_16.pf2 $(starfield_theme_files)
diff --git a/Makefile.util.def b/Makefile.util.def
index 3c99be2..83df212 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -708,7 +708,7 @@ script = {
name = grub-fs-tester;
common = tests/util/grub-fs-tester.in;
installdir = noinst;
- dependencies = garbage-gen;
+ dependencies = 'garbage-gen$(BUILD_EXEEXT)';
};
script = {
diff --git a/configure.ac b/configure.ac
index 2e4cf3c..cf3de3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,8 @@ AC_CONFIG_AUX_DIR([build-aux])
# We don't want -g -O2 by default in CFLAGS
: ${CFLAGS=""}
-# Checks for host and target systems.
+# Checks for build, host and target systems.
+AC_CANONICAL_BUILD
AC_CANONICAL_HOST
save_program_prefix="${program_prefix}"
AC_CANONICAL_TARGET
@@ -422,6 +423,16 @@ case "$build_os" in
haiku*) BUILD_LIBM= ;;
*) BUILD_LIBM=-lm ;;
esac
+
+dnl FIXME proper test seems to require too deep dive into Autoconf internals.
+dnl For now just list known platforms that we support.
+
+case "$build_os" in
+ cygwin*|mingw32*|mingw64*) BUILD_EXEEXT=.exe ;;
+ *) BUILD_EXEEXT= ;;
+esac
+AC_SUBST(BUILD_EXEEXT)
+
# For gnulib.
gl_INIT
@@ -765,11 +776,11 @@ if test x"$platform" = xemu ; then
*windows* | *cygwin* | *mingw*)
if test x${target_cpu} = xi386 ; then
grub_cv_target_cc_link_format=-mi386pe;
- TARGET_OBJ2ELF='./build-grub-pe2elf';
+ TARGET_OBJ2ELF='./build-grub-pe2elf$(BUILD_EXEEXT)';
fi
if test x${target_cpu} = xx86_64 ; then
grub_cv_target_cc_link_format=-mi386pep;
- TARGET_OBJ2ELF='./build-grub-pep2elf';
+ TARGET_OBJ2ELF='./build-grub-pep2elf$(BUILD_EXEEXT)';
fi
TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,$grub_cv_target_cc_link_format"
;;
@@ -803,10 +814,10 @@ elif test x"$target_cpu" = xi386 || test x"$target_cpu" = xx86_64; then
fi
TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,$grub_cv_target_cc_link_format"
if test x"$grub_cv_target_cc_link_format" = x-mi386pe ; then
- TARGET_OBJ2ELF='./build-grub-pe2elf';
+ TARGET_OBJ2ELF='./build-grub-pe2elf$(BUILD_EXEEXT)';
fi
if test x"$grub_cv_target_cc_link_format" = x-mi386pep ; then
- TARGET_OBJ2ELF='./build-grub-pep2elf';
+ TARGET_OBJ2ELF='./build-grub-pep2elf$(BUILD_EXEEXT)';
fi
fi
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 13b7979..826b3dd 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -26,20 +26,22 @@ CFLAGS_LIBRARY += $(CFLAGS_PLATFORM) -fno-builtin
CPPFLAGS_LIBRARY += $(CPPFLAGS_PLATFORM)
CCASFLAGS_LIBRARY += $(CCASFLAGS_PLATFORM)
-build-grub-pep2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
+build-grub-pep2elf$(BUILD_EXEEXT): $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=64 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pep2elf\" $^
+CLEANFILES += build-grub-pep2elf$(BUILD_EXEEXT)
-build-grub-pe2elf: $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
+build-grub-pe2elf$(BUILD_EXEEXT): $(top_srcdir)/util/grub-pe2elf.c $(top_srcdir)/grub-core/kern/emu/misc.c $(top_srcdir)/util/misc.c
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) -DGRUB_BUILD=1 -DGRUB_TARGET_WORDSIZE=32 -DGRUB_UTIL=1 -DGRUB_BUILD_PROGRAM_NAME=\"build-grub-pe2elf\" $^
+CLEANFILES += build-grub-pe2elf$(BUILD_EXEEXT)
# gentrigtables
-gentrigtables: gentrigtables.c
+gentrigtables$(BUILD_EXEEXT): gentrigtables.c
$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(BUILD_LDFLAGS) $< $(BUILD_LIBM)
-CLEANFILES += gentrigtables
+CLEANFILES += gentrigtables$(BUILD_EXEEXT)
# trigtables.c
-trigtables.c: gentrigtables gentrigtables.c $(top_srcdir)/configure.ac
- ./gentrigtables > $@
+trigtables.c: gentrigtables$(BUILD_EXEEXT) gentrigtables.c $(top_srcdir)/configure.ac
+ ./gentrigtables$(BUILD_EXEEXT) > $@
CLEANFILES += trigtables.c
# XXX Use Automake's LEX & YACC support
--
2.4.3

4
0457-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch → 0026-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
View File

@ -1,7 +1,7 @@
From 1ec3f0284d7dee52ee1afc6ac72ec39bdf3fba88 Mon Sep 17 00:00:00 2001
From 63642951c9e35985a3e35ab218d8d0831d60d239 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 21 Jun 2013 14:44:08 -0400
Subject: [PATCH 457/506] Use -2 instead of -1 for our right-hand margin, so
Subject: [PATCH 26/74] Use -2 instead of -1 for our right-hand margin, so
linewrapping works (#976643).
Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>

281
0026-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch
View File

@ -1,281 +0,0 @@
From f371dd5da81701f7bc3d28c67cb4c2c289728691 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 18 Jan 2014 21:22:57 +0400
Subject: [PATCH 026/506] fix include loop on MinGW due to libintl.h pulling
stdio.h
In file included from ./include/grub/dl.h:23:0,
from grub-core/lib/libgcrypt-grub/cipher/rfc2268.c:3:
./include/grub/list.h:34:18: warning: conflicting types for 'grub_list_push' [en
abled by default]
void EXPORT_FUNC(grub_list_push) (grub_list_t *head, grub_list_t item);
^
./include/grub/symbol.h:68:25: note: in definition of macro 'EXPORT_FUNC'
# define EXPORT_FUNC(x) x
^
In file included from ./include/grub/fs.h:30:0,
from ./include/grub/file.h:25,
from ./grub-core/lib/posix_wrap/stdio.h:23,
from c:\mingw\include\libintl.h:314,
from ./include/grub/i18n.h:33,
from ./include/grub/misc.h:27,
from ./include/grub/list.h:25,
from ./include/grub/dl.h:28,
from grub-core/lib/libgcrypt-grub/cipher/rfc2268.c:3:
./include/grub/partition.h:106:3: note: previous implicit declaration of 'grub_l
ist_push' was here
grub_list_push (GRUB_AS_LIST_P (&grub_partition_map_list),
^
list.h needs just ATTRIBUTE_ERROR from misc.h; split compiler features
into separate file grub/compiler.h and include it instead.
---
ChangeLog | 14 +++++++++++
grub-core/commands/fileXX.c | 1 +
grub-core/efiemu/prepare.c | 1 +
grub-core/loader/i386/xen_file.c | 1 +
grub-core/loader/i386/xen_fileXX.c | 1 +
grub-core/video/capture.c | 1 +
include/grub/command.h | 1 +
include/grub/compiler.h | 51 ++++++++++++++++++++++++++++++++++++++
include/grub/dl.h | 1 +
include/grub/list.h | 4 +--
include/grub/misc.h | 29 +---------------------
include/grub/procfs.h | 1 +
12 files changed, 76 insertions(+), 30 deletions(-)
create mode 100644 include/grub/compiler.h
diff --git a/ChangeLog b/ChangeLog
index dad2da2..dad469b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
+ * include/grub/misc.h: Move macros for compiler features to ...
+ * include/grub/compiler.h: ... new file.
+ * include/grub/list.h: Include <grub/compiler.h> instead of <grub/misc.h>.
+ * grub-core/commands/fileXX.c: Include <grub/misc.h>.
+ * grub-core/efiemu/prepare.c: Include <grub/misc.h>.
+ * grub-core/loader/i386/xen_file.c: Include <grub/misc.h>.
+ * grub-core/loader/i386/xen_fileXX.c: Include <grub/misc.h>.
+ * grub-core/video/capture.c: Include <grub/misc.h>.
+ * include/grub/command.h: Include <grub/misc.h>.
+ * include/grub/dl.h: Include <grub/misc.h>.
+ * include/grub/procfs.h: Include <grub/misc.h>.
+
+2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
+
* configure.ac: Add support for BUILD_EXEEXT and use it ...
* Makefile.am: ... here.
* Makefile.util.def: ... and here.
diff --git a/grub-core/commands/fileXX.c b/grub-core/commands/fileXX.c
index c9857ff..58e1094 100644
--- a/grub-core/commands/fileXX.c
+++ b/grub-core/commands/fileXX.c
@@ -18,6 +18,7 @@
#include <grub/fileid.h>
#include <grub/elfload.h>
+#include <grub/misc.h>
#pragma GCC diagnostic ignored "-Wcast-align"
diff --git a/grub-core/efiemu/prepare.c b/grub-core/efiemu/prepare.c
index fb1b25d..84c3368 100644
--- a/grub-core/efiemu/prepare.c
+++ b/grub-core/efiemu/prepare.c
@@ -21,6 +21,7 @@
#include <grub/err.h>
#include <grub/mm.h>
#include <grub/types.h>
+#include <grub/misc.h>
#include <grub/efiemu/efiemu.h>
#include <grub/crypto.h>
diff --git a/grub-core/loader/i386/xen_file.c b/grub-core/loader/i386/xen_file.c
index ebbf6aa..ff23235 100644
--- a/grub-core/loader/i386/xen_file.c
+++ b/grub-core/loader/i386/xen_file.c
@@ -18,6 +18,7 @@
#include <grub/xen_file.h>
#include <grub/i386/linux.h>
+#include <grub/misc.h>
grub_elf_t
grub_xen_file (grub_file_t file)
diff --git a/grub-core/loader/i386/xen_fileXX.c b/grub-core/loader/i386/xen_fileXX.c
index 6df0015..73a5f90 100644
--- a/grub-core/loader/i386/xen_fileXX.c
+++ b/grub-core/loader/i386/xen_fileXX.c
@@ -17,6 +17,7 @@
*/
#include <grub/xen_file.h>
+#include <grub/misc.h>
static grub_err_t
parse_xen_guest (grub_elf_t elf, struct grub_xen_file_info *xi,
diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c
index 67c8edd..4f83c74 100644
--- a/grub-core/video/capture.c
+++ b/grub-core/video/capture.c
@@ -4,6 +4,7 @@
#include <grub/video.h>
#include <grub/video_fb.h>
#include <grub/mm.h>
+#include <grub/misc.h>
static struct
{
diff --git a/include/grub/command.h b/include/grub/command.h
index 8705a63..eee4e84 100644
--- a/include/grub/command.h
+++ b/include/grub/command.h
@@ -22,6 +22,7 @@
#include <grub/symbol.h>
#include <grub/err.h>
#include <grub/list.h>
+#include <grub/misc.h>
typedef enum grub_command_flags
{
diff --git a/include/grub/compiler.h b/include/grub/compiler.h
new file mode 100644
index 0000000..c9e1d7a
--- /dev/null
+++ b/include/grub/compiler.h
@@ -0,0 +1,51 @@
+/* compiler.h - macros for various compiler features */
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2002,2003,2005,2006,2007,2008,2009,2010,2014 Free Software Foundation, Inc.
+ *
+ * GRUB is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_COMPILER_HEADER
+#define GRUB_COMPILER_HEADER 1
+
+/* GCC version checking borrowed from glibc. */
+#if defined(__GNUC__) && defined(__GNUC_MINOR__)
+# define GNUC_PREREQ(maj,min) \
+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#else
+# define GNUC_PREREQ(maj,min) 0
+#endif
+
+/* Does this compiler support compile-time error attributes? */
+#if GNUC_PREREQ(4,3)
+# define ATTRIBUTE_ERROR(msg) \
+ __attribute__ ((__error__ (msg)))
+#else
+# define ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
+#endif
+
+#if GNUC_PREREQ(4,4)
+# define GNU_PRINTF gnu_printf
+#else
+# define GNU_PRINTF printf
+#endif
+
+#if GNUC_PREREQ(3,4)
+# define WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
+#else
+# define WARN_UNUSED_RESULT
+#endif
+
+#endif /* ! GRUB_COMPILER_HEADER */
diff --git a/include/grub/dl.h b/include/grub/dl.h
index d29a899..9562fa6 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -26,6 +26,7 @@
#include <grub/types.h>
#include <grub/elf.h>
#include <grub/list.h>
+#include <grub/misc.h>
#endif
/*
diff --git a/include/grub/list.h b/include/grub/list.h
index edd20ad..d170ff6 100644
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -21,8 +21,8 @@
#define GRUB_LIST_HEADER 1
#include <grub/symbol.h>
-#include <grub/types.h>
-#include <grub/misc.h>
+#include <grub/err.h>
+#include <grub/compiler.h>
struct grub_list
{
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 2cf74b5..c6cd456 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -25,34 +25,7 @@
#include <grub/symbol.h>
#include <grub/err.h>
#include <grub/i18n.h>
-
-/* GCC version checking borrowed from glibc. */
-#if defined(__GNUC__) && defined(__GNUC_MINOR__)
-# define GNUC_PREREQ(maj,min) \
- ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#else
-# define GNUC_PREREQ(maj,min) 0
-#endif
-
-/* Does this compiler support compile-time error attributes? */
-#if GNUC_PREREQ(4,3)
-# define ATTRIBUTE_ERROR(msg) \
- __attribute__ ((__error__ (msg)))
-#else
-# define ATTRIBUTE_ERROR(msg) __attribute__ ((noreturn))
-#endif
-
-#if GNUC_PREREQ(4,4)
-# define GNU_PRINTF gnu_printf
-#else
-# define GNU_PRINTF printf
-#endif
-
-#if GNUC_PREREQ(3,4)
-# define WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
-#else
-# define WARN_UNUSED_RESULT
-#endif
+#include <grub/compiler.h>
#define ALIGN_UP(addr, align) \
((addr + (typeof (addr)) align - 1) & ~((typeof (addr)) align - 1))
diff --git a/include/grub/procfs.h b/include/grub/procfs.h
index d393da7..8cc331d 100644
--- a/include/grub/procfs.h
+++ b/include/grub/procfs.h
@@ -20,6 +20,7 @@
#define GRUB_PROCFS_HEADER 1
#include <grub/list.h>
+#include <grub/types.h>
struct grub_procfs_entry
{
--
2.4.3

4
0458-Use-linux16-when-appropriate-880840.patch → 0027-Use-linux16-when-appropriate-880840.patch
View File

@ -1,7 +1,7 @@
From 6c42254d5f033b24b859a8a6a82720e99a62887a Mon Sep 17 00:00:00 2001
From 8a516f33193744bbe67198fe03cadf1a67129630 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 28 Oct 2013 10:05:07 -0400
Subject: [PATCH 458/506] Use linux16 when appropriate (#880840)
Subject: [PATCH 27/74] Use linux16 when appropriate (#880840)
The kernel group really would prefer that we use the 16 bit entry point
on x86 bios machines.

61
0027-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch
View File

@ -1,61 +0,0 @@
From 6c519b5c6c95a0d486c548157b2af3d4fb4e0bbe Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 18 Jan 2014 19:26:40 +0100
Subject: [PATCH 027/506] * grub-core/commands/macbless.c: Rename FILE
and DIR to avoid conflicts.
Reported by: Andrey Borzenkov.
---
ChangeLog | 7 +++++++
grub-core/commands/macbless.c | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dad469b..9d1a3f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * grub-core/commands/macbless.c: Rename FILE and DIR to avoid
+ conflicts.
+
+ Reported by: Andrey Borzenkov.
+
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
* include/grub/misc.h: Move macros for compiler features to ...
diff --git a/grub-core/commands/macbless.c b/grub-core/commands/macbless.c
index c521083..4724edd 100644
--- a/grub-core/commands/macbless.c
+++ b/grub-core/commands/macbless.c
@@ -37,7 +37,7 @@ struct find_node_context
grub_uint64_t inode_found;
char *dirname;
enum
- { NONE, FILE, DIR } found;
+ { FOUND_NONE, FOUND_FILE, FOUND_DIR } found;
};
static int
@@ -53,7 +53,7 @@ find_inode (const char *filename,
&& grub_strcasecmp (ctx->dirname, filename) == 0)))
{
ctx->inode_found = info->inode;
- ctx->found = info->dir ? DIR : FILE;
+ ctx->found = info->dir ? FOUND_DIR : FOUND_FILE;
}
return 0;
}
@@ -175,7 +175,7 @@ grub_mac_bless_file (grub_device_t dev, const char *path_in, int intel)
grub_free (path);
return grub_mac_bless_inode (dev, (grub_uint32_t) ctx.inode_found,
- (ctx.found == DIR), intel);
+ (ctx.found == FOUND_DIR), intel);
}
static grub_err_t
--
2.4.3

4
0459-Enable-pager-by-default.-985860.patch → 0028-Enable-pager-by-default.-985860.patch
View File

@ -1,7 +1,7 @@
From 20bc510e42d5eb2a041242cf59ebcc31509c995a Mon Sep 17 00:00:00 2001
From 7a0a7f7efdbf856e53788782f0c8ce3e50f16acb Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 28 Oct 2013 10:09:27 -0400
Subject: [PATCH 459/506] Enable pager by default. (#985860)
Subject: [PATCH 28/74] Enable pager by default. (#985860)
Signed-off-by: Peter Jones <pjones@redhat.com>
---

39
0028-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch
View File

@ -1,39 +0,0 @@
From 6ba983559dcffa0fa69c7fc861b5a16b4877a92c Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Sat, 18 Jan 2014 19:41:15 +0100
Subject: [PATCH 028/506] * Makefile.util.def: Link grub-ofpathname with
zfs libs.
---
ChangeLog | 4 ++++
Makefile.util.def | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 9d1a3f0..edceb66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-01 Mike Gilbert <floppym@gentoo.org>
+
+ * Makefile.util.def: Link grub-ofpathname with zfs libs.
+
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/macbless.c: Rename FILE and DIR to avoid
diff --git a/Makefile.util.def b/Makefile.util.def
index 83df212..a286a89 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -384,7 +384,7 @@ program = {
ldadd = libgrubgcry.a;
ldadd = libgrubkern.a;
ldadd = grub-core/gnulib/libgnu.a;
- ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBGEOM)';
+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
};
program = {
--
2.4.3

4
0460-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch → 0029-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
View File

@ -1,7 +1,7 @@
From bc27879780659acd3d2d7ec192339fde52404b73 Mon Sep 17 00:00:00 2001
From 150668f7d02e0cc7e9f07c8c8ffc69763c796bea Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 28 Oct 2013 10:13:27 -0400
Subject: [PATCH 460/506] F10 doesn't work on serial, so don't tell the user to
Subject: [PATCH 29/74] F10 doesn't work on serial, so don't tell the user to
hit it (#987443)
Signed-off-by: Peter Jones <pjones@redhat.com>

42
0029-Makefile.am-default_payload.elf-Add-modules.patch
View File

@ -1,42 +0,0 @@
From 0b47c57ad62e314fac9c77cc17bdea032f945fca Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 18 Jan 2014 19:43:19 +0100
Subject: [PATCH 029/506] * Makefile.am (default_payload.elf): Add
modules multiboot cbmemc linux16 gzio echo help.
---
ChangeLog | 7 ++++++-
Makefile.am | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index edceb66..cff9386 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2014-01-01 Mike Gilbert <floppym@gentoo.org>
+2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * Makefile.am (default_payload.elf): Add modules
+ multiboot cbmemc linux16 gzio echo help.
+
+2014-01-18 Mike Gilbert <floppym@gentoo.org>
* Makefile.util.def: Link grub-ofpathname with zfs libs.
diff --git a/Makefile.am b/Makefile.am
index aa526f5..97c062d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -399,7 +399,7 @@ bootcheck: $(BOOTCHECKS)
if COND_i386_coreboot
default_payload.elf: grub-mkstandalone grub-mkimage
- pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos xfs ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
+ pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos xfs ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg
endif
windowsdir=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows
--
2.4.3

4
0461-Don-t-say-GNU-Linux-in-generated-menus.patch → 0030-Don-t-say-GNU-Linux-in-generated-menus.patch
View File

@ -1,7 +1,7 @@
From f6d0829f2743a4eefa3419672d24ef2258bb281b Mon Sep 17 00:00:00 2001
From a3400ba9c9969ec9c2447528a746dcc761aaf03f Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 14 Mar 2011 14:27:42 -0400
Subject: [PATCH 461/506] Don't say "GNU/Linux" in generated menus.
Subject: [PATCH 30/74] Don't say "GNU/Linux" in generated menus.
---
util/grub.d/10_linux.in | 4 ++--

55
0030-fix-removal-of-cpu-machine-links-on-mingw-msys.patch
View File

@ -1,55 +0,0 @@
From e0a850947f541e5078304699106f9f66a79e4151 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 18 Jan 2014 22:48:04 +0400
Subject: [PATCH 030/506] fix removal of {cpu,machine} links on mingw/msys
At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds,
but results in what looks like hard link. Subsequent "rm -f dir2" (e.g.
during second config.status invocation) fails. Check that we also can
remove link to directory.
Make it more clear in message that we are checking "ln -s".
---
ChangeLog | 5 +++++
acinclude.m4 | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cff9386..c3bfa9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * acinclude.m4 (grub_CHECK_LINK_DIR): Check that we can also remove
+ symbolic link to directory. It fails in Msys shell on Windows 2003.
+
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* Makefile.am (default_payload.elf): Add modules
diff --git a/acinclude.m4 b/acinclude.m4
index 32d5477..b2bb88d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -418,15 +418,15 @@ else
[fi]
])
-dnl Check if ln can handle directories properly (mingw).
+dnl Check if ln -s can handle directories properly (mingw).
AC_DEFUN([grub_CHECK_LINK_DIR],[
-AC_MSG_CHECKING([whether ln can handle directories properly])
+AC_MSG_CHECKING([whether ln -s can handle directories properly])
[mkdir testdir 2>/dev/null
case $srcdir in
[\\/$]* | ?:[\\/]* ) reldir=$srcdir/include/grub/util ;;
*) reldir=../$srcdir/include/grub/util ;;
esac
-if ln -s $reldir testdir/util 2>/dev/null ; then]
+if ln -s $reldir testdir/util 2>/dev/null && rm -f testdir/util 2>/dev/null ; then]
AC_MSG_RESULT([yes])
[link_dir=yes
else
--
2.4.3

4
0462-Don-t-draw-a-border-around-the-menu.patch → 0031-Don-t-draw-a-border-around-the-menu.patch
View File

@ -1,7 +1,7 @@
From b28ff92a87ac8d67c78b6ebf4d74ff781610d312 Mon Sep 17 00:00:00 2001
From f8a84b6c117a525e48711ae177501cb9b29f8c23 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Wed, 15 May 2013 16:47:33 -0400
Subject: [PATCH 462/506] Don't draw a border around the menu
Subject: [PATCH 31/74] Don't draw a border around the menu
It looks cleaner without it.
---

68
0031-grub-core-normal-main.c-read_config_file-Buffer-conf.patch
View File

@ -1,68 +0,0 @@
From 41155a57223e346b990a3d1b6708fa85351ab256 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 18 Jan 2014 19:54:09 +0100
Subject: [PATCH 031/506] * grub-core/normal/main.c (read_config_file):
Buffer config file. Reduces boot time.
---
ChangeLog | 5 +++++
grub-core/normal/main.c | 14 +++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c3bfa9f..c84f7e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * grub-core/normal/main.c (read_config_file): Buffer config file.
+ Reduces boot time.
+
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
* acinclude.m4 (grub_CHECK_LINK_DIR): Check that we can also remove
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index c36663f..3a926fc 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -32,6 +32,7 @@
#include <grub/i18n.h>
#include <grub/charset.h>
#include <grub/script_sh.h>
+#include <grub/bufio.h>
GRUB_MOD_LICENSE ("GPLv3+");
@@ -104,7 +105,7 @@ read_config_file_getline (char **line, int cont __attribute__ ((unused)),
static grub_menu_t
read_config_file (const char *config)
{
- grub_file_t file;
+ grub_file_t rawfile, file;
char *old_file = 0, *old_dir = 0;
char *config_dir, *ptr = 0;
const char *ctmp;
@@ -122,10 +123,17 @@ read_config_file (const char *config)
}
/* Try to open the config file. */
- file = grub_file_open (config);
- if (! file)
+ rawfile = grub_file_open (config);
+ if (! rawfile)
return 0;
+ file = grub_bufio_open (rawfile, 0);
+ if (! file)
+ {
+ grub_file_close (file);
+ return 0;
+ }
+
ctmp = grub_env_get ("config_file");
if (ctmp)
old_file = grub_strdup (ctmp);
--
2.4.3

4
0463-Use-the-standard-margin-for-the-timeout-string.patch → 0032-Use-the-standard-margin-for-the-timeout-string.patch
View File

@ -1,7 +1,7 @@
From 90dbbcfa9eeec55ba68b77b9bc16c369445ad809 Mon Sep 17 00:00:00 2001
From a46bec0098c8eb772c630d0aaa32d0eb86e00fa7 Mon Sep 17 00:00:00 2001
From: William Jon McCann <william.jon.mccann@gmail.com>
Date: Fri, 7 Jun 2013 10:52:32 -0400
Subject: [PATCH 463/506] Use the standard margin for the timeout string
Subject: [PATCH 32/74] Use the standard margin for the timeout string
So that it aligns with the other messages
---

40
0032-util-grub-install.c-Fix-a-typo.patch
View File

@ -1,40 +0,0 @@
From b204b718cc00432f18be861b8bf4342e50feef90 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 18 Jan 2014 20:02:51 +0100
Subject: [PATCH 032/506] * util/grub-install.c: Fix a typo.
---
ChangeLog | 4 ++++
util/grub-install.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index c84f7e7..9360345 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+ * util/grub-install.c: Fix a typo.
+
+2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
+
* grub-core/normal/main.c (read_config_file): Buffer config file.
Reduces boot time.
diff --git a/util/grub-install.c b/util/grub-install.c
index 4608b80..5903f34 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1259,7 +1259,7 @@ main (int argc, char *argv[])
if (!config.is_cryptodisk_enabled && have_cryptodisk)
grub_util_error (_("attempt to install to encrypted disk without cryptodisk enabled. "
- "Set `%s' in file `%s'."), "GRUB_ENABLE_CRYPTODISK=1",
+ "Set `%s' in file `%s'."), "GRUB_ENABLE_CRYPTODISK=y",
grub_util_get_config_filename ());
if (disk_module && grub_strcmp (disk_module, "ata") == 0)
--
2.4.3

4
0464-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch → 0033-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
View File

@ -1,7 +1,7 @@
From 9dc877744ea47b51b58e7a129e36c6d106302b94 Mon Sep 17 00:00:00 2001
From 72f5fd673e63802ff829570395d9c7d950b30f52 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 10 Jan 2014 09:36:24 -0500
Subject: [PATCH 464/506] Fix grub_script_execute_sourcecode() usage on ppc.
Subject: [PATCH 33/74] Fix grub_script_execute_sourcecode() usage on ppc.
593e430c made it not take the extra argc/argv that this code still
passes it.

91
0033-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch
View File

@ -1,91 +0,0 @@
From 015045471ed815fc45ba9fba52cb34582d129a96 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 18 Jan 2014 23:15:40 +0400
Subject: [PATCH 033/506] use MODULE_FILES for genemuinit* instead of MOD_FILES
MinGW native nm does not support ELF binaries.
---
ChangeLog | 8 ++++++++
grub-core/Makefile.am | 8 ++++----
grub-core/genemuinit.sh | 4 ++--
grub-core/genemuinitheader.sh | 4 ++--
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9360345..4688ff4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * grub-core/Makefile.am: Build grub_emu_init.[ch] from MODULE_FILES
+ instead of MOD_FILES.
+ * grub-core/genemuinit.sh: Simplify stripping of suffix so it works
+ both with and without .exe.
+ * grub-core/genemuinitheader.sh: Same.
+
2014-01-18 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-install.c: Fix a typo.
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 826b3dd..5c087c8 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -294,12 +294,12 @@ grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h
kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h
grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h
-grub_emu_init.h: genemuinitheader.sh $(MOD_FILES)
- rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(TARGET_NM) > $@
+grub_emu_init.h: genemuinitheader.sh $(MODULE_FILES)
+ rm -f $@; echo $(MODULE_FILES) | sh $(srcdir)/genemuinitheader.sh $(TARGET_NM) > $@
CLEANFILES += grub_emu_init.h
-grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES)
- rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(TARGET_NM) > $@
+grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MODULE_FILES)
+ rm -f $@; echo $(MODULE_FILES) | sh $(srcdir)/genemuinit.sh $(TARGET_NM) > $@
CLEANFILES += grub_emu_init.c
endif
diff --git a/grub-core/genemuinit.sh b/grub-core/genemuinit.sh
index 45c15ec..8c6bb1c 100644
--- a/grub-core/genemuinit.sh
+++ b/grub-core/genemuinit.sh
@@ -47,7 +47,7 @@ EOF
read mods
for line in $mods; do
if ${nm} --defined-only -P -p ${line} | grep grub_mod_init > /dev/null; then
- echo "grub_${line}_init ();" | sed 's,\.mod,,g;'
+ echo "grub_${line%%.*}_init ();"
fi
done
@@ -63,7 +63,7 @@ EOF
for line in $mods; do
if ${nm} --defined-only -P -p ${line} | grep grub_mod_fini > /dev/null; then
- echo "grub_${line}_fini ();" | sed 's,\.mod,,g;'
+ echo "grub_${line%%.*}_fini ();"
fi
done
diff --git a/grub-core/genemuinitheader.sh b/grub-core/genemuinitheader.sh
index 6b83f59..a99a15d 100644
--- a/grub-core/genemuinitheader.sh
+++ b/grub-core/genemuinitheader.sh
@@ -44,9 +44,9 @@ EOF
read mods
for line in $mods; do
if ${nm} --defined-only -P -p ${line} | grep grub_mod_init > /dev/null; then
- echo "void grub_${line}_init (void);" | sed 's,\.mod,,g;'
+ echo "void grub_${line%%.*}_init (void);"
fi
if ${nm} --defined-only -P -p ${line} | grep grub_mod_fini > /dev/null; then
- echo "void grub_${line}_fini (void);" | sed 's,\.mod,,g;'
+ echo "void grub_${line%%.*}_fini (void);"
fi
done
--
2.4.3

8
0465-Add-.eh_frame-to-list-of-relocations-stripped.patch → 0034-Add-.eh_frame-to-list-of-relocations-stripped.patch
View File

@ -1,17 +1,17 @@
From 1b067956364d2860bc6adae9e6c782116030a356 Mon Sep 17 00:00:00 2001
From cbe42c54d476e6dfb133028c3b9c2d56821bf449 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
Date: Mon, 13 Jan 2014 21:50:59 -0500
Subject: [PATCH 465/506] Add .eh_frame to list of relocations stripped
Subject: [PATCH 34/74] Add .eh_frame to list of relocations stripped
---
conf/Makefile.common | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 96e58c9..8aab824 100644
index fcb8d2e..afabfe8 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
@@ -41,7 +41,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding
LDFLAGS_KERNEL = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC)
CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM) -DGRUB_KERNEL=1
CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)

58
0034-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch
View File

@ -1,58 +0,0 @@
From 049f63824c654ca10dc9073decc139ccd2f9a06b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 17 Jan 2014 02:28:46 +0000
Subject: [PATCH 034/506] Ignore EPERM when modifying kern.geom.debugflags
Many tests fail when run as a non-root user on FreeBSD. The failures
all amount to an inability to open files using grub_util_fd_open,
because we cannot set the kern.geom.debugflags sysctl. This sysctl is
indeed important to allow us to do such things as installing GRUB to the
MBR, but if we need to do that and can't then we will get an error
later. Enforcing it here is unnecessary and prevents otherwise
perfectly reasonable operations.
---
ChangeLog | 7 +++++++
grub-core/osdep/freebsd/hostdisk.c | 12 ++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4688ff4..10abfe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-19 Colin Watson <cjwatson@ubuntu.com>
+
+ * grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Ignore
+ EPERM when modifying kern.geom.debugflags. It is only a problem for
+ such things as installing GRUB to the MBR, in which case there'll be
+ an error later anyway, not for opening files during tests.
+
2014-01-18 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/Makefile.am: Build grub_emu_init.[ch] from MODULE_FILES
diff --git a/grub-core/osdep/freebsd/hostdisk.c b/grub-core/osdep/freebsd/hostdisk.c
index eb202dc..6145d07 100644
--- a/grub-core/osdep/freebsd/hostdisk.c
+++ b/grub-core/osdep/freebsd/hostdisk.c
@@ -102,8 +102,16 @@ grub_util_fd_open (const char *os_dev, int flags)
if (! (sysctl_oldflags & 0x10)
&& sysctlbyname ("kern.geom.debugflags", NULL , 0, &sysctl_flags, sysctl_size))
{
- grub_error (GRUB_ERR_BAD_DEVICE, "cannot set flags of sysctl kern.geom.debugflags");
- return GRUB_UTIL_FD_INVALID;
+ if (errno == EPERM)
+ /* Running as an unprivileged user; don't worry about restoring
+ flags, although if we try to write to anything interesting such
+ as the MBR then we may fail later. */
+ sysctl_oldflags = 0x10;
+ else
+ {
+ grub_error (GRUB_ERR_BAD_DEVICE, "cannot set flags of sysctl kern.geom.debugflags");
+ return GRUB_UTIL_FD_INVALID;
+ }
}
ret = open (os_dev, flags, S_IROTH | S_IRGRP | S_IRUSR | S_IWUSR);
--
2.4.3

4
0466-Make-10_linux-work-with-our-changes-for-linux16-and-.patch → 0035-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
View File

@ -1,7 +1,7 @@
From 7dbfa43dfad616a38a98ff301dcd93a6feef77f8 Mon Sep 17 00:00:00 2001
From 059cfdc310a6c0456358553619b47c6bf6f2e062 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 14 Jan 2014 13:12:23 -0500
Subject: [PATCH 466/506] Make 10_linux work with our changes for linux16 and
Subject: [PATCH 35/74] Make 10_linux work with our changes for linux16 and
linuxefi on aarch64
Signed-off-by: Peter Jones <pjones@redhat.com>

52
0035-change-stop-condition-to-avoid-infinite-loops.patch
View File

@ -1,52 +0,0 @@
From d99d2f84166b0f60673d5c0714605a153946c0fc Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 21 Jan 2014 10:49:39 -0200
Subject: [PATCH 035/506] change stop condition to avoid infinite loops
In net/net.c there is a while (1) that only exits if there is a stop
condition and more then 10 packages or if there is no package received.
If GRUB is idle and enter in this loop, the only condition to leave is
if it doesn't have incoming packages. In a network with heavy traffic
this never happens.
---
ChangeLog | 12 ++++++++++++
grub-core/net/net.c | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 10abfe2..f69d8c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-01-21 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+
+ * grub-core/net/net.c (receive_packets): Change stop condition to avoid
+ infinite loops.
+
+ In net/net.c there is a while (1) that only exits if there is a stop
+ condition and more then 10 packages or if there is no package received.
+
+ If GRUB is idle and enter in this loop, the only condition to leave is
+ if it doesn't have incoming packages. In a network with heavy traffic
+ this never happens.
+
2014-01-19 Colin Watson <cjwatson@ubuntu.com>
* grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Ignore
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 0e57e93..56355f3 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1453,7 +1453,7 @@ receive_packets (struct grub_net_card *card, int *stop_condition)
}
card->opened = 1;
}
- while (1)
+ while (received < 100)
{
/* Maybe should be better have a fixed number of packets for each card
and just mark them as used and not used. */
--
2.4.3

4
0467-Don-t-print-during-fdt-loading-method.patch → 0036-Don-t-print-during-fdt-loading-method.patch
View File

@ -1,7 +1,7 @@
From 8a0557e9e05f6e6de54536d3ff4da789dbc3854e Mon Sep 17 00:00:00 2001
From 8eb74c470b7839cf8516aa986aff4a251b9a41a4 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 14 Jan 2014 16:15:46 -0500
Subject: [PATCH 467/506] Don't print during fdt loading method.
Subject: [PATCH 36/74] Don't print during fdt loading method.
Signed-off-by: Peter Jones <pjones@redhat.com>
---

111
0036-increase-network-try-interval-gradually.patch
View File

@ -1,111 +0,0 @@
From 6f65e36cc4f92fe40672181eccf12eac4afb6738 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Tue, 21 Jan 2014 11:03:51 -0200
Subject: [PATCH 036/506] increase network try interval gradually
* grub-core/net/arp.c (grub_net_arp_send_request): Increase network try
interval gradually.
* grub-core/net/icmp6.c (grub_net_icmp6_send_request): Likewise.
* grub-core/net/net.c (grub_net_fs_read_real): Likewise.
* grub-core/net/tftp.c (tftp_open): Likewise.
* include/grub/net.h (GRUB_NET_INTERVAL_ADDITION): New define.
---
ChangeLog | 9 +++++++++
grub-core/net/arp.c | 3 ++-
grub-core/net/icmp6.c | 3 ++-
grub-core/net/net.c | 5 +++--
grub-core/net/tftp.c | 3 ++-
include/grub/net.h | 1 +
6 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f69d8c7..f5618a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2014-01-21 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+ * grub-core/net/arp.c (grub_net_arp_send_request): Increase network try
+ interval gradually.
+ * grub-core/net/icmp6.c (grub_net_icmp6_send_request): Likewise.
+ * grub-core/net/net.c (grub_net_fs_read_real): Likewise.
+ * grub-core/net/tftp.c (tftp_open): Likewise.
+ * include/grub/net.h (GRUB_NET_INTERVAL_ADDITION): New define.
+
+2014-01-21 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+
* grub-core/net/net.c (receive_packets): Change stop condition to avoid
infinite loops.
diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c
index e92c7e7..d62d0cc 100644
--- a/grub-core/net/arp.c
+++ b/grub-core/net/arp.c
@@ -110,7 +110,8 @@ grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
return GRUB_ERR_NONE;
pending_req = proto_addr->ipv4;
have_pending = 0;
- grub_net_poll_cards (GRUB_NET_INTERVAL, &have_pending);
+ grub_net_poll_cards (GRUB_NET_INTERVAL + (i * GRUB_NET_INTERVAL_ADDITION),
+ &have_pending);
if (grub_net_link_layer_resolve_check (inf, proto_addr))
return GRUB_ERR_NONE;
nb.data = nbd;
diff --git a/grub-core/net/icmp6.c b/grub-core/net/icmp6.c
index 2741e6f..bbc9020 100644
--- a/grub-core/net/icmp6.c
+++ b/grub-core/net/icmp6.c
@@ -518,7 +518,8 @@ grub_net_icmp6_send_request (struct grub_net_network_level_interface *inf,
{
if (grub_net_link_layer_resolve_check (inf, proto_addr))
break;
- grub_net_poll_cards (GRUB_NET_INTERVAL, 0);
+ grub_net_poll_cards (GRUB_NET_INTERVAL + (i * GRUB_NET_INTERVAL_ADDITION),
+ 0);
if (grub_net_link_layer_resolve_check (inf, proto_addr))
break;
nb->data = nbd;
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 56355f3..1521d8d 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1558,8 +1558,9 @@ grub_net_fs_read_real (grub_file_t file, char *buf, grub_size_t len)
if (!net->eof)
{
try++;
- grub_net_poll_cards (GRUB_NET_INTERVAL, &net->stall);
- }
+ grub_net_poll_cards (GRUB_NET_INTERVAL +
+ (try * GRUB_NET_INTERVAL_ADDITION), &net->stall);
+ }
else
return total;
}
diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
index 9c489f1..5173614 100644
--- a/grub-core/net/tftp.c
+++ b/grub-core/net/tftp.c
@@ -398,7 +398,8 @@ tftp_open (struct grub_file *file, const char *filename)
destroy_pq (data);
return err;
}
- grub_net_poll_cards (GRUB_NET_INTERVAL, &data->have_oack);
+ grub_net_poll_cards (GRUB_NET_INTERVAL + (i * GRUB_NET_INTERVAL_ADDITION),
+ &data->have_oack);
if (data->have_oack)
break;
}
diff --git a/include/grub/net.h b/include/grub/net.h
index de6259e..0e0a605 100644
--- a/include/grub/net.h
+++ b/include/grub/net.h
@@ -532,5 +532,6 @@ extern char *grub_net_default_server;
#define GRUB_NET_TRIES 40
#define GRUB_NET_INTERVAL 400
+#define GRUB_NET_INTERVAL_ADDITION 20
#endif /* ! GRUB_NET_HEADER */
--
2.4.3

4
0468-Honor-a-symlink-when-generating-configuration-by-gru.patch → 0037-Honor-a-symlink-when-generating-configuration-by-gru.patch
View File

@ -1,7 +1,7 @@
From f8368056ed2433473c563104b14d89e547db9b9a Mon Sep 17 00:00:00 2001
From f81575bfb4a5e65950a7abc2ee5212525f86ad22 Mon Sep 17 00:00:00 2001
From: Marcel Kolaja <mkolaja@redhat.com>
Date: Tue, 21 Jan 2014 10:57:08 -0500
Subject: [PATCH 468/506] Honor a symlink when generating configuration by
Subject: [PATCH 37/74] Honor a symlink when generating configuration by
grub2-mkconfig
Honor a symlink when generating configuration by grub2-mkconfig, so that

39
0037-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
View File

@ -1,39 +0,0 @@
From 36387ece6be1b912c778d4a5f068801f99385fa2 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Tue, 21 Jan 2014 19:29:33 +0400
Subject: [PATCH 037/506] look for DejaVu also in /usr/share/fonts/truetype
It is installed in this path on openSUSE.
---
ChangeLog | 4 ++++
configure.ac | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index f5618a6..9f5d81d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-21 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * configure.ac: Look for DejaVuSans also in /usr/share/fonts/truetype.
+
2014-01-21 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
* grub-core/net/arp.c (grub_net_arp_send_request): Increase network try
diff --git a/configure.ac b/configure.ac
index cf3de3b..120263e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1389,7 +1389,7 @@ fi
if test x"$starfield_excuse" = x; then
for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu; do
+ for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do
if test -f "$dir/DejaVuSans.$ext"; then
DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext"
break 2
--
2.4.3

4
0469-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch → 0038-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
View File

@ -1,7 +1,7 @@
From 77911e9f883dd246f2adf104d00db7201fe0c8dc Mon Sep 17 00:00:00 2001
From 2f7da057da45a039313a5a905f58f45f7837da6e Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 30 Jun 2014 14:16:46 -0400
Subject: [PATCH 469/506] Don't munge raw spaces when we're doing our cmdline
Subject: [PATCH 38/74] Don't munge raw spaces when we're doing our cmdline
escaping (#923374)
Signed-off-by: Peter Jones <pjones@redhat.com>

37
0038-Show-detected-path-to-DejaVuSans-in-configure-summar.patch
View File

@ -1,37 +0,0 @@
From 443b3222621b6df1e5e01bd6fb2c496568065f92 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Tue, 21 Jan 2014 19:41:11 +0400
Subject: [PATCH 038/506] Show detected path to DejaVuSans in configure summary
---
ChangeLog | 1 +
configure.ac | 1 +
2 files changed, 2 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 9f5d81d..3ba57ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2014-01-21 Andrey Borzenkov <arvidjaar@gmail.com>
* configure.ac: Look for DejaVuSans also in /usr/share/fonts/truetype.
+ Show detected font path in summary.
2014-01-21 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
diff --git a/configure.ac b/configure.ac
index 120263e..8888c2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1816,6 +1816,7 @@ echo grub-mount: No "($grub_mount_excuse)"
fi
if [ x"$starfield_excuse" = x ]; then
echo starfield theme: Yes
+echo With DejaVuSans font from $DJVU_FONT_SOURCE
else
echo starfield theme: No "($starfield_excuse)"
fi
--
2.4.3

4
0470-Don-t-require-a-password-to-boot-entries-generated-b.patch → 0039-Don-t-require-a-password-to-boot-entries-generated-b.patch
View File

@ -1,7 +1,7 @@
From 5a5d16211c91e4d650fab56c5035b7eb346a9e0f Mon Sep 17 00:00:00 2001
From 7a8693b352d9194d96bc02e9297284a5fabf6de5 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 11 Feb 2014 11:14:50 -0500
Subject: [PATCH 470/506] Don't require a password to boot entries generated by
Subject: [PATCH 39/74] Don't require a password to boot entries generated by
grub-mkconfig.
When we set a password, we just want that to mean you can't /edit/ an entry.

62
0039-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch
View File

@ -1,62 +0,0 @@
From eec4237a3265b024cc97d3cd287bdea7cd187f48 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Tue, 21 Jan 2014 20:54:09 +0400
Subject: [PATCH 039/506] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime
files
Not all toolkits provide static libraries. This patch enables creation of self
contained distribution that does not require pre-existing runtime libraries.
Intended usage is
export GRUB_WINDOWS_EXTRA_DIST="/path/to/liblzma.dll /path/to/libintl.dll"
make
make windowszip
As those libraries and locations are dependent on toolchain in use, trying
to autodetect them is likely impossible. So just provide a simple way to
package everything in one step.
Also remove $(windowsdir) after ZIP was created same as other "make dist"
targets.
---
ChangeLog | 5 +++++
Makefile.am | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 3ba57ae..1ede370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-01-21 Andrey Borzenkov <arvidjaar@gmail.com>
+ * Makefile.am: Allow adding extra files to generated Windows ZIP
+ archive by setting GRUB_WINDOWS_EXTRA_DIST.
+
+2014-01-21 Andrey Borzenkov <arvidjaar@gmail.com>
+
* configure.ac: Look for DejaVuSans also in /usr/share/fonts/truetype.
Show detected font path in summary.
diff --git a/Makefile.am b/Makefile.am
index 97c062d..f02ae0a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -420,10 +420,14 @@ windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
for x in $(starfield_DATA); do \
cp -fp $$x $(windowsdir)/themes/starfield/$$(basename $$x); \
done
+ for x in $(GRUB_WINDOWS_EXTRA_DIST); do \
+ cp -fp $$x $(windowsdir); \
+ done
windowszip=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows.zip
windowszip: windowsdir
test -f $(windowszip) && rm $(windowszip) || true
zip -r $(windowszip) $(windowsdir)
+ rm -rf $(windowsdir)
EXTRA_DIST += linguas.sh
--
2.4.3

4
0471-Don-t-emit-Booting-.-message.patch → 0040-Don-t-emit-Booting-.-message.patch
View File

@ -1,7 +1,7 @@
From 30f5402fabe385931871a3277db5ce62f137af72 Mon Sep 17 00:00:00 2001
From 66cfcf6a84e2b87db6eafeba1b950792c6830817 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 18 Feb 2014 09:37:49 -0500
Subject: [PATCH 471/506] Don't emit "Booting ..." message.
Subject: [PATCH 40/74] Don't emit "Booting ..." message.
UI team still hates this stuff, so we're disabling it for RHEL 7.

38
0040-util-grub-install.c-write_to_disk-Add-an-info-messag.patch
View File

@ -1,38 +0,0 @@
From d08059309f83388312b7f3e533f4b70d803f7bda Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 23 Jan 2014 12:05:36 +0000
Subject: [PATCH 040/506] * util/grub-install.c (write_to_disk): Add an info
message.
---
ChangeLog | 4 ++++
util/grub-install.c | 1 +
2 files changed, 5 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 1ede370..eee8e78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-23 Colin Watson <cjwatson@ubuntu.com>
+
+ * util/grub-install.c (write_to_disk): Add an info message.
+
2014-01-21 Andrey Borzenkov <arvidjaar@gmail.com>
* Makefile.am: Allow adding extra files to generated Windows ZIP
diff --git a/util/grub-install.c b/util/grub-install.c
index 5903f34..787dc90 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -675,6 +675,7 @@ write_to_disk (grub_device_t dev, const char *fn)
core_img = grub_util_read_image (fn);
+ grub_util_info ("writing `%s' to `%s'", fn, dev->disk->name);
err = grub_disk_write (dev->disk, 0, 0,
core_size, core_img);
free (core_img);
--
2.4.3

8
0472-Make-CTRL-and-ALT-keys-work-as-expected-on-EFI-syste.patch → 0041-Make-CTRL-and-ALT-keys-work-as-expected-on-EFI-syste.patch
View File

@ -1,8 +1,8 @@
From e5accb37d101774583d94d0c8051e464c45e29c6 Mon Sep 17 00:00:00 2001
From 2eeb9c48e4dfd7cd22a214a9cb5dd37094278240 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Mon, 3 Feb 2014 15:21:46 -0500
Subject: [PATCH 472/506] Make CTRL and ALT keys work as expected on EFI
systems (version 5).
Subject: [PATCH 41/74] Make CTRL and ALT keys work as expected on EFI systems
(version 5).
This is version 4.
@ -210,7 +210,7 @@ index a37eb84..677eab5 100644
void
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index e5dd543..1423403 100644
index 1a5e38c..029ee92 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -111,7 +111,7 @@

109
0041-util-grub-install.c-List-available-targets.patch
View File

@ -1,109 +0,0 @@
From 95cd131ea0085ce16a4f2bfabc22d83548fc85cf Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 24 Jan 2014 18:09:25 +0100
Subject: [PATCH 041/506] * util/grub-install.c: List available targets.
---
ChangeLog | 4 ++++
include/grub/util/install.h | 2 ++
util/grub-install-common.c | 30 ++++++++++++++++++++++++++++++
util/grub-install.c | 10 ++++++++--
4 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eee8e78..20e8baa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-24 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * util/grub-install.c: List available targets.
+
2014-01-23 Colin Watson <cjwatson@ubuntu.com>
* util/grub-install.c (write_to_disk): Add an info message.
diff --git a/include/grub/util/install.h b/include/grub/util/install.h
index bc987aa..aedcd29 100644
--- a/include/grub/util/install.h
+++ b/include/grub/util/install.h
@@ -138,6 +138,8 @@ grub_install_get_platform_cpu (enum grub_install_plat platid);
const char *
grub_install_get_platform_platform (enum grub_install_plat platid);
+char *
+grub_install_get_platforms_string (void);
typedef enum {
GRUB_COMPRESSION_AUTO,
diff --git a/util/grub-install-common.c b/util/grub-install-common.c
index 6ea0a8e..c8bedcb 100644
--- a/util/grub-install-common.c
+++ b/util/grub-install-common.c
@@ -668,6 +668,36 @@ static struct
};
char *
+grub_install_get_platforms_string (void)
+{
+ char **arr = xmalloc (sizeof (char *) * ARRAY_SIZE (platforms));
+ int platform_strins_len = 0;
+ char *platforms_string;
+ char *ptr;
+ unsigned i;
+ for (i = 0; i < ARRAY_SIZE (platforms); i++)
+ {
+ arr[i] = xasprintf ("%s-%s", platforms[i].cpu,
+ platforms[i].platform);
+ platform_strins_len += strlen (arr[i]) + 2;
+ }
+ ptr = platforms_string = xmalloc (platform_strins_len);
+ qsort (arr, ARRAY_SIZE (platforms), sizeof (char *), grub_qsort_strcmp);
+ for (i = 0; i < ARRAY_SIZE (platforms); i++)
+ {
+ strcpy (ptr, arr[i]);
+ ptr += strlen (arr[i]);
+ *ptr++ = ',';
+ *ptr++ = ' ';
+ free (arr[i]);
+ }
+ ptr[-2] = 0;
+ free (arr);
+
+ return platforms_string;
+}
+
+char *
grub_install_get_platform_name (enum grub_install_plat platid)
{
return xasprintf ("%s-%s", platforms[platid].cpu,
diff --git a/util/grub-install.c b/util/grub-install.c
index 787dc90..2e6226a 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -256,7 +256,7 @@ static struct argp_option options[] = {
OPTION_HIDDEN, 0, 2},
{"target", OPTION_TARGET, N_("TARGET"),
/* TRANSLATORS: "TARGET" as in "target platform". */
- 0, N_("install GRUB for TARGET platform [default=%s]"), 2},
+ 0, N_("install GRUB for TARGET platform [default=%s]; available targets: %s"), 2},
{"grub-setup", OPTION_SETUP, "FILE", OPTION_HIDDEN, 0, 2},
{"grub-mkrelpath", OPTION_MKRELPATH, "FILE", OPTION_HIDDEN, 0, 2},
{"grub-mkdevicemap", OPTION_MKDEVICEMAP, "FILE", OPTION_HIDDEN, 0, 2},
@@ -340,7 +340,13 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
case OPTION_BOOT_DIRECTORY:
return xasprintf (text, GRUB_DIR_NAME, GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME);
case OPTION_TARGET:
- return xasprintf (text, get_default_platform ());
+ {
+ char *plats = grub_install_get_platforms_string ();
+ char *ret;
+ ret = xasprintf (text, get_default_platform (), plats);
+ free (plats);
+ return ret;
+ }
case ARGP_KEY_HELP_POST_DOC:
return xasprintf (text, program_name, GRUB_BOOT_DIR_NAME "/" GRUB_DIR_NAME);
default:
--
2.4.3

78
0042-Fix-several-translatable-strings.patch
View File

@ -1,78 +0,0 @@
From 61c8482b2097dfc08d76c36a1087bc3d243f4db1 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 24 Jan 2014 18:20:27 +0100
Subject: [PATCH 042/506] Fix several translatable strings.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Suggested by: D. Prévot.
---
ChangeLog | 6 ++++++
grub-core/commands/syslinuxcfg.c | 2 +-
grub-core/loader/arm64/linux.c | 2 +-
util/grub-syslinux2cfg.c | 4 ++--
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 20e8baa..e149d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2014-01-24 Vladimir Serbinenko <phcoder@gmail.com>
+ Fix several translatable strings.
+
+ Suggested by: D. Prévot.
+
+2014-01-24 Vladimir Serbinenko <phcoder@gmail.com>
+
* util/grub-install.c: List available targets.
2014-01-23 Colin Watson <cjwatson@ubuntu.com>
diff --git a/grub-core/commands/syslinuxcfg.c b/grub-core/commands/syslinuxcfg.c
index a4bfc40..00ae113 100644
--- a/grub-core/commands/syslinuxcfg.c
+++ b/grub-core/commands/syslinuxcfg.c
@@ -50,7 +50,7 @@ static const struct grub_arg_option options[] =
N_("root directory of the syslinux disk [default=/]."),
N_("DIR"), ARG_TYPE_STRING},
{"cwd", 'c', 0,
- N_("current directory of the syslinux [default is parent directory of input file]."),
+ N_("current directory of syslinux [default is parent directory of input file]."),
N_("DIR"), ARG_TYPE_STRING},
{"isolinux", 'i', 0, N_("assume input is an isolinux configuration file."), 0, 0},
{"pxelinux", 'p', 0, N_("assume input is a pxelinux configuration file."), 0, 0},
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
index 75ad871..65129c2 100644
--- a/grub-core/loader/arm64/linux.c
+++ b/grub-core/loader/arm64/linux.c
@@ -120,7 +120,7 @@ check_kernel (struct grub_arm64_linux_kernel_header *lh)
if ((lh->code0 & 0xffff) != GRUB_EFI_PE_MAGIC)
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
- N_("plain Image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));
+ N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));
grub_dprintf ("linux", "UEFI stub kernel:\n");
grub_dprintf ("linux", "text_offset = 0x%012llx\n",
diff --git a/util/grub-syslinux2cfg.c b/util/grub-syslinux2cfg.c
index 5e944c2..f4fda6d 100644
--- a/util/grub-syslinux2cfg.c
+++ b/util/grub-syslinux2cfg.c
@@ -66,10 +66,10 @@ static struct argp_option options[] = {
N_("root directory of the syslinux disk [default=/]."), 0},
{"target-cwd", 'T', N_("DIR"), 0,
N_(
- "current directory of the syslinux as it will be seen on runtime [default is parent directory of input file]."
+ "current directory of syslinux as it will be seen on runtime [default is parent directory of input file]."
), 0},
{"cwd", 'c', N_("DIR"), 0,
- N_("current directory of the syslinux [default is parent directory of input file]."), 0},
+ N_("current directory of syslinux [default is parent directory of input file]."), 0},
{"output", 'o', N_("FILE"), 0, N_("write output to FILE [default=stdout]."), 0},
{"isolinux", 'i', 0, 0, N_("assume input is an isolinux configuration file."), 0},
--
2.4.3

6
0473-May-as-well-try-it.patch → 0042-May-as-well-try-it.patch
View File

@ -1,7 +1,7 @@
From 8b463a745e6c58e679f1a9869b55f441f038654b Mon Sep 17 00:00:00 2001
From 41bab5e877a3f71232a6be47b5bc210e46f15442 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 4 Mar 2014 11:00:23 -0500
Subject: [PATCH 473/506] May as well try it.
Subject: [PATCH 42/74] May as well try it.
---
conf/Makefile.extra-dist | 1 -
@ -133,7 +133,7 @@ index ea6b9df..9e9a20c 100644
EXTRA_DIST += docs/grub.cfg
EXTRA_DIST += docs/osdetect.cfg
diff --git a/configure.ac b/configure.ac
index fd8a62e..6275310 100644
index e54b9df..357c94e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,29 @@ grub_TRANSFORM([grub-set-default])

75
0043-do-not-set-default-prefix-in-grub-mkimage.patch
View File

@ -1,75 +0,0 @@
From 1440b7ebae47e1cb710e920bec9d88c4d75ff432 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 25 Jan 2014 19:54:51 +0400
Subject: [PATCH 043/506] do not set default prefix in grub-mkimage
Default prefix is likely wrong on Unix and completely wrong on Windows.
Let caller set it explicitly to avoid any ambiguity.
---
ChangeLog | 4 ++++
util/grub-mkimage.c | 16 +++++++++++-----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e149d8e..b405b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-25 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * util/grub-mkimage.c: Make prefix argument mandatory.
+
2014-01-24 Vladimir Serbinenko <phcoder@gmail.com>
Fix several translatable strings.
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index a2bd4c1..1e0bcf1 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -64,7 +64,7 @@ static struct argp_option options[] = {
{"directory", 'd', N_("DIR"), 0,
/* TRANSLATORS: platform here isn't identifier. It can be translated. */
N_("use images and modules under DIR [default=%s/<platform>]"), 0},
- {"prefix", 'p', N_("DIR"), 0, N_("set prefix directory [default=%s]"), 0},
+ {"prefix", 'p', N_("DIR"), 0, N_("set prefix directory"), 0},
{"memdisk", 'm', N_("FILE"), 0,
/* TRANSLATORS: "memdisk" here isn't an identifier, it can be translated.
"embed" is a verb (command description). "*/
@@ -93,8 +93,6 @@ help_filter (int key, const char *text, void *input __attribute__ ((unused)))
{
case 'd':
return xasprintf (text, grub_util_get_pkglibdir ());
- case 'p':
- return xasprintf (text, DEFAULT_DIRECTORY);
case 'O':
{
char *formats = grub_install_get_image_targets_string (), *ret;
@@ -268,6 +266,15 @@ main (int argc, char *argv[])
exit(1);
}
+ if (!arguments.prefix)
+ {
+ char *program = xstrdup(program_name);
+ printf ("%s\n", _("Prefix not specified (use the -p option)."));
+ argp_help (&argp, stderr, ARGP_HELP_STD_USAGE, program);
+ free (program);
+ exit(1);
+ }
+
if (arguments.output)
{
fp = grub_util_fopen (arguments.output, "wb");
@@ -287,8 +294,7 @@ main (int argc, char *argv[])
strcpy (ptr, dn);
}
- grub_install_generate_image (arguments.dir,
- arguments.prefix ? : DEFAULT_DIRECTORY, fp,
+ grub_install_generate_image (arguments.dir, arguments.prefix, fp,
arguments.output, arguments.modules,
arguments.memdisk, arguments.pubkeys,
arguments.npubkeys, arguments.config,
--
2.4.3

4
0474-use-fw_path-prefix-when-fallback-searching-for-grub-.patch → 0043-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
View File

@ -1,7 +1,7 @@
From c346d135db33d9be45a187f991a80c2a940c066d Mon Sep 17 00:00:00 2001
From 8af32e8379ab56a1a2feb422aa4cc0cb8c640684 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
Date: Wed, 19 Feb 2014 15:58:43 -0500
Subject: [PATCH 474/506] use fw_path prefix when fallback searching for grub
Subject: [PATCH 43/74] use fw_path prefix when fallback searching for grub
config
When PXE booting via UEFI firmware, grub was searching for grub.cfg

5
0475-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch → 0044-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
View File

@ -1,8 +1,7 @@
From c0c97aabd80d0bad57f325e8c0c1eed923752422 Mon Sep 17 00:00:00 2001
From a57d117e93a7286b2370f8531a24be61e56bcd1e Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 6 Mar 2014 11:51:33 -0500
Subject: [PATCH 475/506] Try mac/guid/etc before grub.cfg on tftp config
files.
Subject: [PATCH 44/74] Try mac/guid/etc before grub.cfg on tftp config files.
Signed-off-by: Peter Jones <pjones@redhat.com>
---

108
0044-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch
View File

@ -1,108 +0,0 @@
From 5ae584c0b0c64b445c0820037d74058595133af3 Mon Sep 17 00:00:00 2001
From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 25 Jan 2014 21:49:41 +0400
Subject: [PATCH 044/506] fix Mingw W64-32 cross compile failure due to printf
redefinition in libintl.h
In file included from util/misc.c:36:0:
./include/grub/emu/misc.h:56:1: error: 'libintl_printf' is an unrecognized format function type [-Werror=format=]
char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) WARN_UNUSED_RESULT;
^
./include/grub/emu/misc.h:58:1: error: 'libintl_printf' is an unrecognized format function type [-Werror=format=]
The reason is libintl.h which redefines printf as libintl_printf. The problem
is not present in native MinGW build which avoids redefinition. Use
(format (__printf__) instead which is valid replacement in GCC.
v2: add grub-core/lib/libgcrypt/src/g10lib.h
v3: modify g10lib.h during import
---
ChangeLog | 9 +++++++++
include/grub/crypto.h | 2 +-
include/grub/emu/misc.h | 8 ++++----
include/grub/err.h | 2 +-
util/import_gcry.py | 6 ++++++
5 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b405b7e..c93f11f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+
+2014-01-25 Andrey Borzenkov <arvidjaar@gmail.com>
+
+ * include/grub/crypto.h: Replace __attribute__ ((format (printf)) with
+ __attribute__ ((format (__printf__)) to fix compilation under MinGW-w64.
+ * include/grub/emu/misc.h: ... and here.
+ * include/grub/err.h: ... and here.
+ * util/import_gcry.py: ... and here (in files g10lib.h).
+
2014-01-25 Andrey Borzenkov <arvidjaar@gmail.com>
* util/grub-mkimage.c: Make prefix argument mandatory.
diff --git a/include/grub/crypto.h b/include/grub/crypto.h
index ec1b980..a24e89d 100644
--- a/include/grub/crypto.h
+++ b/include/grub/crypto.h
@@ -408,7 +408,7 @@ void _gcry_assert_failed (const char *expr, const char *file, int line,
const char *func) __attribute__ ((noreturn));
void _gcry_burn_stack (int bytes);
-void _gcry_log_error( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2)));
+void _gcry_log_error( const char *fmt, ... ) __attribute__ ((format (__printf__, 1, 2)));
#ifdef GRUB_UTIL
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index dde48c1..a588ba2 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -53,11 +53,11 @@ grub_util_device_is_mapped (const char *dev);
void * EXPORT_FUNC(xmalloc) (grub_size_t size) WARN_UNUSED_RESULT;
void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT;
char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT;
-char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) WARN_UNUSED_RESULT;
+char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2))) WARN_UNUSED_RESULT;
-void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
-void EXPORT_FUNC(grub_util_info) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
-void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2), noreturn));
+void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2)));
+void EXPORT_FUNC(grub_util_info) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2)));
+void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2), noreturn));
grub_uint64_t EXPORT_FUNC (grub_util_get_cpu_time_ms) (void);
diff --git a/include/grub/err.h b/include/grub/err.h
index 9896fcc..1590c68 100644
--- a/include/grub/err.h
+++ b/include/grub/err.h
@@ -91,6 +91,6 @@ int EXPORT_FUNC(grub_error_pop) (void);
void EXPORT_FUNC(grub_print_error) (void);
extern int EXPORT_VAR(grub_err_printed_errors);
int grub_err_printf (const char *fmt, ...)
- __attribute__ ((format (printf, 1, 2)));
+ __attribute__ ((format (__printf__, 1, 2)));
#endif /* ! GRUB_ERR_HEADER */
diff --git a/util/import_gcry.py b/util/import_gcry.py
index 63ebb90..2b3322d 100644
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -534,6 +534,12 @@ for src in sorted (os.listdir (os.path.join (indir, "src"))):
fw.close ()
continue
+ if src == "g10lib.h":
+ fw.write (f.read ().replace ("(printf,f,a)", "(__printf__,f,a)"))
+ f.close ()
+ fw.close ()
+ continue
+
fw.write (f.read ())
f.close ()
fw.close ()
--
2.4.3

60
0045-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch
View File

@ -1,60 +0,0 @@
From 9afe2053c9b37820888bd5e77acd35c0eacf6699 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 26 Jan 2014 02:36:05 +0100
Subject: [PATCH 045/506] * grub-core/term/serial.c
(grub_serial_register): Fix invalid free. Ensure that pointers are
inited to NULL and that pointers are not accessed after free.
---
ChangeLog | 5 +++++
grub-core/term/serial.c | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c93f11f..67b4d5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-26 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * grub-core/term/serial.c (grub_serial_register): Fix invalid free.
+ Ensure that pointers are inited to NULL and that pointers are not
+ accessed after free.
2014-01-25 Andrey Borzenkov <arvidjaar@gmail.com>
diff --git a/grub-core/term/serial.c b/grub-core/term/serial.c
index b581a76..c9b5574 100644
--- a/grub-core/term/serial.c
+++ b/grub-core/term/serial.c
@@ -338,23 +338,23 @@ grub_serial_register (struct grub_serial_port *port)
grub_free (indata);
return grub_errno;
}
-
- out = grub_malloc (sizeof (*out));
+
+ out = grub_zalloc (sizeof (*out));
if (!out)
{
- grub_free (in);
grub_free (indata);
grub_free ((char *) in->name);
+ grub_free (in);
return grub_errno;
}
outdata = grub_malloc (sizeof (*outdata));
if (!outdata)
{
- grub_free (in);
grub_free (indata);
grub_free ((char *) in->name);
grub_free (out);
+ grub_free (in);
return grub_errno;
}
--
2.4.3

4
0476-trim-arp-packets-with-abnormal-size.patch → 0045-trim-arp-packets-with-abnormal-size.patch
View File

@ -1,7 +1,7 @@
From ee4302aa644523afd447e21201412ab6da00d4d6 Mon Sep 17 00:00:00 2001
From 13599cf511f2be11fec127dde981e2b6958b37bb Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Wed, 5 Feb 2014 09:42:42 -0200
Subject: [PATCH 476/506] trim arp packets with abnormal size
Subject: [PATCH 45/74] trim arp packets with abnormal size
GRUB uses arp request to create the arp response. If the incoming packet
is foobared, GRUB needs to trim the arp response packet before sending it.

4
0477-Fix-convert-function-to-support-NVMe-devices.patch → 0046-Fix-convert-function-to-support-NVMe-devices.patch
View File

@ -1,7 +1,7 @@
From 0696467ff34b3862035a5beae0dad4a6ea9f3525 Mon Sep 17 00:00:00 2001
From 1d7732b94984ddc61de2332723176af3b208993d Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 18 Feb 2014 11:34:00 -0500
Subject: [PATCH 477/506] Fix convert function to support NVMe devices
Subject: [PATCH 46/74] Fix convert function to support NVMe devices
This is adapted from the patch at
https://bugzilla.redhat.com/show_bug.cgi?id=1019660 , which is against

55
0046-grub-install-support-for-partitioned-partx-loop-devi.patch
View File

@ -1,55 +0,0 @@
From 35f2d96c0d68772c831952b2ee4eba6519d6ea1b Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 26 Jan 2014 02:56:04 +0100
Subject: [PATCH 046/506] grub-install: support for partitioned partx
loop devices.
* grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Detect
/dev/loopX as being the parent of /dev/loopXpY.
---
ChangeLog | 7 +++++++
grub-core/osdep/linux/getroot.c | 13 +++++++++++++
2 files changed, 20 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 67b4d5c..bbec1e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-26 Mike Gilbert <floppym@gentoo.org>
+
+ grub-install: support for partitioned partx loop devices.
+
+ * grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Detect
+ /dev/loopX as being the parent of /dev/loopXpY.
+
2014-01-26 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/term/serial.c (grub_serial_register): Fix invalid free.
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
index 772de0a..19581d3 100644
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -883,6 +883,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
*pp = '\0';
return path;
}
+
+ /* If this is a loop device */
+ if ((strncmp ("loop", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
+ {
+ char *pp = p + 4;
+ while (*pp >= '0' && *pp <= '9')
+ pp++;
+ if (*pp == 'p')
+ *is_part = 1;
+ /* /dev/loop[0-9]+p[0-9]* */
+ *pp = '\0';
+ return path;
+ }
}
return path;
--
2.4.3

4
0478-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch → 0047-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
View File

@ -1,7 +1,7 @@
From 67e66f4a26a0862f0f2d931b08edc234f13cd227 Mon Sep 17 00:00:00 2001
From c5f3f71aea4fbbdc1d0cc0457f98344255a499cb Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Wed, 12 Mar 2014 10:58:16 -0400
Subject: [PATCH 478/506] Fix bad test on GRUB_DISABLE_SUBMENU.
Subject: [PATCH 47/74] Fix bad test on GRUB_DISABLE_SUBMENU.
The file /etc/grub.d/10_linux does

40
0047-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch
View File

@ -1,40 +0,0 @@
From 7f64fb590cd80517e1381693a16d7cf2486fa808 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 26 Jan 2014 03:31:10 +0100
Subject: [PATCH 047/506] * grub-core/term/at_keyboard.c: Tolerate
missing keyboard.
---
ChangeLog | 4 ++++
grub-core/term/at_keyboard.c | 3 +++
2 files changed, 7 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index bbec1e7..d37d4a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-26 Vladimir Serbinenko <phcoder@gmail.com>
+
+ * grub-core/term/at_keyboard.c: Tolerate missing keyboard.
+
2014-01-26 Mike Gilbert <floppym@gentoo.org>
grub-install: support for partitioned partx loop devices.
diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
index f5071ce..b4257e8 100644
--- a/grub-core/term/at_keyboard.c
+++ b/grub-core/term/at_keyboard.c
@@ -396,6 +396,9 @@ fetch_key (int *is_break)
if (! KEYBOARD_ISREADY (grub_inb (KEYBOARD_REG_STATUS)))
return -1;
at_key = grub_inb (KEYBOARD_REG_DATA);
+ /* May happen if no keyboard is connected. Just ignore this. */
+ if (at_key == 0xff)
+ return -1;
if (at_key == 0xe0)
{
e0_received = 1;
--
2.4.3

73
0048-.gitignore-add-missing-files-and-.exe-variants.patch
View File

@ -1,73 +0,0 @@
From ba584da163bc4dc2a36988ae327733ba10251143 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
Date: Wed, 29 Jan 2014 13:26:00 -0200
Subject: [PATCH 048/506] .gitignore: add missing files and .exe variants.
---
.gitignore | 7 +++++++
ChangeLog | 6 +++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 2b0156a..18ab8e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,8 @@ grub-emu.exe
grub-emu-lite.exe
grub_emu_init.c
grub_emu_init.h
+/grub-file
+/grub-file.exe
grub-fstest
grub-fstest.exe
grub_fstest_init.c
@@ -66,6 +68,8 @@ grub_func_test
grub-install
grub-install.exe
grub-kbdcomp
+/grub-macbless
+/grub-macbless.exe
grub-macho2img
/grub-menulst2cfg
/grub-menulst2cfg.exe
@@ -120,6 +124,8 @@ grub-shell
grub-shell-tester
grub-sparc64-setup
grub-sparc64-setup.exe
+/grub-syslinux2cfg
+/grub-syslinux2cfg.exe
gzcompress_test
hddboot_test
help_test
@@ -194,6 +200,7 @@ grub-core/modinfo.sh
grub-core/*.module
grub-core/*.module.exe
grub-core/*.pp
+grub-core/kernel.img.bin
util/bash-completion.d/grub
grub-core/gnulib/alloca.h
grub-core/gnulib/arg-nonnull.h
diff --git a/ChangeLog b/ChangeLog
index bbec1e7..b996df8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-29 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
+
+ * .gitignore: add missing files and .exe variants.
+
2014-01-26 Mike Gilbert <floppym@gentoo.org>
grub-install: support for partitioned partx loop devices.
@@ -1109,7 +1113,7 @@
2013-12-14 Vladimir Serbinenko <phcoder@gmail.com>
- * .gitignore: Add .exe variants. Add missing files. Remove few outdated
+ * .gitignore: add .exe variants. add missing files. remove few outdated
entries.
2013-12-14 Vladimir Serbinenko <phcoder@gmail.com>
--
2.4.3

4
0479-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch → 0048-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
View File

@ -1,7 +1,7 @@
From f56fb3d530641525a477888e94bbaa21265a15d0 Mon Sep 17 00:00:00 2001
From 753e72ea12dfeb7a1374b9840325795cf65897a5 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
Date: Mon, 10 Feb 2014 16:13:10 -0500
Subject: [PATCH 479/506] Switch to use APM Mustang device tree, for hardware
Subject: [PATCH 48/74] Switch to use APM Mustang device tree, for hardware
testing.
Signed-off-by: David A. Marlin <d.marlin@redhat.com>

5
0480-Use-the-default-device-tree-from-the-grub-default-fi.patch → 0049-Use-the-default-device-tree-from-the-grub-default-fi.patch
View File

@ -1,8 +1,7 @@
From aae3606b6b924083e215db5207f99ef78eec0ae5 Mon Sep 17 00:00:00 2001
From 7d0777d57fec835e8a1b8e8ca940598101cdb861 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
Date: Wed, 12 Feb 2014 14:54:04 -0500
Subject: [PATCH 480/506] Use the default device tree from the grub default
file
Subject: [PATCH 49/74] Use the default device tree from the grub default file
instead of hardcoding a value.

75
0049-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch
View File

@ -1,75 +0,0 @@
From ba424f37a95cf3f9c9995e051383424e328d13f6 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Wed, 29 Jan 2014 23:41:48 +0100
Subject: [PATCH 049/506] * util/grub-mkfont.c: Downgrade warnings about
unhandled features to debug.
---
ChangeLog | 5 +++++
util/grub-mkfont.c | 14 ++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5692a5b..ce0ea89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-01-29 Vladimir Serbinenko <phcoder@gmail.com>
+ * util/grub-mkfont.c: Downgrade warnings about unhandled features
+ to debug.
+
+2014-01-29 Vladimir Serbinenko <phcoder@gmail.com>
+
* grub-core/term/at_keyboard.c: Tolerate missing keyboard.
2014-01-29 Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 3cb02ad..3de07ee 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -516,8 +516,8 @@ process_cursive (struct gsub_feature *feature,
}
if (grub_be_to_cpu16 (lookup->flag) & ~GSUB_RTL_CHAR)
{
- printf (_("Unsupported substitution flag: 0x%x\n"),
- grub_be_to_cpu16 (lookup->flag));
+ grub_util_info ("unsupported substitution flag: 0x%x",
+ grub_be_to_cpu16 (lookup->flag));
}
switch (feattag)
{
@@ -577,7 +577,8 @@ process_cursive (struct gsub_feature *feature,
There are 2 coverage specifications: list and range.
This warning is thrown when another coverage specification
is detected. */
- printf (_("Unsupported coverage specification: %d\n"), covertype);
+ fprintf (stderr,
+ _("Unsupported coverage specification: %d\n"), covertype);
}
}
}
@@ -616,7 +617,8 @@ add_font (struct grub_font_info *font_info, FT_Face face, int nocut)
grub_uint32_t feattag
= grub_be_to_cpu32 (features->features[i].feature_tag);
if (feature->params)
- printf (_("WARNING: unsupported font feature parameters: %x\n"),
+ fprintf (stderr,
+ _("WARNING: unsupported font feature parameters: %x\n"),
grub_be_to_cpu16 (feature->params));
switch (feattag)
{
@@ -647,8 +649,8 @@ add_font (struct grub_font_info *font_info, FT_Face face, int nocut)
if (!grub_isgraph (str[j]))
str[j] = '?';
/* TRANSLATORS: It's gsub feature, not gsub font. */
- printf (_("Unknown gsub font feature 0x%x (%s)\n"),
- feattag, str);
+ grub_util_info ("Unknown gsub font feature 0x%x (%s)",
+ feattag, str);
}
}
}
--
2.4.3

57
0050-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch
View File

@ -1,57 +0,0 @@
From 4686e163f278ae7cfaab3bebbde215f5688c7e3f Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Wed, 29 Jan 2014 23:43:25 +0100
Subject: [PATCH 050/506] * grub-core/disk/ahci.c: Do not enable I/O
decoding and keep enabling busmaster for the end.
---
ChangeLog | 5 +++++
grub-core/disk/ahci.c | 10 ++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ce0ea89..8c37450 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-01-29 Vladimir Serbinenko <phcoder@gmail.com>
+ * grub-core/disk/ahci.c: Do not enable I/O decoding and keep
+ enabling busmaster for the end.
+
+2014-01-29 Vladimir Serbinenko <phcoder@gmail.com>
+
* util/grub-mkfont.c: Downgrade warnings about unhandled features
to debug.
diff --git a/grub-core/disk/ahci.c b/grub-core/disk/ahci.c
index 0b13fb8..18c1327 100644
--- a/grub-core/disk/ahci.c
+++ b/grub-core/disk/ahci.c
@@ -194,10 +194,8 @@ grub_ahci_pciinit (grub_pci_device_t dev,
return 0;
addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
- grub_pci_write_word (addr, grub_pci_read_word (addr) |
- GRUB_PCI_COMMAND_IO_ENABLED
- | GRUB_PCI_COMMAND_MEM_ENABLED
- | GRUB_PCI_COMMAND_BUS_MASTER);
+ grub_pci_write_word (addr, grub_pci_read_word (addr)
+ | GRUB_PCI_COMMAND_MEM_ENABLED);
hba = grub_pci_device_map_range (dev, bar & GRUB_PCI_ADDR_MEM_MASK,
sizeof (hba));
@@ -621,6 +619,10 @@ grub_ahci_pciinit (grub_pci_device_t dev,
if (adevs[i] && (adevs[i]->hba->ports[adevs[i]->port].sig >> 16) == 0xeb14)
adevs[i]->atapi = 1;
+ addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
+ grub_pci_write_word (addr, grub_pci_read_word (addr)
+ | GRUB_PCI_COMMAND_BUS_MASTER);
+
for (i = 0; i < nports; i++)
if (adevs[i])
{
--
2.4.3

10
0481-reopen-SNP-protocol-for-exclusive-use-by-grub.patch → 0050-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
View File

@ -1,17 +1,17 @@
From aa6d3d99ecc56e05a61dec3a5fd5e3f6300e6a02 Mon Sep 17 00:00:00 2001
From 65d576323537049aff86ec5166d5780613c73ffe Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
Date: Sat, 15 Feb 2014 15:10:22 -0500
Subject: [PATCH 481/506] reopen SNP protocol for exclusive use by grub
Subject: [PATCH 50/74] reopen SNP protocol for exclusive use by grub
---
grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
index 5533515..6a1dd1f 100644
index 70b26af..7b8c4a5 100644
--- a/grub-core/net/drivers/efi/efinet.c
+++ b/grub-core/net/drivers/efi/efinet.c
@@ -304,6 +304,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@@ -329,6 +329,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
{
struct grub_net_card *card;
grub_efi_device_path_t *dp;
@ -19,7 +19,7 @@ index 5533515..6a1dd1f 100644
dp = grub_efi_get_device_path (hnd);
if (! dp)
@@ -357,6 +358,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@@ -382,6 +383,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
&pxe_mode->dhcp_ack,
sizeof (pxe_mode->dhcp_ack),
1, device, path);

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