#3 Add blscfg command and improve BootLoaderSpec support
Closed 6 years ago by pjones. Opened 6 years ago by javierm.
rpms/ javierm/grub2 master  into  master

@@ -1,7 +1,7 @@ 

  From b0bad6fd9449d3333fe1ab58953c0e6c1ce12c0d Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Wed, 3 May 2017 11:55:52 +0200

- Subject: [PATCH 001/198] Bump version to 2.03

+ Subject: [PATCH 001/206] Bump version to 2.03

  

  ---

   configure.ac                |   2 +-
@@ -9,7 +9,7 @@ 

   2 files changed, 99 insertions(+), 99 deletions(-)

  

  diff --git a/configure.ac b/configure.ac

- index edd184154..d10d8adac 100644

+ index edd184154f7e..d10d8adac581 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -31,7 +31,7 @@ dnl (such as BUILD_CC, BUILD_CFLAGS, etc.) for the build type and variables
@@ -22,7 +22,7 @@ 

   AC_CONFIG_AUX_DIR([build-aux])

   

  diff --git a/grub-core/tests/checksums.h b/grub-core/tests/checksums.h

- index 68d8ce7c7..921e57ff4 100644

+ index 68d8ce7c7753..921e57ff48d0 100644

  --- a/grub-core/tests/checksums.h

  +++ b/grub-core/tests/checksums.h

  @@ -1,101 +1,101 @@

@@ -1,7 +1,7 @@ 

  From 5a0c548ba388b343b0bb6d2a38888e7eac5bbb96 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 03:47:13 +0300

- Subject: [PATCH 002/198] Remove bashisms from tests.

+ Subject: [PATCH 002/206] Remove bashisms from tests.

  

  Those tests don't actually need bash. Just use common shebang.

  ---
@@ -19,7 +19,7 @@ 

   11 files changed, 11 insertions(+), 11 deletions(-)

  

  diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in

- index a459353e8..0d8162e98 100644

+ index a459353e8a51..0d8162e98b04 100644

  --- a/tests/grub_cmd_date.in

  +++ b/tests/grub_cmd_date.in

  @@ -1,4 +1,4 @@
@@ -29,7 +29,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_regexp.in b/tests/grub_cmd_regexp.in

- index e7e625701..7e9ab86aa 100644

+ index e7e625701152..7e9ab86aabb2 100644

  --- a/tests/grub_cmd_regexp.in

  +++ b/tests/grub_cmd_regexp.in

  @@ -1,4 +1,4 @@
@@ -39,7 +39,7 @@ 

   

   # Run GRUB script in a Qemu instance

  diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in

- index c594ae3fc..2f518dd9e 100644

+ index c594ae3fc14e..2f518dd9e342 100644

  --- a/tests/grub_cmd_set_date.in

  +++ b/tests/grub_cmd_set_date.in

  @@ -1,4 +1,4 @@
@@ -49,7 +49,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in

- index eb362aa24..05b8f6b73 100644

+ index eb362aa2439d..05b8f6b73faa 100644

  --- a/tests/grub_cmd_sleep.in

  +++ b/tests/grub_cmd_sleep.in

  @@ -1,4 +1,4 @@
@@ -59,7 +59,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_test.in b/tests/grub_cmd_test.in

- index 6269891c9..49ae8a9c8 100644

+ index 6269891c9eed..49ae8a9c830e 100644

  --- a/tests/grub_cmd_test.in

  +++ b/tests/grub_cmd_test.in

  @@ -1,4 +1,4 @@
@@ -69,7 +69,7 @@ 

   # create a randome file

   empty="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1

  diff --git a/tests/grub_cmd_tr.in b/tests/grub_cmd_tr.in

- index 3fb15e35c..0e8d645eb 100644

+ index 3fb15e35c8ac..0e8d645eb6be 100644

  --- a/tests/grub_cmd_tr.in

  +++ b/tests/grub_cmd_tr.in

  @@ -1,4 +1,4 @@
@@ -79,7 +79,7 @@ 

   # Run GRUB script in a Qemu instance

   # Copyright (C) 2010  Free Software Foundation, Inc.

  diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in

- index c8cc26376..b32f24466 100644

+ index c8cc26376337..b32f24466592 100644

  --- a/tests/grub_func_test.in

  +++ b/tests/grub_func_test.in

  @@ -1,4 +1,4 @@
@@ -89,7 +89,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_script_blockarg.in b/tests/grub_script_blockarg.in

- index 2765b61ac..63b60a2ea 100644

+ index 2765b61acbb8..63b60a2ea067 100644

  --- a/tests/grub_script_blockarg.in

  +++ b/tests/grub_script_blockarg.in

  @@ -1,4 +1,4 @@
@@ -99,7 +99,7 @@ 

   # Run GRUB script in a Qemu instance

   # Copyright (C) 2010  Free Software Foundation, Inc.

  diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in

- index e46401c4c..2b7829568 100644

+ index e46401c4c9f1..2b7829568380 100644

  --- a/tests/grub_script_expansion.in

  +++ b/tests/grub_script_expansion.in

  @@ -1,4 +1,4 @@
@@ -109,7 +109,7 @@ 

   

   # Run GRUB script in a Qemu instance

  diff --git a/tests/help_test.in b/tests/help_test.in

- index e780924ef..aa9645835 100644

+ index e780924ef7b0..aa96458355b7 100644

  --- a/tests/help_test.in

  +++ b/tests/help_test.in

  @@ -1,4 +1,4 @@
@@ -119,7 +119,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/test_sha512sum.in b/tests/test_sha512sum.in

- index d5ef7f9ea..80ebdc59f 100644

+ index d5ef7f9ea62d..80ebdc59fd53 100644

  --- a/tests/test_sha512sum.in

  +++ b/tests/test_sha512sum.in

  @@ -1,4 +1,4 @@

@@ -1,14 +1,14 @@ 

  From 37865c2c4ad26cd5e947b08abf1fde8145699919 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 14:35:59 +0300

- Subject: [PATCH 003/198] fs-tester: make sh-compatible

+ Subject: [PATCH 003/206] fs-tester: make sh-compatible

  

  ---

   tests/util/grub-fs-tester.in | 306 ++++++++++++++++++++++++-------------------

   1 file changed, 169 insertions(+), 137 deletions(-)

  

  diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in

- index 2337771a1..4515d165e 100644

+ index 2337771a1b9c..4515d165e6e9 100644

  --- a/tests/util/grub-fs-tester.in

  +++ b/tests/util/grub-fs-tester.in

  @@ -1,4 +1,4 @@

@@ -1,7 +1,7 @@ 

  From b43b8cacc813c2c15347de1e35cc88d9aa912d22 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 14:31:36 +0300

- Subject: [PATCH 004/198] support busybox date.

+ Subject: [PATCH 004/206] support busybox date.

  

  Busybox date doesn't understand weekdays in -d input,

  so strip them beforehand.
@@ -11,7 +11,7 @@ 

   2 files changed, 3 insertions(+), 3 deletions(-)

  

  diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in

- index 0d8162e98..60f039ebc 100644

+ index 0d8162e98b04..60f039ebc8bb 100644

  --- a/tests/grub_cmd_date.in

  +++ b/tests/grub_cmd_date.in

  @@ -9,7 +9,7 @@ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = sparc64-ieee1275 ];
@@ -24,7 +24,7 @@ 

   ndt="$(date -u +%s)"

   

  diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in

- index 05b8f6b73..ac51d4209 100644

+ index 05b8f6b73faa..ac51d42098e0 100644

  --- a/tests/grub_cmd_sleep.in

  +++ b/tests/grub_cmd_sleep.in

  @@ -11,8 +11,8 @@ fi

@@ -1,14 +1,14 @@ 

  From 6dec3a26b37e128ded5d912e08abc5cee1592499 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 21:24:05 +0300

- Subject: [PATCH 005/198] Don't retrieve fstime when it's not useful.

+ Subject: [PATCH 005/206] Don't retrieve fstime when it's not useful.

  

  ---

   tests/util/grub-fs-tester.in | 48 ++++++++++++++++++++++----------------------

   1 file changed, 24 insertions(+), 24 deletions(-)

  

  diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in

- index 4515d165e..bf47305f3 100644

+ index 4515d165e6e9..bf47305f3e8d 100644

  --- a/tests/util/grub-fs-tester.in

  +++ b/tests/util/grub-fs-tester.in

  @@ -1328,31 +1328,31 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do

file modified
+3 -3
@@ -1,7 +1,7 @@ 

  From 608bec51128008afb81c9e3f297283e9f830a146 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 20:21:05 +0300

- Subject: [PATCH 006/198] Support lseek64.

+ Subject: [PATCH 006/206] Support lseek64.

  

  Android doesn't have 64-bit off_t, so use off64_t instead.

  ---
@@ -10,7 +10,7 @@ 

   2 files changed, 12 insertions(+), 1 deletion(-)

  

  diff --git a/configure.ac b/configure.ac

- index d10d8adac..e0262e159 100644

+ index d10d8adac581..e0262e159f03 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -373,7 +373,10 @@ case "$host_os" in
@@ -26,7 +26,7 @@ 

   

   if test x$USE_NLS = xno; then

  diff --git a/grub-core/osdep/unix/hostdisk.c b/grub-core/osdep/unix/hostdisk.c

- index 2a8c5882e..5450cf416 100644

+ index 2a8c5882e3d1..5450cf4166e0 100644

  --- a/grub-core/osdep/unix/hostdisk.c

  +++ b/grub-core/osdep/unix/hostdisk.c

  @@ -77,11 +77,19 @@ grub_util_get_fd_size (grub_util_fd_t fd, const char *name, unsigned *log_secsiz

@@ -1,7 +1,7 @@ 

  From c2ea443446b7feea868e54f94a87781f69820375 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 00:55:30 +0300

- Subject: [PATCH 007/198] Use $(SHELL) rather than /bin/sh.

+ Subject: [PATCH 007/206] Use $(SHELL) rather than /bin/sh.

  

  /bin/sh doesn't exist under termux.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index 04e9395fd..809a8aa26 100644

+ index 04e9395fd949..809a8aa26bfb 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -278,7 +278,7 @@ BUILT_SOURCES += symlist.h

@@ -1,7 +1,7 @@ 

  From 4341f82af0b61d3dfbe675670d4105dc759c0df3 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 14:54:03 +0300

- Subject: [PATCH 008/198] po: Use @SHELL@ rather than /bin/sh.

+ Subject: [PATCH 008/206] po: Use @SHELL@ rather than /bin/sh.

  

  /bin/sh might not exist.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/po/Makefile.in.in b/po/Makefile.in.in

- index 3619458e8..e68e9da84 100644

+ index 3619458e85f2..e68e9da843d9 100644

  --- a/po/Makefile.in.in

  +++ b/po/Makefile.in.in

  @@ -15,7 +15,7 @@ PACKAGE = @PACKAGE@

@@ -1,14 +1,14 @@ 

  From 1073ddb12078f3c8edbdb74bb8f5afc674983f40 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 23 Jan 2017 14:52:48 +0300

- Subject: [PATCH 009/198] Add termux path to dict.

+ Subject: [PATCH 009/206] Add termux path to dict.

  

  ---

   tests/util/grub-fs-tester.in | 2 +-

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in

- index bf47305f3..468d9e785 100644

+ index bf47305f3e8d..468d9e7856db 100644

  --- a/tests/util/grub-fs-tester.in

  +++ b/tests/util/grub-fs-tester.in

  @@ -259,7 +259,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do

@@ -1,7 +1,7 @@ 

  From a827807a1330d5ad619faa103bc7f12d89fc8bee Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Sun, 22 Jan 2017 20:22:34 +0300

- Subject: [PATCH 010/198] Fix shebang for termux.

+ Subject: [PATCH 010/206] Fix shebang for termux.

  

  Termux doesn't have a /bin/sh. So we needto use $SHELL.

  Keep /bin/sh as much as possible.
@@ -69,7 +69,7 @@ 

   60 files changed, 69 insertions(+), 59 deletions(-)

  

  diff --git a/configure.ac b/configure.ac

- index e0262e159..ee2c86537 100644

+ index e0262e159f03..ee2c86537e98 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -459,6 +459,16 @@ case "$build_os" in
@@ -90,7 +90,7 @@ 

   gl_INIT

   

  diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in

- index 03cc3b7f6..3de06ee01 100644

+ index 03cc3b7f69ed..3de06ee018f8 100644

  --- a/grub-core/genmod.sh.in

  +++ b/grub-core/genmod.sh.in

  @@ -1,4 +1,4 @@
@@ -100,7 +100,7 @@ 

   

   # Copyright (C) 2010 Free Software Foundation, Inc.

  diff --git a/grub-core/gensyminfo.sh.in b/grub-core/gensyminfo.sh.in

- index 2e8716b42..9bc767532 100644

+ index 2e8716b425cb..9bc7675327a6 100644

  --- a/grub-core/gensyminfo.sh.in

  +++ b/grub-core/gensyminfo.sh.in

  @@ -1,4 +1,4 @@
@@ -110,7 +110,7 @@ 

   

   # Copyright (C) 2010 Free Software Foundation, Inc.

  diff --git a/grub-core/modinfo.sh.in b/grub-core/modinfo.sh.in

- index faf0ad30e..f6cd657ce 100644

+ index faf0ad30edbe..f6cd657ce0f8 100644

  --- a/grub-core/modinfo.sh.in

  +++ b/grub-core/modinfo.sh.in

  @@ -1,4 +1,4 @@
@@ -120,7 +120,7 @@ 

   # User-controllable options

   grub_modinfo_target_cpu=@target_cpu@

  diff --git a/tests/ahci_test.in b/tests/ahci_test.in

- index 1d01d1f59..7df560462 100644

+ index 1d01d1f59a0a..7df56046201e 100644

  --- a/tests/ahci_test.in

  +++ b/tests/ahci_test.in

  @@ -1,4 +1,4 @@
@@ -130,7 +130,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/btrfs_test.in b/tests/btrfs_test.in

- index c55d9477f..2b37ddd33 100644

+ index c55d9477f78e..2b37ddd3324c 100644

  --- a/tests/btrfs_test.in

  +++ b/tests/btrfs_test.in

  @@ -1,4 +1,4 @@
@@ -140,7 +140,7 @@ 

   set -e

   

  diff --git a/tests/cdboot_test.in b/tests/cdboot_test.in

- index 1cc901977..75acdfedb 100644

+ index 1cc901977c22..75acdfedb7fe 100644

  --- a/tests/cdboot_test.in

  +++ b/tests/cdboot_test.in

  @@ -1,4 +1,4 @@
@@ -150,7 +150,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/core_compress_test.in b/tests/core_compress_test.in

- index 1003587cc..9d216ebcf 100644

+ index 1003587ccca6..9d216ebcff60 100644

  --- a/tests/core_compress_test.in

  +++ b/tests/core_compress_test.in

  @@ -1,4 +1,4 @@
@@ -160,7 +160,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/cpio_test.in b/tests/cpio_test.in

- index 0b09db549..5742cf17b 100644

+ index 0b09db549f07..5742cf17b9d8 100644

  --- a/tests/cpio_test.in

  +++ b/tests/cpio_test.in

  @@ -1,4 +1,4 @@
@@ -170,7 +170,7 @@ 

   set -e

   

  diff --git a/tests/ehci_test.in b/tests/ehci_test.in

- index 7dd8d3e8f..b197f8cdc 100644

+ index 7dd8d3e8fbd4..b197f8cdc922 100644

  --- a/tests/ehci_test.in

  +++ b/tests/ehci_test.in

  @@ -1,4 +1,4 @@
@@ -180,7 +180,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/example_scripted_test.in b/tests/example_scripted_test.in

- index 09633e893..783b7f138 100644

+ index 09633e89341e..783b7f13853f 100644

  --- a/tests/example_scripted_test.in

  +++ b/tests/example_scripted_test.in

  @@ -1,4 +1,4 @@
@@ -190,7 +190,7 @@ 

   

   true

  diff --git a/tests/exfat_test.in b/tests/exfat_test.in

- index fc1a0fe5e..cd3cd4cb2 100644

+ index fc1a0fe5ec03..cd3cd4cb2f70 100644

  --- a/tests/exfat_test.in

  +++ b/tests/exfat_test.in

  @@ -1,4 +1,4 @@
@@ -200,7 +200,7 @@ 

   set -e

   

  diff --git a/tests/ext234_test.in b/tests/ext234_test.in

- index c986960a8..892b99cbd 100644

+ index c986960a8bec..892b99cbdf64 100644

  --- a/tests/ext234_test.in

  +++ b/tests/ext234_test.in

  @@ -1,4 +1,4 @@
@@ -210,7 +210,7 @@ 

   set -e

   

  diff --git a/tests/fat_test.in b/tests/fat_test.in

- index 1d132b517..b6b4748ca 100644

+ index 1d132b51703c..b6b4748ca694 100644

  --- a/tests/fat_test.in

  +++ b/tests/fat_test.in

  @@ -1,4 +1,4 @@
@@ -220,7 +220,7 @@ 

   set -e

   

  diff --git a/tests/fddboot_test.in b/tests/fddboot_test.in

- index a59645b7f..2d7dfc889 100644

+ index a59645b7f873..2d7dfc8891f6 100644

  --- a/tests/fddboot_test.in

  +++ b/tests/fddboot_test.in

  @@ -1,4 +1,4 @@
@@ -230,7 +230,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/file_filter_test.in b/tests/file_filter_test.in

- index 8909e4021..bfb638227 100644

+ index 8909e4021fb1..bfb6382274e4 100644

  --- a/tests/file_filter_test.in

  +++ b/tests/file_filter_test.in

  @@ -1,4 +1,4 @@
@@ -240,7 +240,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/gettext_strings_test.in b/tests/gettext_strings_test.in

- index 5c305e75b..813999ebe 100644

+ index 5c305e75b7e9..813999ebe6ea 100644

  --- a/tests/gettext_strings_test.in

  +++ b/tests/gettext_strings_test.in

  @@ -1,4 +1,4 @@
@@ -250,7 +250,7 @@ 

   cd '@srcdir@'

   

  diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in

- index 60f039ebc..f7c9ca004 100644

+ index 60f039ebc8bb..f7c9ca00432f 100644

  --- a/tests/grub_cmd_date.in

  +++ b/tests/grub_cmd_date.in

  @@ -1,4 +1,4 @@
@@ -260,7 +260,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_regexp.in b/tests/grub_cmd_regexp.in

- index 7e9ab86aa..6520bd6d7 100644

+ index 7e9ab86aabb2..6520bd6d79ac 100644

  --- a/tests/grub_cmd_regexp.in

  +++ b/tests/grub_cmd_regexp.in

  @@ -1,4 +1,4 @@
@@ -270,7 +270,7 @@ 

   

   # Run GRUB script in a Qemu instance

  diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in

- index 2f518dd9e..aac120a6c 100644

+ index 2f518dd9e342..aac120a6c527 100644

  --- a/tests/grub_cmd_set_date.in

  +++ b/tests/grub_cmd_set_date.in

  @@ -1,4 +1,4 @@
@@ -280,7 +280,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in

- index ac51d4209..8797f6632 100644

+ index ac51d42098e0..8797f6632845 100644

  --- a/tests/grub_cmd_sleep.in

  +++ b/tests/grub_cmd_sleep.in

  @@ -1,4 +1,4 @@
@@ -290,7 +290,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_cmd_test.in b/tests/grub_cmd_test.in

- index 49ae8a9c8..3399eb292 100644

+ index 49ae8a9c830e..3399eb292940 100644

  --- a/tests/grub_cmd_test.in

  +++ b/tests/grub_cmd_test.in

  @@ -1,4 +1,4 @@
@@ -300,7 +300,7 @@ 

   # create a randome file

   empty="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1

  diff --git a/tests/grub_cmd_tr.in b/tests/grub_cmd_tr.in

- index 0e8d645eb..bed469c03 100644

+ index 0e8d645eb6be..bed469c03ddc 100644

  --- a/tests/grub_cmd_tr.in

  +++ b/tests/grub_cmd_tr.in

  @@ -1,4 +1,4 @@
@@ -310,7 +310,7 @@ 

   # Run GRUB script in a Qemu instance

   # Copyright (C) 2010  Free Software Foundation, Inc.

  diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in

- index b32f24466..c67f9e422 100644

+ index b32f24466592..c67f9e422534 100644

  --- a/tests/grub_func_test.in

  +++ b/tests/grub_func_test.in

  @@ -1,4 +1,4 @@
@@ -320,7 +320,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/grub_script_blanklines.in b/tests/grub_script_blanklines.in

- index 89ed763d3..bd8735491 100644

+ index 89ed763d3f4e..bd8735491be3 100644

  --- a/tests/grub_script_blanklines.in

  +++ b/tests/grub_script_blanklines.in

  @@ -1,4 +1,4 @@
@@ -330,7 +330,7 @@ 

   

   @builddir@/grub-script-check <<EOF

  diff --git a/tests/grub_script_blockarg.in b/tests/grub_script_blockarg.in

- index 63b60a2ea..6ea9b8c3d 100644

+ index 63b60a2ea067..6ea9b8c3d87c 100644

  --- a/tests/grub_script_blockarg.in

  +++ b/tests/grub_script_blockarg.in

  @@ -1,4 +1,4 @@
@@ -340,7 +340,7 @@ 

   # Run GRUB script in a Qemu instance

   # Copyright (C) 2010  Free Software Foundation, Inc.

  diff --git a/tests/grub_script_dollar.in b/tests/grub_script_dollar.in

- index 2e076427a..392fe2e7a 100644

+ index 2e076427afbc..392fe2e7ab0f 100644

  --- a/tests/grub_script_dollar.in

  +++ b/tests/grub_script_dollar.in

  @@ -1,4 +1,4 @@
@@ -350,7 +350,7 @@ 

   

   @builddir@/grub-script-check << EOF

  diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in

- index 2b7829568..9d0dcdd29 100644

+ index 2b7829568380..9d0dcdd29100 100644

  --- a/tests/grub_script_expansion.in

  +++ b/tests/grub_script_expansion.in

  @@ -1,4 +1,4 @@
@@ -360,7 +360,7 @@ 

   

   # Run GRUB script in a Qemu instance

  diff --git a/tests/grub_script_final_semicolon.in b/tests/grub_script_final_semicolon.in

- index 3ac26540b..f17a9bf95 100644

+ index 3ac26540bbd7..f17a9bf95e6d 100644

  --- a/tests/grub_script_final_semicolon.in

  +++ b/tests/grub_script_final_semicolon.in

  @@ -1,4 +1,4 @@
@@ -370,7 +370,7 @@ 

   

   @builddir@/grub-script-check <<EOF

  diff --git a/tests/grub_script_no_commands.in b/tests/grub_script_no_commands.in

- index c31d267e5..996bb1810 100644

+ index c31d267e5fdf..996bb181043d 100644

  --- a/tests/grub_script_no_commands.in

  +++ b/tests/grub_script_no_commands.in

  @@ -1,4 +1,4 @@
@@ -380,7 +380,7 @@ 

   

   # grub-script-check refuses to pass a file with no commands; this usually

  diff --git a/tests/gzcompress_test.in b/tests/gzcompress_test.in

- index 11b6bb208..42c8fe7c4 100644

+ index 11b6bb208302..42c8fe7c4e8f 100644

  --- a/tests/gzcompress_test.in

  +++ b/tests/gzcompress_test.in

  @@ -1,4 +1,4 @@
@@ -390,7 +390,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/hddboot_test.in b/tests/hddboot_test.in

- index c229716a6..6d70847a5 100644

+ index c229716a6429..6d70847a5dec 100644

  --- a/tests/hddboot_test.in

  +++ b/tests/hddboot_test.in

  @@ -1,4 +1,4 @@
@@ -400,7 +400,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/help_test.in b/tests/help_test.in

- index aa9645835..b08cf2013 100644

+ index aa96458355b7..b08cf201382e 100644

  --- a/tests/help_test.in

  +++ b/tests/help_test.in

  @@ -1,4 +1,4 @@
@@ -410,7 +410,7 @@ 

   

   . "@builddir@/grub-core/modinfo.sh"

  diff --git a/tests/hfs_test.in b/tests/hfs_test.in

- index e3e88f190..d7ec56bef 100644

+ index e3e88f190677..d7ec56beffa7 100644

  --- a/tests/hfs_test.in

  +++ b/tests/hfs_test.in

  @@ -1,4 +1,4 @@
@@ -420,7 +420,7 @@ 

   set -e

   

  diff --git a/tests/hfsplus_test.in b/tests/hfsplus_test.in

- index f947c4a44..85f1c37dc 100644

+ index f947c4a447fe..85f1c37dce6a 100644

  --- a/tests/hfsplus_test.in

  +++ b/tests/hfsplus_test.in

  @@ -1,4 +1,4 @@
@@ -430,7 +430,7 @@ 

   set -e

   

  diff --git a/tests/iso9660_test.in b/tests/iso9660_test.in

- index fdcc9e124..571b938d7 100644

+ index fdcc9e124208..571b938d7a08 100644

  --- a/tests/iso9660_test.in

  +++ b/tests/iso9660_test.in

  @@ -1,4 +1,4 @@
@@ -440,7 +440,7 @@ 

   set -e

   

  diff --git a/tests/jfs_test.in b/tests/jfs_test.in

- index c2e5ecedd..6cf7576b3 100644

+ index c2e5eceddcd2..6cf7576b35ed 100644

  --- a/tests/jfs_test.in

  +++ b/tests/jfs_test.in

  @@ -1,4 +1,4 @@
@@ -450,7 +450,7 @@ 

   set -e

   

  diff --git a/tests/lzocompress_test.in b/tests/lzocompress_test.in

- index 41984c254..4e5f7e078 100644

+ index 41984c25419b..4e5f7e078d51 100644

  --- a/tests/lzocompress_test.in

  +++ b/tests/lzocompress_test.in

  @@ -1,4 +1,4 @@
@@ -460,7 +460,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/minixfs_test.in b/tests/minixfs_test.in

- index 1784b1261..3b16a4de0 100644

+ index 1784b1261f75..3b16a4de0931 100644

  --- a/tests/minixfs_test.in

  +++ b/tests/minixfs_test.in

  @@ -1,4 +1,4 @@
@@ -470,7 +470,7 @@ 

   set -e

   

  diff --git a/tests/netboot_test.in b/tests/netboot_test.in

- index c757023d9..9f71e3d88 100644

+ index c757023d989e..9f71e3d88542 100644

  --- a/tests/netboot_test.in

  +++ b/tests/netboot_test.in

  @@ -1,4 +1,4 @@
@@ -480,7 +480,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/nilfs2_test.in b/tests/nilfs2_test.in

- index 780b60ec1..ad44d5b33 100644

+ index 780b60ec1ac9..ad44d5b33c8a 100644

  --- a/tests/nilfs2_test.in

  +++ b/tests/nilfs2_test.in

  @@ -1,4 +1,4 @@
@@ -490,7 +490,7 @@ 

   set -e

   

  diff --git a/tests/ntfs_test.in b/tests/ntfs_test.in

- index e25c6384a..9eb7b01f6 100644

+ index e25c6384a9cd..9eb7b01f66e9 100644

  --- a/tests/ntfs_test.in

  +++ b/tests/ntfs_test.in

  @@ -1,4 +1,4 @@
@@ -500,7 +500,7 @@ 

   set -e

   

  diff --git a/tests/ohci_test.in b/tests/ohci_test.in

- index 7fede6f26..8693f8c47 100644

+ index 7fede6f262c1..8693f8c47287 100644

  --- a/tests/ohci_test.in

  +++ b/tests/ohci_test.in

  @@ -1,4 +1,4 @@
@@ -510,7 +510,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/partmap_test.in b/tests/partmap_test.in

- index f8dc456fb..6ef518b0a 100644

+ index f8dc456fb8c6..6ef518b0adc1 100644

  --- a/tests/partmap_test.in

  +++ b/tests/partmap_test.in

  @@ -1,4 +1,4 @@
@@ -520,7 +520,7 @@ 

   

   # Copyright (C) 2010  Free Software Foundation, Inc.

  diff --git a/tests/pata_test.in b/tests/pata_test.in

- index c1d0f63ea..4b18fdef3 100644

+ index c1d0f63ea21b..4b18fdef3d35 100644

  --- a/tests/pata_test.in

  +++ b/tests/pata_test.in

  @@ -1,4 +1,4 @@
@@ -530,7 +530,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/pseries_test.in b/tests/pseries_test.in

- index 226494593..655eb4f3a 100644

+ index 226494593d15..655eb4f3a63a 100644

  --- a/tests/pseries_test.in

  +++ b/tests/pseries_test.in

  @@ -1,4 +1,4 @@
@@ -540,7 +540,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/reiserfs_test.in b/tests/reiserfs_test.in

- index 678efe7b3..b5fed7635 100644

+ index 678efe7b3666..b5fed7635673 100644

  --- a/tests/reiserfs_test.in

  +++ b/tests/reiserfs_test.in

  @@ -1,4 +1,4 @@
@@ -550,7 +550,7 @@ 

   set -e

   

  diff --git a/tests/romfs_test.in b/tests/romfs_test.in

- index 83e09315a..98bb50c32 100644

+ index 83e09315acf6..98bb50c324b6 100644

  --- a/tests/romfs_test.in

  +++ b/tests/romfs_test.in

  @@ -1,4 +1,4 @@
@@ -560,7 +560,7 @@ 

   set -e

   

  diff --git a/tests/squashfs_test.in b/tests/squashfs_test.in

- index ec34e0108..2f044f95d 100644

+ index ec34e0108c3b..2f044f95d99b 100644

  --- a/tests/squashfs_test.in

  +++ b/tests/squashfs_test.in

  @@ -1,4 +1,4 @@
@@ -570,7 +570,7 @@ 

   set -e

   

  diff --git a/tests/syslinux_test.in b/tests/syslinux_test.in

- index fc4edd8ef..4ea86390e 100644

+ index fc4edd8ef6b9..4ea86390e0a3 100644

  --- a/tests/syslinux_test.in

  +++ b/tests/syslinux_test.in

  @@ -1,4 +1,4 @@
@@ -580,7 +580,7 @@ 

   set -e

   

  diff --git a/tests/tar_test.in b/tests/tar_test.in

- index 46ba3bce2..6e2f2de8b 100644

+ index 46ba3bce295b..6e2f2de8b7ff 100644

  --- a/tests/tar_test.in

  +++ b/tests/tar_test.in

  @@ -1,4 +1,4 @@
@@ -590,7 +590,7 @@ 

   set -e

   

  diff --git a/tests/test_sha512sum.in b/tests/test_sha512sum.in

- index 80ebdc59f..027092a8b 100644

+ index 80ebdc59fd53..027092a8b17f 100644

  --- a/tests/test_sha512sum.in

  +++ b/tests/test_sha512sum.in

  @@ -1,4 +1,4 @@
@@ -600,7 +600,7 @@ 

   # create a randome file

   file="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1

  diff --git a/tests/udf_test.in b/tests/udf_test.in

- index fe244e2bd..fb92f0173 100644

+ index fe244e2bdfc8..fb92f0173cc7 100644

  --- a/tests/udf_test.in

  +++ b/tests/udf_test.in

  @@ -1,4 +1,4 @@
@@ -610,7 +610,7 @@ 

   set -e

   

  diff --git a/tests/uhci_test.in b/tests/uhci_test.in

- index 89e2c1805..4af72fd8f 100644

+ index 89e2c18051ac..4af72fd8fea5 100644

  --- a/tests/uhci_test.in

  +++ b/tests/uhci_test.in

  @@ -1,4 +1,4 @@
@@ -620,7 +620,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in

- index 468d9e785..88cbe7365 100644

+ index 468d9e7856db..88cbe7365e92 100644

  --- a/tests/util/grub-fs-tester.in

  +++ b/tests/util/grub-fs-tester.in

  @@ -1,4 +1,4 @@
@@ -630,7 +630,7 @@ 

   set -e

   

  diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in

- index 5adce0a47..8a87109b1 100644

+ index 5adce0a47fe3..8a87109b1524 100644

  --- a/tests/util/grub-shell-tester.in

  +++ b/tests/util/grub-shell-tester.in

  @@ -1,4 +1,4 @@
@@ -640,7 +640,7 @@ 

   

   # Compares GRUB script output with BASH output.

  diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in

- index 814f36c6b..d690d6734 100644

+ index 814f36c6bd24..d690d6734efb 100644

  --- a/tests/util/grub-shell.in

  +++ b/tests/util/grub-shell.in

  @@ -1,4 +1,4 @@
@@ -650,7 +650,7 @@ 

   

   # Run GRUB script in a Qemu instance

  diff --git a/tests/xfs_test.in b/tests/xfs_test.in

- index 3807e2e5c..03a351359 100644

+ index 3807e2e5c77e..03a3513595dc 100644

  --- a/tests/xfs_test.in

  +++ b/tests/xfs_test.in

  @@ -1,4 +1,4 @@
@@ -660,7 +660,7 @@ 

   set -e

   

  diff --git a/tests/xzcompress_test.in b/tests/xzcompress_test.in

- index b2bd999ec..03bfb5e95 100644

+ index b2bd999ec071..03bfb5e951dd 100644

  --- a/tests/xzcompress_test.in

  +++ b/tests/xzcompress_test.in

  @@ -1,4 +1,4 @@
@@ -670,7 +670,7 @@ 

   #

   # GRUB is free software: you can redistribute it and/or modify

  diff --git a/tests/zfs_test.in b/tests/zfs_test.in

- index 047120e47..eee62c10d 100644

+ index 047120e47a0e..eee62c10d704 100644

  --- a/tests/zfs_test.in

  +++ b/tests/zfs_test.in

  @@ -1,4 +1,4 @@

file modified
+2 -2
@@ -1,14 +1,14 @@ 

  From ede6c9689395499f98a4c14d76b97151b4de5f54 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Wed, 3 May 2017 12:58:15 +0200

- Subject: [PATCH 011/198] Add strtoull test.

+ Subject: [PATCH 011/206] Add strtoull test.

  

  ---

   grub-core/Makefile.core.def | 5 +++++

   1 file changed, 5 insertions(+)

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 2dfa22a92..8dcd0e5a9 100644

+ index 2dfa22a9271b..8dcd0e5a9982 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -1961,6 +1961,11 @@ module = {

@@ -1,7 +1,7 @@ 

  From dc6e1b5af83eb1c4290baf97c2d221c0865127be Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Wed, 10 Aug 2016 17:49:42 +0200

- Subject: [PATCH 012/198] strtoull: Fix behaviour on chars between '9' and 'a'.

+ Subject: [PATCH 012/206] strtoull: Fix behaviour on chars between '9' and 'a'.

  

  Reported by: Aaron Miller <aaronmiller@fb.com>

  ---
@@ -10,7 +10,7 @@ 

   2 files changed, 18 insertions(+), 8 deletions(-)

  

  diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c

- index d1a54df6c..3b633d51f 100644

+ index d1a54df6c12e..3b633d51f4c6 100644

  --- a/grub-core/kern/misc.c

  +++ b/grub-core/kern/misc.c

  @@ -391,12 +391,13 @@ grub_strtoull (const char *str, char **end, int base)
@@ -34,7 +34,7 @@ 

         found = 1;

   

  diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c

- index d4822a124..96781fb39 100644

+ index d4822a124565..96781fb39b5f 100644

  --- a/grub-core/tests/lib/functional_test.c

  +++ b/grub-core/tests/lib/functional_test.c

  @@ -26,14 +26,23 @@ GRUB_MOD_LICENSE ("GPLv3+");

@@ -1,7 +1,7 @@ 

  From d9f7de0ae3c0c09cff7257c55418450261f3e082 Mon Sep 17 00:00:00 2001

  From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>

  Date: Mon, 23 Dec 2013 12:32:02 -0200

- Subject: [PATCH 013/198] Add Virtual LAN support.

+ Subject: [PATCH 013/206] Add Virtual LAN 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
@@ -26,7 +26,7 @@ 

   7 files changed, 92 insertions(+), 20 deletions(-)

  

  diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c

- index 4b68c4151..54306e3b1 100644

+ index 4b68c4151a11..54306e3b16d2 100644

  --- a/grub-core/net/arp.c

  +++ b/grub-core/net/arp.c

  @@ -111,8 +111,8 @@ grub_net_arp_send_request (struct grub_net_network_level_interface *inf,
@@ -56,7 +56,7 @@ 

       if (grub_net_addr_cmp (&inf->address, &target_addr) == 0

   	&& arp_packet->op == grub_cpu_to_be16_compile_time (ARP_REQUEST))

  diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c

- index a78d164db..002446be1 100644

+ index a78d164db1a0..002446be1c38 100644

  --- a/grub-core/net/drivers/ieee1275/ofnet.c

  +++ b/grub-core/net/drivers/ieee1275/ofnet.c

  @@ -153,11 +153,11 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,
@@ -96,7 +96,7 @@ 

   

     if (gateway_addr.ipv4 != 0)

  diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c

- index c397b1b34..4d7ceed6f 100644

+ index c397b1b348ce..4d7ceed6f93c 100644

  --- a/grub-core/net/ethernet.c

  +++ b/grub-core/net/ethernet.c

  @@ -18,6 +18,7 @@
@@ -192,7 +192,7 @@ 

     grub_netbuff_free (nb);

     return GRUB_ERR_NONE;

  diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c

- index aba4f8908..7c95cc746 100644

+ index aba4f89087bc..7c95cc7464a0 100644

  --- a/grub-core/net/ip.c

  +++ b/grub-core/net/ip.c

  @@ -228,12 +228,13 @@ handle_dgram (struct grub_net_buff *nb,
@@ -294,7 +294,7 @@ 

     grub_netbuff_free (nb);

     return GRUB_ERR_NONE;

  diff --git a/include/grub/net.h b/include/grub/net.h

- index 2192fa186..1096b2432 100644

+ index 2192fa186288..1096b24322eb 100644

  --- a/include/grub/net.h

  +++ b/include/grub/net.h

  @@ -291,6 +291,7 @@ struct grub_net_network_level_interface
@@ -313,7 +313,7 @@ 

  +

   #endif /* ! GRUB_NET_HEADER */

  diff --git a/include/grub/net/arp.h b/include/grub/net/arp.h

- index bb1703622..8d9d08113 100644

+ index bb1703622e15..8d9d081134f5 100644

  --- a/include/grub/net/arp.h

  +++ b/include/grub/net/arp.h

  @@ -22,10 +22,11 @@
@@ -331,7 +331,7 @@ 

   

   #endif 

  diff --git a/include/grub/net/ip.h b/include/grub/net/ip.h

- index dcceaa568..ab9d68f98 100644

+ index dcceaa568946..ab9d68f98252 100644

  --- a/include/grub/net/ip.h

  +++ b/include/grub/net/ip.h

  @@ -48,7 +48,8 @@ grub_err_t

@@ -1,7 +1,7 @@ 

  From a35ac854308b0af7c86c2c7b199f6abdfa2110b0 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 17:32:15 +0200

- Subject: [PATCH 014/198] mkimage: Pass layout to mkimage_generate_elfXX rather

+ Subject: [PATCH 014/206] mkimage: Pass layout to mkimage_generate_elfXX rather

   than some fields.

  

  This allows easier extension of this function without having too long of
@@ -13,7 +13,7 @@ 

   3 files changed, 24 insertions(+), 23 deletions(-)

  

  diff --git a/include/grub/util/mkimage.h b/include/grub/util/mkimage.h

- index 1a18708a8..b3a5ca132 100644

+ index 1a18708a89c6..b3a5ca132bc4 100644

  --- a/include/grub/util/mkimage.h

  +++ b/include/grub/util/mkimage.h

  @@ -51,13 +51,13 @@ grub_mkimage_load_image64 (const char *kernel_path,
@@ -35,7 +35,7 @@ 

   struct grub_install_image_target_desc

   {

  diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c

- index e63f148e4..3fab93e20 100644

+ index e63f148e48cf..3fab93e20884 100644

  --- a/util/grub-mkimagexx.c

  +++ b/util/grub-mkimagexx.c

  @@ -185,8 +185,8 @@ grub_arm_reloc_jump24 (grub_uint32_t *target, Elf32_Addr sym_addr)
@@ -147,7 +147,7 @@ 

   	shdr->sh_size = grub_host_to_target32 (XEN_NOTE_SIZE);

   	shdr->sh_link = grub_host_to_target32 (0);

  diff --git a/util/mkimage.c b/util/mkimage.c

- index 9ad4cfe42..528166c87 100644

+ index 9ad4cfe4223b..528166c87ac4 100644

  --- a/util/mkimage.c

  +++ b/util/mkimage.c

  @@ -1638,10 +1638,10 @@ grub_install_generate_image (const char *dir, const char *prefix,

@@ -1,7 +1,7 @@ 

  From d08c9685149e7788001ac9a209baa1d84c3628e0 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 17:47:57 +0200

- Subject: [PATCH 015/198] Refactor arm-uboot code to make it genereic.

+ Subject: [PATCH 015/206] Refactor arm-uboot code to make it genereic.

  

  arm-coreboot startup code can be very similar to arm-uboot but current code has

  U-Boot specific references. So split U-Boot part from generic part.
@@ -20,7 +20,7 @@ 

   create mode 100644 include/grub/arm/startup.h

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 8dcd0e5a9..fb59a7b1d 100644

+ index 8dcd0e5a9982..fb59a7b1d6a3 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -105,7 +105,7 @@ kernel = {
@@ -45,7 +45,7 @@ 

  similarity index 77%

  rename from grub-core/kern/arm/uboot/startup.S

  rename to grub-core/kern/arm/startup.S

- index 5efaae16e..640837cba 100644

+ index 5efaae16e838..640837cba516 100644

  --- a/grub-core/kern/arm/uboot/startup.S

  +++ b/grub-core/kern/arm/startup.S

  @@ -86,7 +86,7 @@ FUNCTION(codestart)
@@ -136,7 +136,7 @@ 

  +entry_state:

  diff --git a/grub-core/kern/arm/uboot/init.c b/grub-core/kern/arm/uboot/init.c

  new file mode 100644

- index 000000000..2a6aa3fdd

+ index 000000000000..2a6aa3fdd3dd

  --- /dev/null

  +++ b/grub-core/kern/arm/uboot/init.c

  @@ -0,0 +1,70 @@
@@ -212,7 +212,7 @@ 

  +}

  diff --git a/grub-core/kern/arm/uboot/uboot.S b/grub-core/kern/arm/uboot/uboot.S

  new file mode 100644

- index 000000000..d128775f1

+ index 000000000000..d128775f19ea

  --- /dev/null

  +++ b/grub-core/kern/arm/uboot/uboot.S

  @@ -0,0 +1,73 @@
@@ -290,7 +290,7 @@ 

  +

  +	END

  diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c

- index 5dcc106ed..3e338645c 100644

+ index 5dcc106ed9bc..3e338645c573 100644

  --- a/grub-core/kern/uboot/init.c

  +++ b/grub-core/kern/uboot/init.c

  @@ -36,30 +36,14 @@
@@ -325,7 +325,7 @@ 

   uboot_timer_ms (void)

   {

  diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c

- index 6800a4beb..cf0168e62 100644

+ index 6800a4beb1c4..cf0168e62ddd 100644

  --- a/grub-core/kern/uboot/uboot.c

  +++ b/grub-core/kern/uboot/uboot.c

  @@ -39,48 +39,13 @@
@@ -379,7 +379,7 @@ 

    * All functions below are wrappers around the grub_uboot_syscall() function

  diff --git a/include/grub/arm/startup.h b/include/grub/arm/startup.h

  new file mode 100644

- index 000000000..9afb6c57c

+ index 000000000000..9afb6c57c0bc

  --- /dev/null

  +++ b/include/grub/arm/startup.h

  @@ -0,0 +1,16 @@

@@ -1,7 +1,7 @@ 

  From 461bfab7b7e47fd0a76bf6076a438af1b7e2184a Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 19:06:22 +0200

- Subject: [PATCH 016/198] coreboot: Split parts that are platform-independent.

+ Subject: [PATCH 016/206] coreboot: Split parts that are platform-independent.

  

  We currently assume that coreboot is always i386, it's no longer the case,

  so split i386-coreboot parts from generic coreboot code.
@@ -23,7 +23,7 @@ 

   rename include/grub/{i386 => }/coreboot/lbio.h (93%)

  

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index 809a8aa26..781d0ffbf 100644

+ index 809a8aa26bfb..781d0ffbf750 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -112,7 +112,7 @@ endif
@@ -36,7 +36,7 @@ 

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index fb59a7b1d..45ed0fa6b 100644

+ index fb59a7b1d6a3..45ed0fa6b1ce 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -166,7 +166,7 @@ kernel = {
@@ -68,7 +68,7 @@ 

     enable = i386_efi;

     enable = i386_qemu;

  diff --git a/grub-core/commands/i386/coreboot/cb_timestamps.c b/grub-core/commands/i386/coreboot/cb_timestamps.c

- index e72f38d6e..e97ea6bed 100644

+ index e72f38d6e057..e97ea6bed98b 100644

  --- a/grub-core/commands/i386/coreboot/cb_timestamps.c

  +++ b/grub-core/commands/i386/coreboot/cb_timestamps.c

  @@ -20,7 +20,7 @@
@@ -81,7 +81,7 @@ 

   

   GRUB_MOD_LICENSE ("GPLv3+");

  diff --git a/grub-core/commands/i386/coreboot/cbls.c b/grub-core/commands/i386/coreboot/cbls.c

- index e0a10596f..102291f42 100644

+ index e0a10596fe27..102291f424ab 100644

  --- a/grub-core/commands/i386/coreboot/cbls.c

  +++ b/grub-core/commands/i386/coreboot/cbls.c

  @@ -20,7 +20,7 @@
@@ -95,7 +95,7 @@ 

   GRUB_MOD_LICENSE ("GPLv3+");

  diff --git a/grub-core/kern/coreboot/cbtable.c b/grub-core/kern/coreboot/cbtable.c

  new file mode 100644

- index 000000000..996d3f407

+ index 000000000000..996d3f407382

  --- /dev/null

  +++ b/grub-core/kern/coreboot/cbtable.c

  @@ -0,0 +1,70 @@
@@ -173,7 +173,7 @@ 

  similarity index 97%

  rename from grub-core/kern/i386/coreboot/mmap.c

  rename to grub-core/kern/coreboot/mmap.c

- index 4d29f6b7d..caf8f7cef 100644

+ index 4d29f6b7d905..caf8f7cef1b4 100644

  --- a/grub-core/kern/i386/coreboot/mmap.c

  +++ b/grub-core/kern/coreboot/mmap.c

  @@ -16,8 +16,8 @@
@@ -204,7 +204,7 @@ 

   		     /* Multiboot mmaps match with the coreboot mmap

   		        definition.  Therefore, we can just pass type

  diff --git a/grub-core/kern/i386/coreboot/cbtable.c b/grub-core/kern/i386/coreboot/cbtable.c

- index 1669bc0ca..34a2b59be 100644

+ index 1669bc0ca23a..34a2b59be1ff 100644

  --- a/grub-core/kern/i386/coreboot/cbtable.c

  +++ b/grub-core/kern/i386/coreboot/cbtable.c

  @@ -17,7 +17,7 @@
@@ -283,7 +283,7 @@ 

     return 0;

   }

  diff --git a/grub-core/term/i386/coreboot/cbmemc.c b/grub-core/term/i386/coreboot/cbmemc.c

- index 25e64a05c..129248c7f 100644

+ index 25e64a05c032..129248c7f472 100644

  --- a/grub-core/term/i386/coreboot/cbmemc.c

  +++ b/grub-core/term/i386/coreboot/cbmemc.c

  @@ -23,7 +23,7 @@
@@ -299,7 +299,7 @@ 

  similarity index 99%

  rename from grub-core/video/i386/coreboot/cbfb.c

  rename to grub-core/video/coreboot/cbfb.c

- index dede0c37e..9af81fa5b 100644

+ index dede0c37ea3e..9af81fa5b01b 100644

  --- a/grub-core/video/i386/coreboot/cbfb.c

  +++ b/grub-core/video/coreboot/cbfb.c

  @@ -25,7 +25,7 @@
@@ -315,7 +315,7 @@ 

  similarity index 93%

  rename from include/grub/i386/coreboot/lbio.h

  rename to include/grub/coreboot/lbio.h

- index 1c3fa6f19..5076d36c7 100644

+ index 1c3fa6f1953c..5076d36c71ba 100644

  --- a/include/grub/i386/coreboot/lbio.h

  +++ b/include/grub/coreboot/lbio.h

  @@ -20,6 +20,9 @@

@@ -1,7 +1,7 @@ 

  From 1daa716c7017f1858de117a20a31da66815435c5 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 19:31:55 +0200

- Subject: [PATCH 017/198] Rename uboot/halt.c to dummy/halt.c.

+ Subject: [PATCH 017/206] Rename uboot/halt.c to dummy/halt.c.

  

  It's not U-Boot specific and it's a stub.

  ---
@@ -11,7 +11,7 @@ 

   rename grub-core/lib/{uboot => dummy}/halt.c (100%)

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 45ed0fa6b..2a38bd4bc 100644

+ index 45ed0fa6b1ce..2a38bd4bc8a8 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -841,7 +841,7 @@ module = {

@@ -1,7 +1,7 @@ 

  From 9808c3ef956c6472a96790b60cf74f4eaa742010 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 19:37:29 +0200

- Subject: [PATCH 018/198] Rename uboot/datetime to dummy/datetime.

+ Subject: [PATCH 018/206] Rename uboot/datetime to dummy/datetime.

  

  It's just a stub and is not UBoot-specific.

  ---
@@ -11,7 +11,7 @@ 

   rename grub-core/lib/{uboot => dummy}/datetime.c (91%)

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 2a38bd4bc..6540dc951 100644

+ index 2a38bd4bc8a8..6540dc951d4c 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -1552,7 +1552,7 @@ module = {
@@ -27,7 +27,7 @@ 

  similarity index 91%

  rename from grub-core/lib/uboot/datetime.c

  rename to grub-core/lib/dummy/datetime.c

- index 4be716928..cf693fc6b 100644

+ index 4be716928a55..cf693fc6b621 100644

  --- a/grub-core/lib/uboot/datetime.c

  +++ b/grub-core/lib/dummy/datetime.c

  @@ -18,7 +18,6 @@

@@ -1,7 +1,7 @@ 

  From 24e37a885269bdec9b27babf1da0bba3692d55c0 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 20:53:28 +0200

- Subject: [PATCH 019/198] arm-coreboot: Start new port.

+ Subject: [PATCH 019/206] arm-coreboot: Start new port.

  

  ---

   configure.ac                           |   2 +
@@ -31,7 +31,7 @@ 

   create mode 100644 include/grub/arm/coreboot/kernel.h

  

  diff --git a/configure.ac b/configure.ac

- index ee2c86537..571f7a0b5 100644

+ index ee2c86537e98..571f7a0b5aa4 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -167,6 +167,7 @@ case "$target_cpu"-"$platform" in
@@ -51,7 +51,7 @@ 

   AM_CONDITIONAL([COND_arm64], [test x$target_cpu = xarm64 ])

   AM_CONDITIONAL([COND_arm64_efi], [test x$target_cpu = xarm64 -a x$platform = xefi])

  diff --git a/gentpl.py b/gentpl.py

- index f08bcc404..ed268178b 100644

+ index f08bcc404f6a..ed268178b4db 100644

  --- a/gentpl.py

  +++ b/gentpl.py

  @@ -31,7 +31,8 @@ GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
@@ -91,7 +91,7 @@ 

   for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i)

   

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index 781d0ffbf..bec058554 100644

+ index 781d0ffbf750..bec0585549a1 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -239,6 +239,16 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h
@@ -112,7 +112,7 @@ 

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/efi/loader.h

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 6540dc951..411dca46b 100644

+ index 6540dc951d4c..411dca46bf28 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -92,6 +92,8 @@ kernel = {
@@ -199,7 +199,7 @@ 

     sparc64_ieee1275 = lib/ieee1275/cmos.c;

  diff --git a/grub-core/kern/arm/coreboot/cbtable.c b/grub-core/kern/arm/coreboot/cbtable.c

  new file mode 100644

- index 000000000..8a655bb5c

+ index 000000000000..8a655bb5cc28

  --- /dev/null

  +++ b/grub-core/kern/arm/coreboot/cbtable.c

  @@ -0,0 +1,40 @@
@@ -245,7 +245,7 @@ 

  +}

  diff --git a/grub-core/kern/arm/coreboot/coreboot.S b/grub-core/kern/arm/coreboot/coreboot.S

  new file mode 100644

- index 000000000..a1104526c

+ index 000000000000..a1104526c154

  --- /dev/null

  +++ b/grub-core/kern/arm/coreboot/coreboot.S

  @@ -0,0 +1,44 @@
@@ -295,7 +295,7 @@ 

  +

  diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c

  new file mode 100644

- index 000000000..51ecaceb0

+ index 000000000000..51ecaceb005b

  --- /dev/null

  +++ b/grub-core/kern/arm/coreboot/init.c

  @@ -0,0 +1,127 @@
@@ -428,7 +428,7 @@ 

  +}

  diff --git a/grub-core/kern/arm/coreboot/timer.c b/grub-core/kern/arm/coreboot/timer.c

  new file mode 100644

- index 000000000..ebefb99d5

+ index 000000000000..ebefb99d58f8

  --- /dev/null

  +++ b/grub-core/kern/arm/coreboot/timer.c

  @@ -0,0 +1,65 @@
@@ -498,7 +498,7 @@ 

  +    grub_fatal ("No timer found");

  +}

  diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S

- index 640837cba..3946fe8e1 100644

+ index 640837cba516..3946fe8e1830 100644

  --- a/grub-core/kern/arm/startup.S

  +++ b/grub-core/kern/arm/startup.S

  @@ -24,6 +24,7 @@
@@ -527,7 +527,7 @@ 

   	@ Since we _are_ the C run-time, we need to manually zero the BSS

   	@ region before continuing

  diff --git a/grub-core/kern/coreboot/cbtable.c b/grub-core/kern/coreboot/cbtable.c

- index 996d3f407..aec63dbd1 100644

+ index 996d3f407382..aec63dbd1209 100644

  --- a/grub-core/kern/coreboot/cbtable.c

  +++ b/grub-core/kern/coreboot/cbtable.c

  @@ -23,6 +23,8 @@
@@ -541,7 +541,7 @@ 

   grub_linuxbios_check_signature (grub_linuxbios_table_header_t tbl_header)

  diff --git a/grub-core/lib/dummy/reboot.c b/grub-core/lib/dummy/reboot.c

  new file mode 100644

- index 000000000..b8cbed8f8

+ index 000000000000..b8cbed8f8117

  --- /dev/null

  +++ b/grub-core/lib/dummy/reboot.c

  @@ -0,0 +1,32 @@
@@ -578,7 +578,7 @@ 

  +  while (1);

  +}

  diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c

- index 5b39f02bb..01374ee78 100644

+ index 5b39f02bb2e5..01374ee78fa6 100644

  --- a/grub-core/loader/arm/linux.c

  +++ b/grub-core/loader/arm/linux.c

  @@ -31,6 +31,8 @@
@@ -597,7 +597,7 @@ 

  +#endif

  diff --git a/include/grub/arm/coreboot/console.h b/include/grub/arm/coreboot/console.h

  new file mode 100644

- index 000000000..13a14b783

+ index 000000000000..13a14b783839

  --- /dev/null

  +++ b/include/grub/arm/coreboot/console.h

  @@ -0,0 +1,29 @@
@@ -632,7 +632,7 @@ 

  +#endif /* ! GRUB_MACHINE_CONSOLE_HEADER */

  diff --git a/include/grub/arm/coreboot/kernel.h b/include/grub/arm/coreboot/kernel.h

  new file mode 100644

- index 000000000..09cd7fe32

+ index 000000000000..09cd7fe328c7

  --- /dev/null

  +++ b/include/grub/arm/coreboot/kernel.h

  @@ -0,0 +1,44 @@
@@ -681,7 +681,7 @@ 

  +

  +#endif /* ! GRUB_KERNEL_MACHINE_HEADER */

  diff --git a/include/grub/offsets.h b/include/grub/offsets.h

- index c88c86d4d..bf0689fc9 100644

+ index c88c86d4d2eb..bf0689fc99a8 100644

  --- a/include/grub/offsets.h

  +++ b/include/grub/offsets.h

  @@ -122,6 +122,12 @@
@@ -698,7 +698,7 @@ 

      for PowerMac to prevent "CLAIM failed" error.  The real fix is to

      rewrite grub-mkimage to generate valid ELF files.  */

  diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c

- index 3fab93e20..a2bb05439 100644

+ index 3fab93e20884..a2bb05439f0c 100644

  --- a/util/grub-mkimagexx.c

  +++ b/util/grub-mkimagexx.c

  @@ -87,7 +87,8 @@ struct fixup_block_list
@@ -764,7 +764,7 @@ 

         {

   	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)

  diff --git a/util/mkimage.c b/util/mkimage.c

- index 528166c87..6aa77ed73 100644

+ index 528166c87ac4..6aa77ed73675 100644

  --- a/util/mkimage.c

  +++ b/util/mkimage.c

  @@ -533,6 +533,45 @@ static const struct grub_install_image_target_desc image_targets[] =

@@ -1,7 +1,7 @@ 

  From fcbb723d4b1f7ad4687191562621dd0eb25f4d9e Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 21:19:59 +0200

- Subject: [PATCH 020/198] Add support for device-tree-based drivers.

+ Subject: [PATCH 020/206] Add support for device-tree-based drivers.

  

  ---

   conf/Makefile.common               |   4 +-
@@ -22,7 +22,7 @@ 

   create mode 100644 include/grub/fdtbus.h

  

  diff --git a/conf/Makefile.common b/conf/Makefile.common

- index 11296b550..311da61c6 100644

+ index 11296b550a7c..311da61c6c59 100644

  --- a/conf/Makefile.common

  +++ b/conf/Makefile.common

  @@ -86,9 +86,11 @@ CPPFLAGS_TERMINAL_LIST += '-Dgrub_term_register_output(...)=OUTPUT_TERMINAL_LIST
@@ -39,7 +39,7 @@ 

   # Define these variables to calm down automake

   

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index bec058554..fc6ca3051 100644

+ index bec0585549a1..fc6ca305147d 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -368,6 +368,16 @@ terminal.lst: $(MARKER_FILES)
@@ -60,7 +60,7 @@ 

   	(for pp in $^; do \

   	  b=`basename $$pp .marker`; \

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 411dca46b..77d0b019e 100644

+ index 411dca46bf28..77d0b019eb28 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -158,6 +158,8 @@ kernel = {
@@ -74,7 +74,7 @@ 

     terminfoinkernel = term/tparm.c;

  diff --git a/grub-core/bus/fdt.c b/grub-core/bus/fdt.c

  new file mode 100644

- index 000000000..6fb077000

+ index 000000000000..6fb077000a57

  --- /dev/null

  +++ b/grub-core/bus/fdt.c

  @@ -0,0 +1,255 @@
@@ -334,7 +334,7 @@ 

  +  return dtb;

  +}

  diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c

- index 51ecaceb0..aec75c672 100644

+ index 51ecaceb005b..aec75c672a24 100644

  --- a/grub-core/kern/arm/coreboot/init.c

  +++ b/grub-core/kern/arm/coreboot/init.c

  @@ -33,6 +33,7 @@
@@ -379,7 +379,7 @@ 

   }

   

  diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c

- index b5d520f20..bdc630244 100644

+ index b5d520f20888..bdc6302448d0 100644

  --- a/grub-core/lib/fdt.c

  +++ b/grub-core/lib/fdt.c

  @@ -102,13 +102,13 @@ static grub_uint32_t *get_next_node (const void *fdt, char *node_name)
@@ -589,7 +589,7 @@ 

   		       const void *val, grub_uint32_t len)

   {

  diff --git a/include/grub/fdt.h b/include/grub/fdt.h

- index fdfca75bf..75525fa31 100644

+ index fdfca75bf487..75525fa317c3 100644

  --- a/include/grub/fdt.h

  +++ b/include/grub/fdt.h

  @@ -20,6 +20,7 @@
@@ -633,7 +633,7 @@ 

     grub_uint32_t _val = grub_cpu_to_be32(val); \

  diff --git a/include/grub/fdtbus.h b/include/grub/fdtbus.h

  new file mode 100644

- index 000000000..985837e55

+ index 000000000000..985837e55f6c

  --- /dev/null

  +++ b/include/grub/fdtbus.h

  @@ -0,0 +1,73 @@
@@ -711,7 +711,7 @@ 

  +

  +#endif

  diff --git a/include/grub/kernel.h b/include/grub/kernel.h

- index 20ddf2da2..ecd88ca72 100644

+ index 20ddf2da297d..ecd88ca72c6d 100644

  --- a/include/grub/kernel.h

  +++ b/include/grub/kernel.h

  @@ -28,7 +28,8 @@ enum
@@ -725,7 +725,7 @@ 

   

   /* The module header.  */

  diff --git a/include/grub/util/install.h b/include/grub/util/install.h

- index 5ca4811cd..6abd288c3 100644

+ index 5ca4811cd130..6abd288c313e 100644

  --- a/include/grub/util/install.h

  +++ b/include/grub/util/install.h

  @@ -176,7 +176,7 @@ grub_install_generate_image (const char *dir, const char *prefix,
@@ -738,7 +738,7 @@ 

   const struct grub_install_image_target_desc *

   grub_install_get_image_target (const char *arg);

  diff --git a/util/grub-install-common.c b/util/grub-install-common.c

- index 452b230da..8539ff348 100644

+ index 452b230daedc..8539ff3484dc 100644

  --- a/util/grub-install-common.c

  +++ b/util/grub-install-common.c

  @@ -499,7 +499,7 @@ grub_install_make_image_wrap_file (const char *dir, const char *prefix,
@@ -751,7 +751,7 @@ 

       grub_install_pop_module ();

   }

  diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c

- index aba19d21b..98d24cc06 100644

+ index aba19d21b9a7..98d24cc06ea5 100644

  --- a/util/grub-mkimage.c

  +++ b/util/grub-mkimage.c

  @@ -71,6 +71,7 @@ static struct argp_option options[] = {
@@ -794,7 +794,7 @@ 

     grub_util_file_sync  (fp);

     fclose (fp);

  diff --git a/util/mkimage.c b/util/mkimage.c

- index 6aa77ed73..e22d82afa 100644

+ index 6aa77ed73675..e22d82afa61a 100644

  --- a/util/mkimage.c

  +++ b/util/mkimage.c

  @@ -777,13 +777,12 @@ grub_install_generate_image (const char *dir, const char *prefix,

@@ -1,14 +1,14 @@ 

  From 5a865b37866ee8cd64c080bc6fb1e537f8e2b3c6 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 21:26:36 +0200

- Subject: [PATCH 021/198] arm-coreboot: Support for vexpress timer.

+ Subject: [PATCH 021/206] arm-coreboot: Support for vexpress timer.

  

  ---

   grub-core/kern/arm/coreboot/timer.c | 36 ++++++++++++++++++++++++++++++++++++

   1 file changed, 36 insertions(+)

  

  diff --git a/grub-core/kern/arm/coreboot/timer.c b/grub-core/kern/arm/coreboot/timer.c

- index ebefb99d5..d97b844f8 100644

+ index ebefb99d58f8..d97b844f8487 100644

  --- a/grub-core/kern/arm/coreboot/timer.c

  +++ b/grub-core/kern/arm/coreboot/timer.c

  @@ -21,6 +21,7 @@

@@ -1,7 +1,7 @@ 

  From ac6b41b89fbb82a3ba843a7ed19115d81432b604 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 21:29:48 +0200

- Subject: [PATCH 022/198] arm-coreboot: Export FDT routines.

+ Subject: [PATCH 022/206] arm-coreboot: Export FDT routines.

  

  We need to use them from modules as well.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 2 insertions(+)

  

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index fc6ca3051..147e6959c 100644

+ index fc6ca305147d..147e6959c971 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -246,7 +246,9 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h

@@ -1,7 +1,7 @@ 

  From 216950a4eea1a1ead1c28eaca94e34ea2ef2ad19 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 21:41:22 +0200

- Subject: [PATCH 023/198] at_keyboard: Split protocol from controller code.

+ Subject: [PATCH 023/206] at_keyboard: Split protocol from controller code.

  

  On vexpress controller is different but protocol is the same, so reuse the

  code.
@@ -16,7 +16,7 @@ 

   create mode 100644 include/grub/ps2.h

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 77d0b019e..6ade6e950 100644

+ index 77d0b019eb28..6ade6e950576 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -251,6 +251,7 @@ kernel = {
@@ -44,7 +44,7 @@ 

   };

   

  diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c

- index b4ea9ff7e..3ab4e205f 100644

+ index b4ea9ff7e637..3ab4e205f40b 100644

  --- a/grub-core/term/at_keyboard.c

  +++ b/grub-core/term/at_keyboard.c

  @@ -22,212 +22,21 @@
@@ -567,7 +567,7 @@ 

   }

  diff --git a/grub-core/term/ps2.c b/grub-core/term/ps2.c

  new file mode 100644

- index 000000000..7ae4e9f2f

+ index 000000000000..7ae4e9f2f8cd

  --- /dev/null

  +++ b/grub-core/term/ps2.c

  @@ -0,0 +1,387 @@
@@ -959,7 +959,7 @@ 

  +    }

  +}

  diff --git a/include/grub/at_keyboard.h b/include/grub/at_keyboard.h

- index b4f8ff0a0..b031523eb 100644

+ index b4f8ff0a0611..b031523eb7df 100644

  --- a/include/grub/at_keyboard.h

  +++ b/include/grub/at_keyboard.h

  @@ -27,10 +27,6 @@
@@ -975,7 +975,7 @@ 

   #define KEYBOARD_SCANCODE(x)	((x) & 0x7f)

  diff --git a/include/grub/ps2.h b/include/grub/ps2.h

  new file mode 100644

- index 000000000..4f2e527e4

+ index 000000000000..4f2e527e4976

  --- /dev/null

  +++ b/include/grub/ps2.h

  @@ -0,0 +1,43 @@

@@ -1,7 +1,7 @@ 

  From 848bed9d92cf20e9f25db4c69a20efad23996ca0 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 21:42:37 +0200

- Subject: [PATCH 024/198] arm_coreboot: Support keyboard for vexpress.

+ Subject: [PATCH 024/206] arm_coreboot: Support keyboard for vexpress.

  

  ---

   grub-core/Makefile.am              |   1 +
@@ -12,7 +12,7 @@ 

   create mode 100644 grub-core/term/arm/pl050.c

  

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index 147e6959c..a2aaf9f54 100644

+ index 147e6959c971..a2aaf9f54b00 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -240,6 +240,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h
@@ -24,7 +24,7 @@ 

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 6ade6e950..6be6e7f61 100644

+ index 6ade6e950576..6be6e7f61ee7 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -160,6 +160,9 @@ kernel = {
@@ -38,7 +38,7 @@ 

     terminfoinkernel = term/terminfo.c;

     terminfoinkernel = term/tparm.c;

  diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c

- index aec75c672..a06ccb72f 100644

+ index aec75c672a24..a06ccb72f42e 100644

  --- a/grub-core/kern/arm/coreboot/init.c

  +++ b/grub-core/kern/arm/coreboot/init.c

  @@ -133,6 +133,7 @@ grub_machine_init (void)
@@ -51,7 +51,7 @@ 

   void

  diff --git a/grub-core/term/arm/pl050.c b/grub-core/term/arm/pl050.c

  new file mode 100644

- index 000000000..e4cda3056

+ index 000000000000..e4cda305666d

  --- /dev/null

  +++ b/grub-core/term/arm/pl050.c

  @@ -0,0 +1,189 @@

@@ -1,7 +1,7 @@ 

  From 3edabad8fefb112cc4b2d43be6e97d43c909ceee Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 21:59:48 +0200

- Subject: [PATCH 025/198] arm_coreboot: Support grub-mkstandalone.

+ Subject: [PATCH 025/206] arm_coreboot: Support grub-mkstandalone.

  

  ---

   include/grub/util/install.h |  6 +++++-
@@ -10,7 +10,7 @@ 

   3 files changed, 22 insertions(+), 3 deletions(-)

  

  diff --git a/include/grub/util/install.h b/include/grub/util/install.h

- index 6abd288c3..5910b0c09 100644

+ index 6abd288c313e..5910b0c09bc8 100644

  --- a/include/grub/util/install.h

  +++ b/include/grub/util/install.h

  @@ -29,6 +29,8 @@
@@ -41,7 +41,7 @@ 

   

   extern char *grub_install_source_directory;

  diff --git a/util/grub-install-common.c b/util/grub-install-common.c

- index 8539ff348..9e3e358c9 100644

+ index 8539ff3484dc..9e3e358c96ae 100644

  --- a/util/grub-install-common.c

  +++ b/util/grub-install-common.c

  @@ -73,6 +73,7 @@ grub_install_help_filter (int key, const char *text,
@@ -94,7 +94,7 @@ 

   

   char *

  diff --git a/util/grub-install.c b/util/grub-install.c

- index 9074d3e9e..75e3e5ba6 100644

+ index 9074d3e9e52d..75e3e5ba6f07 100644

  --- a/util/grub-install.c

  +++ b/util/grub-install.c

  @@ -486,6 +486,7 @@ have_bootdev (enum grub_install_plat pl)

@@ -1,7 +1,7 @@ 

  From 656c3b0d7fbe23f0e1ab561c8faa4ac4a37364d1 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 22:00:06 +0200

- Subject: [PATCH 026/198] arm_coreboot: Support loading linux images.

+ Subject: [PATCH 026/206] arm_coreboot: Support loading linux images.

  

  ---

   grub-core/loader/arm/linux.c | 132 ++++++++++++++++++++++---------------------
@@ -9,7 +9,7 @@ 

   2 files changed, 83 insertions(+), 65 deletions(-)

  

  diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c

- index 01374ee78..260cbf068 100644

+ index 01374ee78fa6..260cbf06861e 100644

  --- a/grub-core/loader/arm/linux.c

  +++ b/grub-core/loader/arm/linux.c

  @@ -31,8 +31,6 @@
@@ -271,7 +271,7 @@ 

   }

  -#endif

  diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h

- index a66caad13..f217f8281 100644

+ index a66caad13db8..f217f8281ade 100644

  --- a/include/grub/arm/linux.h

  +++ b/include/grub/arm/linux.h

  @@ -46,6 +46,22 @@ grub_arm_firmware_get_machine_type (void)

@@ -1,7 +1,7 @@ 

  From 265292f2b0da0eb414c409871ba0f94a99ec33c1 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 22:06:04 +0200

- Subject: [PATCH 027/198] arm_coreboot: Support DMA.

+ Subject: [PATCH 027/206] arm_coreboot: Support DMA.

  

  This is needed to support USB and some other busses.

  ---
@@ -18,7 +18,7 @@ 

   create mode 100644 include/grub/dma.h

  

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index a2aaf9f54..104513847 100644

+ index a2aaf9f54b00..104513847204 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -248,6 +248,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
@@ -30,7 +30,7 @@ 

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdtbus.h

   endif

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 6be6e7f61..e4f253a20 100644

+ index 6be6e7f61ee7..e4f253a205e8 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -163,6 +163,7 @@ kernel = {
@@ -42,7 +42,7 @@ 

     terminfoinkernel = term/terminfo.c;

     terminfoinkernel = term/tparm.c;

  diff --git a/grub-core/kern/arm/cache.c b/grub-core/kern/arm/cache.c

- index 34154ccdb..af1c4bbf5 100644

+ index 34154ccdb0e0..af1c4bbf544f 100644

  --- a/grub-core/kern/arm/cache.c

  +++ b/grub-core/kern/arm/cache.c

  @@ -29,6 +29,8 @@ void grub_arm_clean_dcache_range_armv6 (grub_addr_t start, grub_addr_t end,
@@ -94,7 +94,7 @@ 

   grub_arm_disable_caches_mmu (void)

   {

  diff --git a/grub-core/kern/arm/cache_armv7.S b/grub-core/kern/arm/cache_armv7.S

- index 1ef2754af..5ae76a3d8 100644

+ index 1ef2754af8a7..5ae76a3d819c 100644

  --- a/grub-core/kern/arm/cache_armv7.S

  +++ b/grub-core/kern/arm/cache_armv7.S

  @@ -33,6 +33,18 @@
@@ -118,7 +118,7 @@ 

   	@ r2  - current level

  diff --git a/grub-core/kern/arm/coreboot/dma.c b/grub-core/kern/arm/coreboot/dma.c

  new file mode 100644

- index 000000000..2c2a62789

+ index 000000000000..2c2a62789046

  --- /dev/null

  +++ b/grub-core/kern/arm/coreboot/dma.c

  @@ -0,0 +1,59 @@
@@ -182,7 +182,7 @@ 

  +}

  +

  diff --git a/include/grub/cache.h b/include/grub/cache.h

- index fc669dfd1..1c98ce270 100644

+ index fc669dfd1892..1c98ce270b62 100644

  --- a/include/grub/cache.h

  +++ b/include/grub/cache.h

  @@ -34,15 +34,14 @@ void EXPORT_FUNC(grub_arch_sync_caches) (void *address, grub_size_t len);
@@ -206,7 +206,7 @@ 

   

  diff --git a/include/grub/dma.h b/include/grub/dma.h

  new file mode 100644

- index 000000000..19992ebc1

+ index 000000000000..19992ebc131d

  --- /dev/null

  +++ b/include/grub/dma.h

  @@ -0,0 +1,44 @@
@@ -255,7 +255,7 @@ 

  +

  +#endif

  diff --git a/include/grub/pci.h b/include/grub/pci.h

- index 70d9a0513..262c89b74 100644

+ index 70d9a05131b2..262c89b748bb 100644

  --- a/include/grub/pci.h

  +++ b/include/grub/pci.h

  @@ -142,27 +142,7 @@ grub_pci_address_t EXPORT_FUNC(grub_pci_make_address) (grub_pci_device_t dev,

@@ -1,7 +1,7 @@ 

  From 058df7b5a9cc7aaa9872eaa916b715544a8f9840 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 22:10:26 +0200

- Subject: [PATCH 028/198] ehci: Split core  code from PCI part.

+ Subject: [PATCH 028/206] ehci: Split core  code from PCI part.

  

  On ARM often EHCI is present without PCI and just declared in device

  tree. So splitcore from PCI part.
@@ -13,7 +13,7 @@ 

   create mode 100644 grub-core/bus/usb/ehci-pci.c

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index e4f253a20..4745eb4d9 100644

+ index e4f253a205e8..4745eb4d93ec 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -593,6 +593,7 @@ module = {
@@ -26,7 +26,7 @@ 

   

  diff --git a/grub-core/bus/usb/ehci-pci.c b/grub-core/bus/usb/ehci-pci.c

  new file mode 100644

- index 000000000..65e6cb574

+ index 000000000000..65e6cb57438b

  --- /dev/null

  +++ b/grub-core/bus/usb/ehci-pci.c

  @@ -0,0 +1,208 @@
@@ -239,7 +239,7 @@ 

  +  grub_pci_iterate (grub_ehci_pci_iter, NULL);

  +}

  diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c

- index 5f4297bb2..c772e7654 100644

+ index 5f4297bb21ec..c772e76546e2 100644

  --- a/grub-core/bus/usb/ehci.c

  +++ b/grub-core/bus/usb/ehci.c

  @@ -22,13 +22,10 @@

@@ -1,7 +1,7 @@ 

  From d11ced1e1fb93676942e51618eb53c140f541890 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 8 May 2017 22:14:28 +0200

- Subject: [PATCH 029/198] arm_coreboot: Support EHCI.

+ Subject: [PATCH 029/206] arm_coreboot: Support EHCI.

  

  ---

   gentpl.py                    |  2 +-
@@ -13,7 +13,7 @@ 

   create mode 100644 grub-core/bus/usb/ehci-fdt.c

  

  diff --git a/gentpl.py b/gentpl.py

- index ed268178b..da67965a4 100644

+ index ed268178b4db..da67965a41a4 100644

  --- a/gentpl.py

  +++ b/gentpl.py

  @@ -63,7 +63,7 @@ GROUPS["cmos"] = GROUPS["x86"][:] + ["mips_loongson", "mips_qemu_mips",
@@ -26,7 +26,7 @@ 

   # If gfxterm is main output console integrate it into kernel

   GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot", "arm_coreboot" ]

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 4745eb4d9..5ce506597 100644

+ index 4745eb4d93ec..5ce506597a67 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -593,8 +593,10 @@ module = {
@@ -42,7 +42,7 @@ 

   module = {

  diff --git a/grub-core/bus/usb/ehci-fdt.c b/grub-core/bus/usb/ehci-fdt.c

  new file mode 100644

- index 000000000..29b50bdd5

+ index 000000000000..29b50bdd5c30

  --- /dev/null

  +++ b/grub-core/bus/usb/ehci-fdt.c

  @@ -0,0 +1,45 @@
@@ -92,7 +92,7 @@ 

  +  grub_fdtbus_register (&ehci);

  +}

  diff --git a/grub-core/bus/usb/usbtrans.c b/grub-core/bus/usb/usbtrans.c

- index 9266e4931..85f081fff 100644

+ index 9266e49311c4..85f081fffb3a 100644

  --- a/grub-core/bus/usb/usbtrans.c

  +++ b/grub-core/bus/usb/usbtrans.c

  @@ -18,7 +18,7 @@
@@ -105,7 +105,7 @@ 

   #include <grub/misc.h>

   #include <grub/usb.h>

  diff --git a/include/grub/usb.h b/include/grub/usb.h

- index 11d96481f..512ae1dd0 100644

+ index 11d96481ff6b..512ae1dd0e64 100644

  --- a/include/grub/usb.h

  +++ b/include/grub/usb.h

  @@ -321,5 +321,9 @@ grub_usb_err_t

@@ -1,14 +1,14 @@ 

  From 4f8471532d454b2db96434c28bf7105ed69e0f4d Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Tue, 9 May 2017 08:39:40 +0200

- Subject: [PATCH 030/198] Fix bug on FDT nodes with compatible property

+ Subject: [PATCH 030/206] Fix bug on FDT nodes with compatible property

  

  ---

   grub-core/bus/fdt.c | 2 ++

   1 file changed, 2 insertions(+)

  

  diff --git a/grub-core/bus/fdt.c b/grub-core/bus/fdt.c

- index 6fb077000..34d535457 100644

+ index 6fb077000a57..34d535457327 100644

  --- a/grub-core/bus/fdt.c

  +++ b/grub-core/bus/fdt.c

  @@ -43,6 +43,8 @@ is_compatible (struct grub_fdtbus_driver *driver,

@@ -1,7 +1,7 @@ 

  From c4313c812dc14e82a774b580b5e34d40e7f3fae6 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Tue, 9 May 2017 08:40:29 +0200

- Subject: [PATCH 031/198] fdtbus: Add ability to send/receive messages on

+ Subject: [PATCH 031/206] fdtbus: Add ability to send/receive messages on

   parent busses.

  

  ---
@@ -10,7 +10,7 @@ 

   2 files changed, 34 insertions(+), 19 deletions(-)

  

  diff --git a/grub-core/bus/fdt.c b/grub-core/bus/fdt.c

- index 34d535457..135da497b 100644

+ index 34d535457327..135da497ba67 100644

  --- a/grub-core/bus/fdt.c

  +++ b/grub-core/bus/fdt.c

  @@ -25,30 +25,22 @@ static grub_size_t root_address_cells, root_size_cells;
@@ -87,7 +87,7 @@ 

         }

   }

  diff --git a/include/grub/fdtbus.h b/include/grub/fdtbus.h

- index 985837e55..f519c40ec 100644

+ index 985837e55f6c..f519c40ec35f 100644

  --- a/include/grub/fdtbus.h

  +++ b/include/grub/fdtbus.h

  @@ -22,7 +22,13 @@

@@ -1,7 +1,7 @@ 

  From b0b1b81a11f8bae8ab9e8edd87ac3f4f7949d03b Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Tue, 9 May 2017 08:42:14 +0200

- Subject: [PATCH 032/198] rk3288_spi: Add SPI driver

+ Subject: [PATCH 032/206] rk3288_spi: Add SPI driver

  

  ---

   grub-core/Makefile.core.def        |   1 +
@@ -12,7 +12,7 @@ 

   create mode 100644 grub-core/bus/spi/rk3288_spi.c

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 5ce506597..d2239f171 100644

+ index 5ce506597a67..d2239f1718db 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -162,6 +162,7 @@ kernel = {
@@ -25,7 +25,7 @@ 

   

  diff --git a/grub-core/bus/spi/rk3288_spi.c b/grub-core/bus/spi/rk3288_spi.c

  new file mode 100644

- index 000000000..aacb79ffe

+ index 000000000000..aacb79ffef10

  --- /dev/null

  +++ b/grub-core/bus/spi/rk3288_spi.c

  @@ -0,0 +1,103 @@
@@ -133,7 +133,7 @@ 

  +  grub_fdtbus_register (&spi);

  +}

  diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c

- index a06ccb72f..0126ff638 100644

+ index a06ccb72f42e..0126ff6381a5 100644

  --- a/grub-core/kern/arm/coreboot/init.c

  +++ b/grub-core/kern/arm/coreboot/init.c

  @@ -132,6 +132,8 @@ grub_machine_init (void)
@@ -146,7 +146,7 @@ 

     grub_pl050_init ();

   }

  diff --git a/include/grub/arm/coreboot/kernel.h b/include/grub/arm/coreboot/kernel.h

- index 09cd7fe32..269505342 100644

+ index 09cd7fe328c7..269505342705 100644

  --- a/include/grub/arm/coreboot/kernel.h

  +++ b/include/grub/arm/coreboot/kernel.h

  @@ -34,8 +34,8 @@ struct grub_fdt_board

@@ -1,7 +1,7 @@ 

  From 5c3fd1b135bd73c8e3467b9b635b25ca4d360a19 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Tue, 9 May 2017 08:47:34 +0200

- Subject: [PATCH 033/198] arm_coreboot: Add Chromebook keyboard driver.

+ Subject: [PATCH 033/206] arm_coreboot: Add Chromebook keyboard driver.

  

  ---

   grub-core/term/arm/cros.c    | 125 +++++++++++++++++++++++
@@ -14,7 +14,7 @@ 

  

  diff --git a/grub-core/term/arm/cros.c b/grub-core/term/arm/cros.c

  new file mode 100644

- index 000000000..1ff9f8ccf

+ index 000000000000..1ff9f8ccfb82

  --- /dev/null

  +++ b/grub-core/term/arm/cros.c

  @@ -0,0 +1,125 @@
@@ -145,7 +145,7 @@ 

  +}

  diff --git a/grub-core/term/arm/cros_ec.c b/grub-core/term/arm/cros_ec.c

  new file mode 100644

- index 000000000..f4144818b

+ index 000000000000..f4144818b5bf

  --- /dev/null

  +++ b/grub-core/term/arm/cros_ec.c

  @@ -0,0 +1,238 @@
@@ -389,7 +389,7 @@ 

  +

  diff --git a/include/grub/arm/cros_ec.h b/include/grub/arm/cros_ec.h

  new file mode 100644

- index 000000000..45a372572

+ index 000000000000..45a372572a5c

  --- /dev/null

  +++ b/include/grub/arm/cros_ec.h

  @@ -0,0 +1,21 @@

@@ -1,7 +1,7 @@ 

  From c6eaa982d12e3cfc5465dda5ea372774188b6b81 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Tue, 9 May 2017 09:02:15 +0200

- Subject: [PATCH 034/198] Missing parts of previous commit

+ Subject: [PATCH 034/206] Missing parts of previous commit

  

  ---

   grub-core/Makefile.core.def        | 2 ++
@@ -9,7 +9,7 @@ 

   2 files changed, 3 insertions(+)

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index d2239f171..1d86bd22e 100644

+ index d2239f1718db..1d86bd22e04e 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -162,6 +162,8 @@ kernel = {
@@ -22,7 +22,7 @@ 

     arm_coreboot = commands/keylayouts.c;

     arm_coreboot = kern/arm/coreboot/dma.c;

  diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c

- index 0126ff638..8d8c5b829 100644

+ index 0126ff6381a5..8d8c5b8291ef 100644

  --- a/grub-core/kern/arm/coreboot/init.c

  +++ b/grub-core/kern/arm/coreboot/init.c

  @@ -135,6 +135,7 @@ grub_machine_init (void)

@@ -1,7 +1,7 @@ 

  From 70b555a52a065b2beb91e6fc97a6b358c931b303 Mon Sep 17 00:00:00 2001

  From: Julius Werner <jwerner@chromium.org>

  Date: Tue, 9 May 2017 09:03:02 +0200

- Subject: [PATCH 035/198] coreboot: Changed cbmemc to support updated console

+ Subject: [PATCH 035/206] coreboot: Changed cbmemc to support updated console

   format from coreboot.

  

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 35 insertions(+), 15 deletions(-)

  

  diff --git a/grub-core/term/i386/coreboot/cbmemc.c b/grub-core/term/i386/coreboot/cbmemc.c

- index 129248c7f..cea9b8431 100644

+ index 129248c7f472..cea9b84315bd 100644

  --- a/grub-core/term/i386/coreboot/cbmemc.c

  +++ b/grub-core/term/i386/coreboot/cbmemc.c

  @@ -29,11 +29,14 @@

@@ -1,7 +1,7 @@ 

  From c4b8bec5fee4e30a165fd14a188cf3ab8eccd095 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Tue, 9 May 2017 14:27:52 +0200

- Subject: [PATCH 036/198] at_keyboard: Fix falco chromebook case.

+ Subject: [PATCH 036/206] at_keyboard: Fix falco chromebook case.

  

  EC is slow, so we need few delays for it to toggle the bits correctly.

  
@@ -12,7 +12,7 @@ 

   2 files changed, 16 insertions(+), 9 deletions(-)

  

  diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c

- index 3ab4e205f..f0a986eb1 100644

+ index 3ab4e205f40b..f0a986eb176a 100644

  --- a/grub-core/term/at_keyboard.c

  +++ b/grub-core/term/at_keyboard.c

  @@ -40,6 +40,8 @@ grub_keyboard_controller_init (void);
@@ -69,7 +69,7 @@ 

     write_mode (2);

     ps2_state.current_set = query_mode ();

  diff --git a/include/grub/at_keyboard.h b/include/grub/at_keyboard.h

- index b031523eb..bcb4d9ba7 100644

+ index b031523eb7df..bcb4d9ba78f1 100644

  --- a/include/grub/at_keyboard.h

  +++ b/include/grub/at_keyboard.h

  @@ -23,9 +23,11 @@

@@ -1,7 +1,7 @@ 

  From bd4e40aadded7093908d786d03b4acf60b7b1707 Mon Sep 17 00:00:00 2001

  From: Eric Snowberg <eric.snowberg@oracle.com>

  Date: Thu, 11 May 2017 18:42:23 -0700

- Subject: [PATCH 037/198] sparc64: Close cdboot ihandle

+ Subject: [PATCH 037/206] sparc64: Close cdboot ihandle

  

  The ihandle is left open with a cd-core image.  This will cause a delay

  booting grub from a virtual cdrom in a LDOM.  It will also cause problems
@@ -16,7 +16,7 @@ 

   1 file changed, 10 insertions(+)

  

  diff --git a/grub-core/boot/sparc64/ieee1275/boot.S b/grub-core/boot/sparc64/ieee1275/boot.S

- index 586efb401..9ea9b4e06 100644

+ index 586efb4014e8..9ea9b4e06627 100644

  --- a/grub-core/boot/sparc64/ieee1275/boot.S

  +++ b/grub-core/boot/sparc64/ieee1275/boot.S

  @@ -69,6 +69,10 @@ prom_seek_name:		.asciz "seek"

@@ -1,7 +1,7 @@ 

  From ae5817f1dcbf0b99f7a849f56afe442165317840 Mon Sep 17 00:00:00 2001

  From: Julien Grall <julien.grall@linaro.org>

  Date: Fri, 19 Feb 2016 16:28:52 +0000

- Subject: [PATCH 038/198] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64

+ Subject: [PATCH 038/206] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64

  

  Xen is currently crashing because of malformed compatible property for

  the boot module. This is because the property string is not
@@ -15,7 +15,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c

- index a914eb8e2..8ae43d7e8 100644

+ index a914eb8e2df2..8ae43d7e8945 100644

  --- a/grub-core/loader/arm64/xen_boot.c

  +++ b/grub-core/loader/arm64/xen_boot.c

  @@ -156,7 +156,7 @@ prepare_xen_module_params (struct xen_boot_binary *module, void *xen_boot_fdt)

@@ -1,7 +1,7 @@ 

  From 8eed7be8a61c295df700e918744a984162378ca9 Mon Sep 17 00:00:00 2001

  From: Fu Wei <fu.wei@linaro.org>

  Date: Sun, 14 May 2017 15:43:45 +0800

- Subject: [PATCH 039/198] arm64: Add "--nounzip" option support in xen_module

+ Subject: [PATCH 039/206] arm64: Add "--nounzip" option support in xen_module

   command

  

  This patch adds "--nounzip" option support in order to
@@ -18,7 +18,7 @@ 

   1 file changed, 16 insertions(+)

  

  diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c

- index 8ae43d7e8..27ede46ca 100644

+ index 8ae43d7e8945..27ede46cac50 100644

  --- a/grub-core/loader/arm64/xen_boot.c

  +++ b/grub-core/loader/arm64/xen_boot.c

  @@ -379,6 +379,20 @@ grub_cmd_xen_module (grub_command_t cmd __attribute__((unused)),

@@ -1,7 +1,7 @@ 

  From d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe Mon Sep 17 00:00:00 2001

  From: Fu Wei <fu.wei@linaro.org>

  Date: Sun, 14 May 2017 15:43:46 +0800

- Subject: [PATCH 040/198] util/grub.d/20_linux_xen.in: Add xen_boot command

+ Subject: [PATCH 040/206] util/grub.d/20_linux_xen.in: Add xen_boot command

   support for aarch64

  

  This patch adds the support of xen_boot command for aarch64:
@@ -20,7 +20,7 @@ 

   1 file changed, 11 insertions(+), 3 deletions(-)

  

  diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in

- index c48af948d..c002fc9f9 100644

+ index c48af948d6ec..c002fc9f9465 100644

  --- a/util/grub.d/20_linux_xen.in

  +++ b/util/grub.d/20_linux_xen.in

  @@ -122,16 +122,16 @@ linux_entry ()

@@ -1,7 +1,7 @@ 

  From 26c2f306fd425d2c0348023b8dcb7eb40a01851a Mon Sep 17 00:00:00 2001

  From: Fu Wei <fu.wei@linaro.org>

  Date: Sun, 14 May 2017 15:43:47 +0800

- Subject: [PATCH 041/198] arm64: Update the introduction of Xen boot commands

+ Subject: [PATCH 041/206] arm64: Update the introduction of Xen boot commands

   in docs/grub.texi

  

  delete: xen_linux, xen_initrd, xen_xsm
@@ -27,7 +27,7 @@ 

   1 file changed, 13 insertions(+), 25 deletions(-)

  

  diff --git a/docs/grub.texi b/docs/grub.texi

- index e935af33e..a0c4b9e4e 100644

+ index e935af33ea5e..a0c4b9e4e8e8 100644

  --- a/docs/grub.texi

  +++ b/docs/grub.texi

  @@ -3873,11 +3873,9 @@ you forget a command, you can run the command @command{help}

@@ -1,7 +1,7 @@ 

  From f8679cedff703b437171f4708d46adbfcff80a65 Mon Sep 17 00:00:00 2001

  From: Eric Snowberg <eric.snowberg@oracle.com>

  Date: Thu, 18 May 2017 17:10:22 -0600

- Subject: [PATCH 042/198] sparc64: Don't use devspec to determine the OBP path

+ Subject: [PATCH 042/206] sparc64: Don't use devspec to determine the OBP path

  

  Don't use devspec to determine the OBP path on SPARC hardware.  Within all

  versions of Linux on SPARC, the devspec returns one of three values:
@@ -28,7 +28,7 @@ 

   1 file changed, 3 insertions(+)

  

  diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c

- index a79682a5e..dce4e59d0 100644

+ index a79682a5e31e..dce4e59d0818 100644

  --- a/grub-core/osdep/linux/ofpath.c

  +++ b/grub-core/osdep/linux/ofpath.c

  @@ -120,6 +120,8 @@ find_obppath (const char *sysfs_path_orig)

@@ -1,7 +1,7 @@ 

  From 734668238fcc0ef691a080839e04f33854fa133a Mon Sep 17 00:00:00 2001

  From: Eric Biggers <ebiggers@google.com>

  Date: Thu, 29 Jun 2017 13:27:49 +0000

- Subject: [PATCH 043/198] Allow GRUB to mount ext2/3/4 filesystems that have

+ Subject: [PATCH 043/206] Allow GRUB to mount ext2/3/4 filesystems that have

   the encryption feature.

  

  On such a filesystem, inodes may have EXT4_ENCRYPT_FLAG set.
@@ -30,7 +30,7 @@ 

   3 files changed, 33 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c

- index cdce63bcc..b8ad75a0f 100644

+ index cdce63bcc9d5..b8ad75a0ff7c 100644

  --- a/grub-core/fs/ext2.c

  +++ b/grub-core/fs/ext2.c

  @@ -102,6 +102,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -99,7 +99,7 @@ 

     grub_free (fdiro);

   

  diff --git a/tests/ext234_test.in b/tests/ext234_test.in

- index 892b99cbd..4f1eb527e 100644

+ index 892b99cbdf64..4f1eb527eb2e 100644

  --- a/tests/ext234_test.in

  +++ b/tests/ext234_test.in

  @@ -30,3 +30,4 @@ fi
@@ -108,7 +108,7 @@ 

   "@builddir@/grub-fs-tester" ext4_metabg

  +"@builddir@/grub-fs-tester" ext4_encrypt

  diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in

- index 88cbe7365..fd7e0f14b 100644

+ index 88cbe7365e92..fd7e0f14b68e 100644

  --- a/tests/util/grub-fs-tester.in

  +++ b/tests/util/grub-fs-tester.in

  @@ -156,6 +156,12 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do

@@ -1,14 +1,14 @@ 

  From edb37fb30bbc8a3b6bec67911c7200e4eb071127 Mon Sep 17 00:00:00 2001

  From: phcoder <phcoder@sid.debian.laptop.phnet>

  Date: Sun, 9 Jul 2017 20:58:31 +0200

- Subject: [PATCH 044/198] ehci: Fix compilation for amd64

+ Subject: [PATCH 044/206] ehci: Fix compilation for amd64

  

  ---

   grub-core/bus/usb/ehci.c | 8 ++++----

   1 file changed, 4 insertions(+), 4 deletions(-)

  

  diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c

- index c772e7654..7b7061f53 100644

+ index c772e76546e2..7b7061f53354 100644

  --- a/grub-core/bus/usb/ehci.c

  +++ b/grub-core/bus/usb/ehci.c

  @@ -504,8 +504,8 @@ grub_ehci_init_device (volatile void *regs)

@@ -1,14 +1,14 @@ 

  From d8901e3ba115d705c9c08ecedd201aca8b4867b8 Mon Sep 17 00:00:00 2001

  From: phcoder <phcoder@sid.debian.laptop.phnet>

  Date: Sun, 9 Jul 2017 20:59:15 +0200

- Subject: [PATCH 045/198] cache: Fix compilation for ppc, sparc and arm64

+ Subject: [PATCH 045/206] cache: Fix compilation for ppc, sparc and arm64

  

  ---

   include/grub/cache.h | 4 +++-

   1 file changed, 3 insertions(+), 1 deletion(-)

  

  diff --git a/include/grub/cache.h b/include/grub/cache.h

- index 1c98ce270..ccfa717e6 100644

+ index 1c98ce270b62..ccfa717e6696 100644

  --- a/include/grub/cache.h

  +++ b/include/grub/cache.h

  @@ -34,7 +34,9 @@ void EXPORT_FUNC(grub_arch_sync_caches) (void *address, grub_size_t len);

@@ -1,14 +1,14 @@ 

  From 284afab081ef7ed7db2c59151853aa3c92d988f2 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Sun, 9 Jul 2017 21:31:19 +0200

- Subject: [PATCH 046/198] ehci: Fix compilation on i386

+ Subject: [PATCH 046/206] ehci: Fix compilation on i386

  

  ---

   grub-core/bus/usb/ehci.c | 4 ++--

   1 file changed, 2 insertions(+), 2 deletions(-)

  

  diff --git a/grub-core/bus/usb/ehci.c b/grub-core/bus/usb/ehci.c

- index 7b7061f53..d966fc210 100644

+ index 7b7061f53354..d966fc210026 100644

  --- a/grub-core/bus/usb/ehci.c

  +++ b/grub-core/bus/usb/ehci.c

  @@ -505,7 +505,7 @@ grub_ehci_init_device (volatile void *regs)

@@ -1,7 +1,7 @@ 

  From a0fe0c26aa8a1c0ad66d9527611bd726b849c623 Mon Sep 17 00:00:00 2001

  From: AppChecker <appchecker>

  Date: Sun, 9 Jul 2017 21:57:35 +0200

- Subject: [PATCH 047/198] crypto: Fix use after free.

+ Subject: [PATCH 047/206] crypto: Fix use after free.

  

  Reported by: AppChecker

  Transformed to patch by: Satish Govindarajan
@@ -10,7 +10,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/normal/crypto.c b/grub-core/normal/crypto.c

- index 2bfd67c8e..e6d345f33 100644

+ index 2bfd67c8ef38..e6d345f33458 100644

  --- a/grub-core/normal/crypto.c

  +++ b/grub-core/normal/crypto.c

  @@ -147,8 +147,8 @@ read_crypto_list (const char *prefix)

@@ -1,14 +1,14 @@ 

  From cb8b7e4e36bf32dccbbba8252aa44ad3ada4fbc1 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Sun, 9 Jul 2017 21:48:37 +0000

- Subject: [PATCH 048/198] arm-efi: Fix compilation

+ Subject: [PATCH 048/206] arm-efi: Fix compilation

  

  ---

   grub-core/loader/arm/linux.c | 8 ++++----

   1 file changed, 4 insertions(+), 4 deletions(-)

  

  diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c

- index 260cbf068..e64c79a95 100644

+ index 260cbf06861e..e64c79a95774 100644

  --- a/grub-core/loader/arm/linux.c

  +++ b/grub-core/loader/arm/linux.c

  @@ -252,12 +252,12 @@ linux_boot (void)

@@ -1,14 +1,14 @@ 

  From 68d54b55f49249c5e0517bf189f0f3df7ee6a36f Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 10 Jul 2017 01:34:22 +0000

- Subject: [PATCH 049/198] fdt: silence clang warning.

+ Subject: [PATCH 049/206] fdt: silence clang warning.

  

  ---

   grub-core/lib/fdt.c | 3 ++-

   1 file changed, 2 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/lib/fdt.c b/grub-core/lib/fdt.c

- index bdc630244..2705f2629 100644

+ index bdc6302448d0..2705f2629b9d 100644

  --- a/grub-core/lib/fdt.c

  +++ b/grub-core/lib/fdt.c

  @@ -309,7 +309,8 @@ advance_token (const void *fdt, const grub_uint32_t *token, const grub_uint32_t

@@ -1,7 +1,7 @@ 

  From e8ab5a1a9e2889eb59d1fa494ba441a53698dcd2 Mon Sep 17 00:00:00 2001

  From: Rob Clark <rclark@redhat.com>

  Date: Wed, 19 Jul 2017 15:47:41 -0400

- Subject: [PATCH 050/198] Fix a segfault in lsefi

+ Subject: [PATCH 050/206] Fix a segfault in lsefi

  

  when protocols_per_handle returns error, we can't use the pointers we

  passed to it, and that includes trusting num_protocols.
@@ -13,7 +13,7 @@ 

   1 file changed, 3 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/commands/efi/lsefi.c b/grub-core/commands/efi/lsefi.c

- index d901c3892..d1ce99af4 100644

+ index d901c3892630..d1ce99af4389 100644

  --- a/grub-core/commands/efi/lsefi.c

  +++ b/grub-core/commands/efi/lsefi.c

  @@ -109,8 +109,10 @@ grub_cmd_lsefi (grub_command_t cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From fa42786264cef98c56e972b3bb6b8448000e1c70 Mon Sep 17 00:00:00 2001

  From: Pete Batard <pete@akeo.ie>

  Date: Thu, 3 Aug 2017 15:46:15 +0100

- Subject: [PATCH 051/198] zfs: remove size_t typedef and use grub_size_t

+ Subject: [PATCH 051/206] zfs: remove size_t typedef and use grub_size_t

   instead

  

  * Prevents some toolchains from issuing a warning on size_t redef.
@@ -10,7 +10,7 @@ 

   1 file changed, 5 insertions(+), 6 deletions(-)

  

  diff --git a/grub-core/fs/zfs/zfs_lz4.c b/grub-core/fs/zfs/zfs_lz4.c

- index 2f73449f0..5453822d0 100644

+ index 2f73449f0d4c..5453822d0258 100644

  --- a/grub-core/fs/zfs/zfs_lz4.c

  +++ b/grub-core/fs/zfs/zfs_lz4.c

  @@ -73,7 +73,6 @@ static int LZ4_uncompress_unknownOutputSize(const char *source, char *dest,

@@ -1,7 +1,7 @@ 

  From 76188809d5ca40c5285b0ab202b5edea7be3f04d Mon Sep 17 00:00:00 2001

  From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>

  Date: Thu, 22 Jun 2017 14:33:17 +0200

- Subject: [PATCH 052/198] udf: Fix reading label, lvd.ident is dstring

+ Subject: [PATCH 052/206] udf: Fix reading label, lvd.ident is dstring

  

  UDF dstring has stored length in the last byte of buffer. Therefore last

  byte is not part of recorded characters. And empty string in dstring is
@@ -11,7 +11,7 @@ 

   1 file changed, 20 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c

- index 839bff889..258745633 100644

+ index 839bff88963b..2587456336e5 100644

  --- a/grub-core/fs/udf.c

  +++ b/grub-core/fs/udf.c

  @@ -860,6 +860,25 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf)

@@ -1,7 +1,7 @@ 

  From 435fa75e01ef40917239c7f775e505e86f70d202 Mon Sep 17 00:00:00 2001

  From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>

  Date: Thu, 22 Jun 2017 14:42:16 +0200

- Subject: [PATCH 053/198] * grub-core/fs/udf.c: Add support for UUID

+ Subject: [PATCH 053/206] * grub-core/fs/udf.c: Add support for UUID

  

  Use same algorithm as in libblkid from util-linux v2.30.

  
@@ -27,7 +27,7 @@ 

   1 file changed, 120 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c

- index 258745633..00a16098b 100644

+ index 2587456336e5..00a16098b47a 100644

  --- a/grub-core/fs/udf.c

  +++ b/grub-core/fs/udf.c

  @@ -321,6 +321,32 @@ struct grub_udf_partmap

@@ -1,7 +1,7 @@ 

  From 9e962fd3c42081e2eef1f99a0eaab38fd04d2620 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 7 Aug 2017 18:05:17 +0200

- Subject: [PATCH 054/198] mkrescue: Check xorriso presence before doing

+ Subject: [PATCH 054/206] mkrescue: Check xorriso presence before doing

   anything else.

  

  mkrescue can't do anything useful without xorriso, so abort early if it's
@@ -11,7 +11,7 @@ 

   1 file changed, 8 insertions(+), 1 deletion(-)

  

  diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c

- index 238d4840e..38f154397 100644

+ index 238d4840e2f9..38f1543974e3 100644

  --- a/util/grub-mkrescue.c

  +++ b/util/grub-mkrescue.c

  @@ -323,6 +323,7 @@ check_xorriso (const char *val)

@@ -1,7 +1,7 @@ 

  From e66dc5d71ebfc9763420a76c274e6980d54641c3 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 7 Aug 2017 18:08:39 +0200

- Subject: [PATCH 055/198] Fail if xorriso failed.

+ Subject: [PATCH 055/206] Fail if xorriso failed.

  

  If xorriso failed most likely we didn't generate a meaningful image.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 4 insertions(+), 2 deletions(-)

  

  diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c

- index 38f154397..9545945d8 100644

+ index 38f1543974e3..9545945d8f3b 100644

  --- a/util/grub-mkrescue.c

  +++ b/util/grub-mkrescue.c

  @@ -429,6 +429,7 @@ main (int argc, char *argv[])

@@ -1,7 +1,7 @@ 

  From dd5fde2df83c5c03b7ba04d2cc5b7be96de8da7b Mon Sep 17 00:00:00 2001

  From: Leif Lindholm <leif.lindholm@linaro.org>

  Date: Thu, 3 Aug 2017 11:04:23 +0100

- Subject: [PATCH 056/198] efi: refactor grub_efi_allocate_pages

+ Subject: [PATCH 056/206] efi: refactor grub_efi_allocate_pages

  

  Expose a new function, grub_efi_allocate_pages_real(), making it possible

  to specify allocation type and memory type as supported by the UEFI
@@ -20,7 +20,7 @@ 

   2 files changed, 29 insertions(+), 22 deletions(-)

  

  diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c

- index 20a47aaf5..d88bc5e43 100644

+ index 20a47aaf5d0d..d88bc5e43260 100644

  --- a/grub-core/kern/efi/mm.c

  +++ b/grub-core/kern/efi/mm.c

  @@ -51,36 +51,20 @@ int grub_efi_is_finished = 0;
@@ -100,7 +100,7 @@ 

   void

   grub_efi_free_pages (grub_efi_physical_address_t address,

  diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h

- index e9c601f34..b4cbebf38 100644

+ index e9c601f34103..b4cbebf3828f 100644

  --- a/include/grub/efi/efi.h

  +++ b/include/grub/efi/efi.h

  @@ -38,6 +38,11 @@ void *EXPORT_FUNC(grub_efi_open_protocol) (grub_efi_handle_t handle,

@@ -1,7 +1,7 @@ 

  From 4bc909bf89f5b4ff86c9e4e609d4fe0c11a66b0c Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Mon, 7 Aug 2017 18:33:29 +0200

- Subject: [PATCH 057/198] Remove grub_efi_allocate_pages.

+ Subject: [PATCH 057/206] Remove grub_efi_allocate_pages.

  

  grub_efi_allocate_pages Essentially does 2 unrelated things:

  * Allocate at fixed address.
@@ -21,7 +21,7 @@ 

   8 files changed, 32 insertions(+), 34 deletions(-)

  

  diff --git a/grub-core/kern/arm/efi/misc.c b/grub-core/kern/arm/efi/misc.c

- index 7cd41842a..c95e8299d 100644

+ index 7cd41842ae76..c95e8299d42f 100644

  --- a/grub-core/kern/arm/efi/misc.c

  +++ b/grub-core/kern/arm/efi/misc.c

  @@ -146,7 +146,7 @@ grub_efi_allocate_loader_memory (grub_uint32_t min_offset, grub_uint32_t size)
@@ -43,7 +43,7 @@ 

       return GRUB_ERR_OUT_OF_MEMORY;

   

  diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c

- index d88bc5e43..b97b05fe8 100644

+ index d88bc5e43260..b97b05fe825f 100644

  --- a/grub-core/kern/efi/mm.c

  +++ b/grub-core/kern/efi/mm.c

  @@ -83,20 +83,19 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
@@ -107,7 +107,7 @@ 

   	grub_fatal ("cannot allocate memory");

   

  diff --git a/grub-core/loader/arm64/fdt.c b/grub-core/loader/arm64/fdt.c

- index db49cf649..368001696 100644

+ index db49cf649917..368001696ee6 100644

  --- a/grub-core/loader/arm64/fdt.c

  +++ b/grub-core/loader/arm64/fdt.c

  @@ -50,7 +50,7 @@ grub_fdt_load (grub_size_t additional_size)
@@ -120,7 +120,7 @@ 

       return NULL;

   

  diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c

- index 9519d2e4d..ee3fcaa86 100644

+ index 9519d2e4d3ec..ee3fcaa86ae2 100644

  --- a/grub-core/loader/arm64/linux.c

  +++ b/grub-core/loader/arm64/linux.c

  @@ -148,8 +148,7 @@ grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, char *args)
@@ -152,7 +152,7 @@ 

   		(long long) GRUB_EFI_BYTES_TO_PAGES (kernel_size));

     if (!kernel_addr)

  diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c

- index 27ede46ca..6c145a771 100644

+ index 27ede46cac50..6c145a771eef 100644

  --- a/grub-core/loader/arm64/xen_boot.c

  +++ b/grub-core/loader/arm64/xen_boot.c

  @@ -324,10 +324,9 @@ xen_boot_binary_load (struct xen_boot_binary *binary, grub_file_t file,
@@ -170,7 +170,7 @@ 

       {

         grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));

  diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c

- index efaa42ccd..750330d45 100644

+ index efaa42ccdd2b..750330d4572d 100644

  --- a/grub-core/loader/ia64/efi/linux.c

  +++ b/grub-core/loader/ia64/efi/linux.c

  @@ -252,7 +252,7 @@ allocate_pages (grub_uint64_t align, grub_uint64_t size_pages,
@@ -219,7 +219,7 @@ 

       {

         grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate pages");

  diff --git a/include/grub/autoefi.h b/include/grub/autoefi.h

- index b75591176..b7a252e07 100644

+ index b75591176eb9..b7a252e079e2 100644

  --- a/include/grub/autoefi.h

  +++ b/include/grub/autoefi.h

  @@ -55,7 +55,7 @@ static inline grub_err_t grub_autoefi_prepare (void)
@@ -232,7 +232,7 @@ 

   # define grub_autoefi_finish_boot_services grub_efiemu_finish_boot_services

   # define EFI_PRESENT 1

  diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h

- index b4cbebf38..3fa082816 100644

+ index b4cbebf3828f..3fa082816ca5 100644

  --- a/include/grub/efi/efi.h

  +++ b/include/grub/efi/efi.h

  @@ -43,8 +43,10 @@ EXPORT_FUNC(grub_efi_allocate_pages_real) (grub_efi_physical_address_t address,

@@ -1,7 +1,7 @@ 

  From 8c9465fac901caac6802d6872a1374518b001517 Mon Sep 17 00:00:00 2001

  From: Leif Lindholm <leif.lindholm@linaro.org>

  Date: Thu, 3 Aug 2017 11:04:24 +0100

- Subject: [PATCH 058/198] efi: move fdt helper library

+ Subject: [PATCH 058/206] efi: move fdt helper library

  

  There is nothing ARM64 (or even ARM) specific about the efi fdt helper

  library, which is used for locating or overriding a firmware-provided
@@ -22,7 +22,7 @@ 

   rename include/grub/{arm64 => efi}/fdtload.h (100%)

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 1d86bd22e..a65c27f7f 100644

+ index 1d86bd22e04e..a65c27f7ff22 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -1707,7 +1707,7 @@ module = {
@@ -35,7 +35,7 @@ 

     enable = fdt;

   };

  diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c

- index ee3fcaa86..3e2f9b742 100644

+ index ee3fcaa86ae2..3e2f9b74296c 100644

  --- a/grub-core/loader/arm64/linux.c

  +++ b/grub-core/loader/arm64/linux.c

  @@ -26,8 +26,8 @@
@@ -49,7 +49,7 @@ 

   #include <grub/i18n.h>

   #include <grub/lib/cmdline.h>

  diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c

- index 6c145a771..c95d6c5a8 100644

+ index 6c145a771eef..c95d6c5a868e 100644

  --- a/grub-core/loader/arm64/xen_boot.c

  +++ b/grub-core/loader/arm64/xen_boot.c

  @@ -27,9 +27,9 @@
@@ -67,7 +67,7 @@ 

  similarity index 99%

  rename from grub-core/loader/arm64/fdt.c

  rename to grub-core/loader/efi/fdt.c

- index 368001696..091e9ddf4 100644

+ index 368001696ee6..091e9ddf43db 100644

  --- a/grub-core/loader/arm64/fdt.c

  +++ b/grub-core/loader/efi/fdt.c

  @@ -18,12 +18,12 @@

@@ -1,7 +1,7 @@ 

  From c5841ba7f0d14c193f20854e7e55b4f7ce9207d5 Mon Sep 17 00:00:00 2001

  From: Leif Lindholm <leif.lindholm@linaro.org>

  Date: Thu, 3 Aug 2017 11:04:25 +0100

- Subject: [PATCH 059/198] efi: Add GRUB_PE32_MAGIC definition

+ Subject: [PATCH 059/206] efi: Add GRUB_PE32_MAGIC definition

  

  Add a generic GRUB_PE32_MAGIC definition for the PE 'MZ' tag and delete

  the existing one in arm64/linux.h.
@@ -16,7 +16,7 @@ 

   3 files changed, 3 insertions(+), 3 deletions(-)

  

  diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c

- index 3e2f9b742..a652ee908 100644

+ index 3e2f9b74296c..a652ee9088e0 100644

  --- a/grub-core/loader/arm64/linux.c

  +++ b/grub-core/loader/arm64/linux.c

  @@ -52,7 +52,7 @@ grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh)
@@ -29,7 +29,7 @@ 

   		       N_("plain image kernel not supported - rebuild with CONFIG_(U)EFI_STUB enabled"));

   

  diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h

- index 1ea23696e..a981df5d1 100644

+ index 1ea23696e7a0..a981df5d15f5 100644

  --- a/include/grub/arm64/linux.h

  +++ b/include/grub/arm64/linux.h

  @@ -23,8 +23,6 @@
@@ -42,7 +42,7 @@ 

   struct grub_arm64_linux_kernel_header

   {

  diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h

- index f79c36c02..7d44732d2 100644

+ index f79c36c026e0..7d44732d2c35 100644

  --- a/include/grub/efi/pe32.h

  +++ b/include/grub/efi/pe32.h

  @@ -45,6 +45,8 @@

@@ -1,7 +1,7 @@ 

  From 91212e0aa07e704a61e4540c18a27f149f5e51c3 Mon Sep 17 00:00:00 2001

  From: Leif Lindholm <leif.lindholm@linaro.org>

  Date: Thu, 3 Aug 2017 11:04:26 +0100

- Subject: [PATCH 060/198] arm64 linux loader: improve type portability

+ Subject: [PATCH 060/206] arm64 linux loader: improve type portability

  

  In preparation for turning this into a common loader for 32-bit and 64-bit

  platforms, ensure the code will compile cleanly for either.
@@ -13,7 +13,7 @@ 

   2 files changed, 10 insertions(+), 13 deletions(-)

  

  diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c

- index a652ee908..746edd104 100644

+ index a652ee9088e0..746edd104159 100644

  --- a/grub-core/loader/arm64/linux.c

  +++ b/grub-core/loader/arm64/linux.c

  @@ -57,8 +57,6 @@ grub_arm64_uefi_check_image (struct grub_arm64_linux_kernel_header * lh)
@@ -74,7 +74,7 @@ 

   

     return grub_errno;

  diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c

- index 091e9ddf4..17212c38d 100644

+ index 091e9ddf43db..17212c38d0b7 100644

  --- a/grub-core/loader/efi/fdt.c

  +++ b/grub-core/loader/efi/fdt.c

  @@ -32,12 +32,12 @@ void *

@@ -1,7 +1,7 @@ 

  From f826330683675f0deb55b58fd229afd7d65fb053 Mon Sep 17 00:00:00 2001

  From: Leif Lindholm <leif.lindholm@linaro.org>

  Date: Thu, 3 Aug 2017 11:04:32 +0100

- Subject: [PATCH 061/198] efi: change heap allocation type to

+ Subject: [PATCH 061/206] efi: change heap allocation type to

   GRUB_EFI_LOADER_CODE

  

  With upcoming changes to EDK2, allocations of type EFI_LOADER_DATA may
@@ -17,7 +17,7 @@ 

   1 file changed, 3 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c

- index b97b05fe8..ac2a4c556 100644

+ index b97b05fe825f..ac2a4c556b8d 100644

  --- a/grub-core/kern/efi/mm.c

  +++ b/grub-core/kern/efi/mm.c

  @@ -403,7 +403,9 @@ add_memory_regions (grub_efi_memory_descriptor_t *memory_map,

@@ -1,7 +1,7 @@ 

  From bdd89d239cd9b4089630bfb5ec862aab8086dca2 Mon Sep 17 00:00:00 2001

  From: Pete Batard <pete@akeo.ie>

  Date: Mon, 7 Aug 2017 16:20:30 +0100

- Subject: [PATCH 062/198] core: use GRUB_TERM_ definitions when handling term

+ Subject: [PATCH 062/206] core: use GRUB_TERM_ definitions when handling term

   characters

  

  * Also use hex value for GRUB_TERM_ESC as '\e' is not in the C standard and is not understood by some compilers
@@ -22,7 +22,7 @@ 

   13 files changed, 25 insertions(+), 24 deletions(-)

  

  diff --git a/grub-core/commands/keylayouts.c b/grub-core/commands/keylayouts.c

- index f4b773020..f35d3a369 100644

+ index f4b7730208ab..f35d3a369bad 100644

  --- a/grub-core/commands/keylayouts.c

  +++ b/grub-core/commands/keylayouts.c

  @@ -40,7 +40,7 @@ static struct grub_keyboard_layout layout_us = {
@@ -46,7 +46,7 @@ 

       /* According to usage table 0x31 should be mapped to '/'

          but testing with real keyboard shows that 0x32 is remapped to '/'.

  diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c

- index 58d4dadf6..2c5363da7 100644

+ index 58d4dadf6ee4..2c5363da7f54 100644

  --- a/grub-core/commands/menuentry.c

  +++ b/grub-core/commands/menuentry.c

  @@ -52,8 +52,8 @@ static struct
@@ -61,7 +61,7 @@ 

       {"insert", GRUB_TERM_KEY_INSERT},

       {"f1", GRUB_TERM_KEY_F1},

  diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c

- index 683a8aaa7..ca334d5a4 100644

+ index 683a8aaa711c..ca334d5a40e0 100644

  --- a/grub-core/lib/crypto.c

  +++ b/grub-core/lib/crypto.c

  @@ -462,7 +462,7 @@ grub_password_get (char buf[], unsigned buf_size)
@@ -83,7 +83,7 @@ 

   #endif

   

  diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c

- index 7338f8245..6be678c0d 100644

+ index 7338f8245e3a..6be678c0de1a 100644

  --- a/grub-core/normal/auth.c

  +++ b/grub-core/normal/auth.c

  @@ -166,13 +166,13 @@ grub_username_get (char buf[], unsigned buf_size)
@@ -112,7 +112,7 @@ 

   

   grub_err_t

  diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c

- index a36180d75..c037d5050 100644

+ index a36180d75305..c037d5050ed2 100644

  --- a/grub-core/normal/cmdline.c

  +++ b/grub-core/normal/cmdline.c

  @@ -626,12 +626,12 @@ grub_cmdline_get (const char *prompt_translated)
@@ -131,7 +131,7 @@ 

   	    {

   	      lpos--;

  diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c

- index 719e2fb1c..e7a83c2d6 100644

+ index 719e2fb1c260..e7a83c2d6e2a 100644

  --- a/grub-core/normal/menu.c

  +++ b/grub-core/normal/menu.c

  @@ -763,7 +763,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -144,7 +144,7 @@ 

   		{

   		  menu_fini ();

  diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c

- index eeeee5580..cdf3590a3 100644

+ index eeeee5580abe..cdf3590a3646 100644

  --- a/grub-core/normal/menu_entry.c

  +++ b/grub-core/normal/menu_entry.c

  @@ -1403,7 +1403,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
@@ -157,7 +157,7 @@ 

   	  return;

   

  diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c

- index 7d31095b1..02f64ea74 100644

+ index 7d31095b1ef8..02f64ea74410 100644

  --- a/grub-core/term/efi/console.c

  +++ b/grub-core/term/efi/console.c

  @@ -104,7 +104,7 @@ const unsigned efi_codes[] =
@@ -170,7 +170,7 @@ 

   

   static int

  diff --git a/grub-core/term/i386/pc/console.c b/grub-core/term/i386/pc/console.c

- index 28de46b57..f6142a2de 100644

+ index 28de46b576a6..f6142a2dea80 100644

  --- a/grub-core/term/i386/pc/console.c

  +++ b/grub-core/term/i386/pc/console.c

  @@ -204,7 +204,7 @@ static int
@@ -183,7 +183,7 @@ 

     struct grub_bios_int_registers regs;

     unsigned i;

  diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c

- index f0d3e3deb..d317efa36 100644

+ index f0d3e3debc60..d317efa368d8 100644

  --- a/grub-core/term/terminfo.c

  +++ b/grub-core/term/terminfo.c

  @@ -426,12 +426,12 @@ grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
@@ -221,7 +221,7 @@ 

         && grub_get_time_ms () - data->last_key_time < 1000

         && (data->last_key & GRUB_TERM_EXTENDED))

  diff --git a/grub-core/tests/cmdline_cat_test.c b/grub-core/tests/cmdline_cat_test.c

- index f1e21439e..baea7688a 100644

+ index f1e21439e2be..baea7688a1d3 100644

  --- a/grub-core/tests/cmdline_cat_test.c

  +++ b/grub-core/tests/cmdline_cat_test.c

  @@ -103,7 +103,7 @@ cmdline_cat_test (void)
@@ -234,7 +234,7 @@ 

   

         grub_video_checksum ("cmdline_cat");

  diff --git a/grub-core/tests/gfxterm_menu.c b/grub-core/tests/gfxterm_menu.c

- index 8f63dc27a..12836fb96 100644

+ index 8f63dc27a35b..12836fb96598 100644

  --- a/grub-core/tests/gfxterm_menu.c

  +++ b/grub-core/tests/gfxterm_menu.c

  @@ -146,7 +146,7 @@ gfxterm_menu (void)
@@ -247,7 +247,7 @@ 

   	grub_video_checksum (tests[j].name);

   

  diff --git a/include/grub/term.h b/include/grub/term.h

- index 5ffb38f69..8117e2a24 100644

+ index 5ffb38f69aaa..8117e2a24dac 100644

  --- a/include/grub/term.h

  +++ b/include/grub/term.h

  @@ -55,7 +55,8 @@

@@ -1,7 +1,7 @@ 

  From 1deebd85ef87cc581e995ce0a51dc0802ac9c367 Mon Sep 17 00:00:00 2001

  From: Pete Batard <pete@akeo.ie>

  Date: Mon, 7 Aug 2017 16:23:12 +0100

- Subject: [PATCH 063/198] io: add a GRUB_GZ prefix to gzio specific defines

+ Subject: [PATCH 063/206] io: add a GRUB_GZ prefix to gzio specific defines

  

  * This is done to avoid a conflict with a PACKED define in the EDK2

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 20 insertions(+), 20 deletions(-)

  

  diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c

- index 0f2ea6bd8..a8e33033b 100644

+ index 0f2ea6bd8452..a8e33033bf80 100644

  --- a/grub-core/io/gzio.c

  +++ b/grub-core/io/gzio.c

  @@ -140,24 +140,24 @@ eat_field (grub_file_t file, int len)

file modified
+2 -2
@@ -1,14 +1,14 @@ 

  From 5cf0df8753c19e83251c7244cafe38869a65060f Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 8 Aug 2017 13:08:59 -0400

- Subject: [PATCH 064/198] info-in-builddir

+ Subject: [PATCH 064/206] info-in-builddir

  

  ---

   docs/Makefile.am | 2 +-

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/docs/Makefile.am b/docs/Makefile.am

- index 93eb39627..e396ba10f 100644

+ index 93eb39627652..e396ba10f469 100644

  --- a/docs/Makefile.am

  +++ b/docs/Makefile.am

  @@ -1,4 +1,4 @@

file modified
+10 -10
@@ -1,7 +1,7 @@ 

  From ff9da35fd789354cc1490b75893e765771808352 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 8 Aug 2017 12:48:04 -0400

- Subject: [PATCH 065/198] re-write .gitignore

+ Subject: [PATCH 065/206] re-write .gitignore

  

  ---

   .gitignore                        | 352 ++++++++++++--------------------------
@@ -24,7 +24,7 @@ 

   create mode 100644 util/bash-completion.d/.gitignore

  

  diff --git a/.gitignore b/.gitignore

- index eca17bec9..d95fac578 100644

+ index eca17bec9b82..d95fac5789c7 100644

  --- a/.gitignore

  +++ b/.gitignore

  @@ -1,249 +1,121 @@
@@ -391,7 +391,7 @@ 

  +/stamp-h.in

  diff --git a/build-aux/.gitignore b/build-aux/.gitignore

  new file mode 100644

- index 000000000..f2f17aab9

+ index 000000000000..f2f17aab9ff0

  --- /dev/null

  +++ b/build-aux/.gitignore

  @@ -0,0 +1,9 @@
@@ -406,7 +406,7 @@ 

  +/texinfo.tex

  diff --git a/docs/.gitignore b/docs/.gitignore

  new file mode 100644

- index 000000000..91aee84d3

+ index 000000000000..91aee84d3e91

  --- /dev/null

  +++ b/docs/.gitignore

  @@ -0,0 +1,4 @@
@@ -416,7 +416,7 @@ 

  +/version*.texi

  diff --git a/grub-core/.gitignore b/grub-core/.gitignore

  new file mode 100644

- index 000000000..c738ac6c6

+ index 000000000000..c738ac6c649e

  --- /dev/null

  +++ b/grub-core/.gitignore

  @@ -0,0 +1,15 @@
@@ -437,7 +437,7 @@ 

  +/trigtables.c

  diff --git a/grub-core/gnulib/.gitignore b/grub-core/gnulib/.gitignore

  new file mode 100644

- index 000000000..29e199c2d

+ index 000000000000..29e199c2db48

  --- /dev/null

  +++ b/grub-core/gnulib/.gitignore

  @@ -0,0 +1,22 @@
@@ -465,14 +465,14 @@ 

  +/wctype.h

  diff --git a/grub-core/lib/.gitignore b/grub-core/lib/.gitignore

  new file mode 100644

- index 000000000..681545914

+ index 000000000000..681545914043

  --- /dev/null

  +++ b/grub-core/lib/.gitignore

  @@ -0,0 +1 @@

  +/libgcrypt-grub/

  diff --git a/include/grub/gcrypt/.gitignore b/include/grub/gcrypt/.gitignore

  new file mode 100644

- index 000000000..8fbf56462

+ index 000000000000..8fbf5646246f

  --- /dev/null

  +++ b/include/grub/gcrypt/.gitignore

  @@ -0,0 +1,2 @@
@@ -480,7 +480,7 @@ 

  +gcrypt.h

  diff --git a/po/.gitignore b/po/.gitignore

  new file mode 100644

- index 000000000..97b679c31

+ index 000000000000..97b679c3138e

  --- /dev/null

  +++ b/po/.gitignore

  @@ -0,0 +1,4 @@
@@ -490,7 +490,7 @@ 

  +/stamp-po

  diff --git a/util/bash-completion.d/.gitignore b/util/bash-completion.d/.gitignore

  new file mode 100644

- index 000000000..b7e1eb124

+ index 000000000000..b7e1eb124287

  --- /dev/null

  +++ b/util/bash-completion.d/.gitignore

  @@ -0,0 +1 @@

@@ -1,7 +1,7 @@ 

  From 34423216f8f3d7ce6086e2f1ee9869407e6a2221 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 066/198] IBM client architecture (CAS) reboot support

+ Subject: [PATCH 066/206] IBM client architecture (CAS) reboot support

  

  This is an implementation of IBM client architecture (CAS) reboot for GRUB.

  
@@ -25,7 +25,7 @@ 

   4 files changed, 90 insertions(+)

  

  diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c

- index ddb778340..6db8b9865 100644

+ index ddb778340e4a..6db8b986551f 100644

  --- a/grub-core/kern/ieee1275/openfw.c

  +++ b/grub-core/kern/ieee1275/openfw.c

  @@ -561,3 +561,65 @@ grub_ieee1275_canonicalise_devname (const char *path)
@@ -95,7 +95,7 @@ 

  +  return 0;

  +}

  diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c

- index 78a70a8bf..249e19bc7 100644

+ index 78a70a8bf479..249e19bc788b 100644

  --- a/grub-core/normal/main.c

  +++ b/grub-core/normal/main.c

  @@ -33,6 +33,9 @@
@@ -132,7 +132,7 @@ 

         grub_errno = GRUB_ERR_NONE;

       }

  diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c

- index a8502d907..ab78ca87f 100644

+ index a8502d907111..ab78ca87f905 100644

  --- a/grub-core/script/execute.c

  +++ b/grub-core/script/execute.c

  @@ -27,6 +27,9 @@
@@ -157,7 +157,7 @@ 

       {

         char *line;

  diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h

- index 8e4251303..9f26c69a2 100644

+ index 8e425130327e..9f26c69a2df3 100644

  --- a/include/grub/ieee1275/ieee1275.h

  +++ b/include/grub/ieee1275/ieee1275.h

  @@ -234,6 +234,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali

@@ -1,7 +1,7 @@ 

  From 070dc282d3cc6602571296e90945df9d4671aecb 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 067/198] for ppc, reset console display attr when clear screen

+ Subject: [PATCH 067/206] for ppc, reset console display attr when clear screen

  

  v2: Also use \x0c instead of a literal ^L to make future patches less

  awkward.
@@ -15,7 +15,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c

- index d317efa36..29df35e6d 100644

+ index d317efa368d8..29df35e6d200 100644

  --- a/grub-core/term/terminfo.c

  +++ b/grub-core/term/terminfo.c

  @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,

@@ -1,7 +1,7 @@ 

  From 4e31478fdf4cda470305c1bb2acb9b820e790757 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 068/198] Disable GRUB video support for IBM power machines

+ Subject: [PATCH 068/206] Disable GRUB video support for IBM power machines

  

  Should fix the problem in bugzilla:

  https://bugzilla.redhat.com/show_bug.cgi?id=973205
@@ -12,7 +12,7 @@ 

   3 files changed, 12 insertions(+), 4 deletions(-)

  

  diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c

- index 3e12e6b24..3e14f5393 100644

+ index 3e12e6b24e17..3e14f539368b 100644

  --- a/grub-core/kern/ieee1275/cmain.c

  +++ b/grub-core/kern/ieee1275/cmain.c

  @@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
@@ -28,7 +28,7 @@ 

     /* Old Macs have no key repeat, newer ones have fully working one.

        The ones inbetween when repeated key generates an escaoe sequence

  diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c

- index 17a3dbbb5..b8e4b3feb 100644

+ index 17a3dbbb5756..b8e4b3feb32a 100644

  --- a/grub-core/video/ieee1275.c

  +++ b/grub-core/video/ieee1275.c

  @@ -352,9 +352,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
@@ -48,7 +48,7 @@ 

   

   GRUB_MOD_FINI(ieee1275_fb)

  diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h

- index 9f26c69a2..ab4f284c3 100644

+ index 9f26c69a2df3..ab4f284c3411 100644

  --- a/include/grub/ieee1275/ieee1275.h

  +++ b/include/grub/ieee1275/ieee1275.h

  @@ -146,6 +146,8 @@ enum grub_ieee1275_flag

@@ -1,7 +1,7 @@ 

  From 35535549324923af7fecf79cc739baba48246f21 Mon Sep 17 00:00:00 2001

  From: Marcel Kolaja <mkolaja@redhat.com>

  Date: Tue, 21 Jan 2014 10:57:08 -0500

- Subject: [PATCH 069/198] Honor a symlink when generating configuration by

+ Subject: [PATCH 069/206] Honor a symlink when generating configuration by

   grub2-mkconfig

  

  Honor a symlink when generating configuration by grub2-mkconfig, so that
@@ -11,7 +11,7 @@ 

   1 file changed, 2 insertions(+), 1 deletion(-)

  

  diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in

- index f8496d28b..3b070fd76 100644

+ index f8496d28bdf7..3b070fd76325 100644

  --- a/util/grub-mkconfig.in

  +++ b/util/grub-mkconfig.in

  @@ -276,7 +276,8 @@ and /etc/grub.d/* files or please file a bug report with

@@ -1,7 +1,7 @@ 

  From 999bbc2002275efce284aed6e1e31b3ca351fa19 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 3 Apr 2013 14:35:34 -0400

- Subject: [PATCH 070/198] Move bash completion script (#922997)

+ Subject: [PATCH 070/206] Move bash completion script (#922997)

  

  Apparently these go in a new place now.

  ---
@@ -10,7 +10,7 @@ 

   2 files changed, 11 insertions(+), 1 deletion(-)

  

  diff --git a/configure.ac b/configure.ac

- index 571f7a0b5..9ae97f026 100644

+ index 571f7a0b5aa4..9ae97f026abc 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -288,6 +288,14 @@ AC_SUBST(grubdirname)
@@ -39,7 +39,7 @@ 

   if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then

     tmp_ac_tool_prefix="$ac_tool_prefix"

  diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am

- index 136287cf1..61108f054 100644

+ index 136287cf1bfe..61108f05429f 100644

  --- a/util/bash-completion.d/Makefile.am

  +++ b/util/bash-completion.d/Makefile.am

  @@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source)

@@ -1,7 +1,7 @@ 

  From c0977f7fd42e16cc568af7ae667a2aeda85eb583 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 4 Dec 2014 15:36:09 -0500

- Subject: [PATCH 071/198] Update to minilzo-2.08

+ Subject: [PATCH 071/206] Update to minilzo-2.08

  

  This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow

  
@@ -14,7 +14,7 @@ 

   4 files changed, 4630 insertions(+), 2010 deletions(-)

  

  diff --git a/grub-core/lib/minilzo/lzoconf.h b/grub-core/lib/minilzo/lzoconf.h

- index 1d0fe14fc..61be29c5d 100644

+ index 1d0fe14fcda2..61be29c5dc20 100644

  --- a/grub-core/lib/minilzo/lzoconf.h

  +++ b/grub-core/lib/minilzo/lzoconf.h

  @@ -2,22 +2,7 @@
@@ -353,7 +353,7 @@ 

  -/* vim:set ts=4 et: */

  +/* vim:set ts=4 sw=4 et: */

  diff --git a/grub-core/lib/minilzo/lzodefs.h b/grub-core/lib/minilzo/lzodefs.h

- index 0e40e332a..f4ae9487e 100644

+ index 0e40e332a8d5..f4ae9487ebec 100644

  --- a/grub-core/lib/minilzo/lzodefs.h

  +++ b/grub-core/lib/minilzo/lzodefs.h

  @@ -2,22 +2,7 @@
@@ -3361,7 +3361,7 @@ 

  -/* vim:set ts=4 et: */

  +/* vim:set ts=4 sw=4 et: */

  diff --git a/grub-core/lib/minilzo/minilzo.c b/grub-core/lib/minilzo/minilzo.c

- index 25a1f68b3..ab2be5f4f 100644

+ index 25a1f68b3b58..ab2be5f4fd07 100644

  --- a/grub-core/lib/minilzo/minilzo.c

  +++ b/grub-core/lib/minilzo/minilzo.c

  @@ -2,22 +2,7 @@
@@ -8740,7 +8740,7 @@ 

   /***** End of minilzo.c *****/

  -

  diff --git a/grub-core/lib/minilzo/minilzo.h b/grub-core/lib/minilzo/minilzo.h

- index 74fefa9fe..793745467 100644

+ index 74fefa9fe20d..79374546748d 100644

  --- a/grub-core/lib/minilzo/minilzo.h

  +++ b/grub-core/lib/minilzo/minilzo.h

  @@ -2,22 +2,7 @@

@@ -1,7 +1,7 @@ 

  From 15e9ccc8abd5621107788bea6ae6f2bdb27a3ed3 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Fri, 5 Sep 2014 10:07:04 -0400

- Subject: [PATCH 072/198] Allow "fallback" to include entries by title, not

+ Subject: [PATCH 072/206] Allow "fallback" to include entries by title, not

   just number.

  

  Resolves: rhbz#1026084
@@ -12,7 +12,7 @@ 

   1 file changed, 58 insertions(+), 27 deletions(-)

  

  diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c

- index e7a83c2d6..d2f64b05e 100644

+ index e7a83c2d6e2a..d2f64b05e0a4 100644

  --- a/grub-core/normal/menu.c

  +++ b/grub-core/normal/menu.c

  @@ -163,16 +163,41 @@ grub_menu_set_timeout (int timeout)

@@ -1,7 +1,7 @@ 

  From 87602724b509a60628623baabf5a2c7741a68884 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 4 Sep 2014 16:49:25 -0400

- Subject: [PATCH 073/198] Add GRUB_DISABLE_UUID.

+ Subject: [PATCH 073/206] Add GRUB_DISABLE_UUID.

  

  This will cause "search --fs-uuid --set=root ..." not to be generated by

  grub2-mkconfig, and instead simply attempt to use the grub device name
@@ -15,7 +15,7 @@ 

   3 files changed, 19 insertions(+), 4 deletions(-)

  

  diff --git a/docs/grub.texi b/docs/grub.texi

- index a0c4b9e4e..6fdd2a041 100644

+ index a0c4b9e4e8e8..6fdd2a041f71 100644

  --- a/docs/grub.texi

  +++ b/docs/grub.texi

  @@ -1409,6 +1409,13 @@ disable the use of UUIDs, set this option to @samp{true}.
@@ -33,7 +33,7 @@ 

   If graphical video support is required, either because the @samp{gfxterm}

   graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,

  diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in

- index 3b070fd76..c088b7054 100644

+ index 3b070fd76325..c088b7054427 100644

  --- a/util/grub-mkconfig.in

  +++ b/util/grub-mkconfig.in

  @@ -133,11 +133,11 @@ fi
@@ -73,7 +73,7 @@ 

     GRUB_GFXMODE \

     GRUB_BACKGROUND \

  diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in

- index 60b31cadd..cf35e4174 100644

+ index 60b31caddeb4..cf35e4174707 100644

  --- a/util/grub-mkconfig_lib.in

  +++ b/util/grub-mkconfig_lib.in

  @@ -156,7 +156,7 @@ prepare_grub_to_access_device ()

@@ -1,7 +1,7 @@ 

  From 68d514b51b81911d8359d7825618112dae4a44d9 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 26 Feb 2014 21:49:12 -0500

- Subject: [PATCH 074/198] Make "exit" take a return code.

+ Subject: [PATCH 074/206] Make "exit" take a return code.

  

  This adds "exit" with a return code.  With this patch, any "exit"

  command /may/ include a return code, and on platforms that support
@@ -27,7 +27,7 @@ 

   14 files changed, 39 insertions(+), 21 deletions(-)

  

  diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c

- index a3a118241..b25ca4b9f 100644

+ index a3a118241728..b25ca4b9f17e 100644

  --- a/grub-core/commands/minicmd.c

  +++ b/grub-core/commands/minicmd.c

  @@ -176,12 +176,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
@@ -60,7 +60,7 @@ 

   }

   

  diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c

- index d467785fc..684ca93f8 100644

+ index d467785fc6ce..684ca93f8f41 100644

  --- a/grub-core/kern/efi/efi.c

  +++ b/grub-core/kern/efi/efi.c

  @@ -155,11 +155,16 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)
@@ -83,7 +83,7 @@ 

   }

   

  diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c

- index 425bb9603..55ea5a11c 100644

+ index 425bb9603472..55ea5a11ccd2 100644

  --- a/grub-core/kern/emu/main.c

  +++ b/grub-core/kern/emu/main.c

  @@ -67,7 +67,7 @@ grub_reboot (void)
@@ -96,7 +96,7 @@ 

     grub_reboot ();

   }

  diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c

- index 76661337f..82012a72f 100644

+ index 76661337f107..82012a72fcb2 100644

  --- a/grub-core/kern/emu/misc.c

  +++ b/grub-core/kern/emu/misc.c

  @@ -137,9 +137,10 @@ xasprintf (const char *fmt, ...)
@@ -113,7 +113,7 @@ 

   #endif

   

  diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c

- index 3314f027f..36f9134b7 100644

+ index 3314f027fec8..36f9134b7b7f 100644

  --- a/grub-core/kern/i386/coreboot/init.c

  +++ b/grub-core/kern/i386/coreboot/init.c

  @@ -41,7 +41,7 @@ extern grub_uint8_t _end[];
@@ -126,7 +126,7 @@ 

     /* We can't use grub_fatal() in this function.  This would create an infinite

        loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */

  diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c

- index 271b6fbfa..9fafe98f0 100644

+ index 271b6fbfabdb..9fafe98f0156 100644

  --- a/grub-core/kern/i386/qemu/init.c

  +++ b/grub-core/kern/i386/qemu/init.c

  @@ -42,7 +42,7 @@ extern grub_uint8_t _end[];
@@ -139,7 +139,7 @@ 

     /* We can't use grub_fatal() in this function.  This would create an infinite

        loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */

  diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c

- index 12590225e..e69c0133e 100644

+ index 12590225eca1..e69c0133e699 100644

  --- a/grub-core/kern/ieee1275/init.c

  +++ b/grub-core/kern/ieee1275/init.c

  @@ -68,7 +68,7 @@ grub_addr_t grub_ieee1275_original_stack;
@@ -152,7 +152,7 @@ 

     grub_ieee1275_exit ();

   }

  diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c

- index 3834a1490..86b3a25ec 100644

+ index 3834a1490939..86b3a25ec403 100644

  --- a/grub-core/kern/mips/arc/init.c

  +++ b/grub-core/kern/mips/arc/init.c

  @@ -276,7 +276,7 @@ grub_halt (void)
@@ -165,7 +165,7 @@ 

     GRUB_ARC_FIRMWARE_VECTOR->exit ();

   

  diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c

- index 7b96531b9..dff598ca7 100644

+ index 7b96531b9838..dff598ca7b07 100644

  --- a/grub-core/kern/mips/loongson/init.c

  +++ b/grub-core/kern/mips/loongson/init.c

  @@ -304,7 +304,7 @@ grub_halt (void)
@@ -178,7 +178,7 @@ 

     grub_halt ();

   }

  diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c

- index be88b77d2..8b6c55ffc 100644

+ index be88b77d22df..8b6c55ffc013 100644

  --- a/grub-core/kern/mips/qemu_mips/init.c

  +++ b/grub-core/kern/mips/qemu_mips/init.c

  @@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused)))
@@ -191,7 +191,7 @@ 

     grub_halt ();

   }

  diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c

- index 3b633d51f..952411d5d 100644

+ index 3b633d51f4c6..952411d5dc63 100644

  --- a/grub-core/kern/misc.c

  +++ b/grub-core/kern/misc.c

  @@ -1095,7 +1095,7 @@ grub_abort (void)
@@ -204,7 +204,7 @@ 

   

   void

  diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c

- index 3e338645c..be2a5be1d 100644

+ index 3e338645c573..be2a5be1d075 100644

  --- a/grub-core/kern/uboot/init.c

  +++ b/grub-core/kern/uboot/init.c

  @@ -39,9 +39,9 @@ extern grub_size_t grub_total_module_size;
@@ -229,7 +229,7 @@ 

     else if (ver > API_SIG_VERSION)

       {

  diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c

- index 0559c033c..fce526d41 100644

+ index 0559c033c3de..fce526d417bc 100644

  --- a/grub-core/kern/xen/init.c

  +++ b/grub-core/kern/xen/init.c

  @@ -549,7 +549,7 @@ grub_machine_init (void)
@@ -242,7 +242,7 @@ 

     struct sched_shutdown arg;

   

  diff --git a/include/grub/misc.h b/include/grub/misc.h

- index 2a9f87cc2..062081437 100644

+ index 2a9f87cc255e..062081437790 100644

  --- a/include/grub/misc.h

  +++ b/include/grub/misc.h

  @@ -334,7 +334,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,

@@ -1,7 +1,7 @@ 

  From 126f6952b853ea67e784650ed12f365ab7988f51 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 22 Jul 2015 11:21:01 -0400

- Subject: [PATCH 075/198] Mark po/exclude.pot as binary so git won't try to

+ Subject: [PATCH 075/206] Mark po/exclude.pot as binary so git won't try to

   diff nonprintables.

  

  Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -12,7 +12,7 @@ 

  

  diff --git a/.gitattributes b/.gitattributes

  new file mode 100644

- index 000000000..33ffaa404

+ index 000000000000..33ffaa404601

  --- /dev/null

  +++ b/.gitattributes

  @@ -0,0 +1 @@

@@ -1,7 +1,7 @@ 

  From 506b52759b2b2ad46e7b389979fcbaa78d68dab9 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 7 Dec 2015 14:20:49 -0500

- Subject: [PATCH 076/198] Make efi machines load an env block from a variable

+ Subject: [PATCH 076/206] Make efi machines load an env block from a variable

  

  Signed-off-by: Peter Jones <pjones@redhat.com>

  ---
@@ -10,7 +10,7 @@ 

   2 files changed, 34 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index a65c27f7f..1eb86bed3 100644

+ index a65c27f7ff22..1eb86bed33b6 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -191,6 +191,7 @@ kernel = {
@@ -22,7 +22,7 @@ 

     i386_multiboot = kern/i386/pc/acpi.c;

     i386_coreboot = kern/acpi.c;

  diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c

- index 2c31847bf..f7782b6e1 100644

+ index 2c31847bf6db..f7782b6e1149 100644

  --- a/grub-core/kern/efi/init.c

  +++ b/grub-core/kern/efi/init.c

  @@ -25,9 +25,40 @@

@@ -1,7 +1,7 @@ 

  From 8a0b654a520e407da69e0cf64f3dd6bb7cf86240 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 077/198] DHCP client ID and UUID options added.

+ Subject: [PATCH 077/206] DHCP client ID and UUID options added.

  

  ---

   grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-----
@@ -9,7 +9,7 @@ 

   2 files changed, 81 insertions(+), 8 deletions(-)

  

  diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c

- index 9e2fdb795..f03eeab2f 100644

+ index 9e2fdb795f55..f03eeab2fb42 100644

  --- a/grub-core/net/bootp.c

  +++ b/grub-core/net/bootp.c

  @@ -25,6 +25,49 @@
@@ -128,7 +128,7 @@ 

   grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)),

   		  int argc, char **args)

  diff --git a/include/grub/net.h b/include/grub/net.h

- index 1096b2432..e266bae23 100644

+ index 1096b24322eb..e266bae23f49 100644

  --- a/include/grub/net.h

  +++ b/include/grub/net.h

  @@ -457,6 +457,8 @@ enum

@@ -1,7 +1,7 @@ 

  From c0fa21c8898437747ce093884e6aba48d45ac329 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 078/198] trim arp packets with abnormal size

+ Subject: [PATCH 078/206] 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.
@@ -10,7 +10,7 @@ 

   1 file changed, 6 insertions(+)

  

  diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c

- index 54306e3b1..2083b5a4b 100644

+ index 54306e3b16d2..2083b5a4b913 100644

  --- a/grub-core/net/arp.c

  +++ b/grub-core/net/arp.c

  @@ -150,6 +150,12 @@ grub_net_arp_receive (struct grub_net_buff *nb, struct grub_net_card *card,

@@ -1,7 +1,7 @@ 

  From 60262dc77512d017974f38768d7492b4588d54f0 Mon Sep 17 00:00:00 2001

  From: Prarit Bhargava <prarit@redhat.com>

  Date: Wed, 12 Mar 2014 10:58:16 -0400

- Subject: [PATCH 079/198] Fix bad test on GRUB_DISABLE_SUBMENU.

+ Subject: [PATCH 079/206] Fix bad test on GRUB_DISABLE_SUBMENU.

  

  The file /etc/grub.d/10_linux does

  
@@ -20,7 +20,7 @@ 

   1 file changed, 5 insertions(+), 1 deletion(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index de9044c7f..cf6331f2a 100644

+ index de9044c7f286..cf6331f2a514 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -224,7 +224,11 @@ while [ "x$list" != "x" ] ; do

@@ -1,7 +1,7 @@ 

  From 699b7db9cabfe5e2dd48e61fcb079a91df3af4a7 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 080/198] Add support for UEFI operating systems returned by

+ Subject: [PATCH 080/206] Add support for UEFI operating systems returned by

   os-prober

  

  os-prober returns UEFI operating systems in the form:
@@ -15,7 +15,7 @@ 

   1 file changed, 18 insertions(+), 3 deletions(-)

  

  diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in

- index 515a68c7a..9b8f5968e 100644

+ index 515a68c7aa02..9b8f5968e2d7 100644

  --- a/util/grub.d/30_os-prober.in

  +++ b/util/grub.d/30_os-prober.in

  @@ -328,8 +328,23 @@ EOF

@@ -1,7 +1,7 @@ 

  From 91b2efdd5e9c3b0784d0a70282407324f07a30b8 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 081/198] Migrate PPC from Yaboot to Grub2

+ Subject: [PATCH 081/206] 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.
@@ -12,7 +12,7 @@ 

   create mode 100644 util/grub.d/20_ppc_terminfo.in

  

  diff --git a/Makefile.util.def b/Makefile.util.def

- index f9caccb97..6d452da02 100644

+ index f9caccb9780f..6d452da029ff 100644

  --- a/Makefile.util.def

  +++ b/Makefile.util.def

  @@ -486,6 +486,13 @@ script = {
@@ -31,7 +31,7 @@ 

     common = util/grub.d/30_os-prober.in;

  diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in

  new file mode 100644

- index 000000000..10d665868

+ index 000000000000..10d66586820f

  --- /dev/null

  +++ b/util/grub.d/20_ppc_terminfo.in

  @@ -0,0 +1,114 @@

@@ -1,7 +1,7 @@ 

  From bcb1f1a6a5530ecbc4b674e61acbb406592714c6 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 082/198] Add fw_path variable (revised)

+ Subject: [PATCH 082/206] 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
@@ -14,7 +14,7 @@ 

   2 files changed, 30 insertions(+), 8 deletions(-)

  

  diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c

- index 9cad0c448..8ab7794c4 100644

+ index 9cad0c4485cc..8ab7794c47b7 100644

  --- a/grub-core/kern/main.c

  +++ b/grub-core/kern/main.c

  @@ -127,16 +127,15 @@ grub_set_prefix_and_root (void)
@@ -41,7 +41,7 @@ 

       }

   

  diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c

- index 249e19bc7..759c475c4 100644

+ index 249e19bc788b..759c475c4d9b 100644

  --- a/grub-core/normal/main.c

  +++ b/grub-core/normal/main.c

  @@ -338,7 +338,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From 28136df7d90f865a8030a0ff6513dacb3096dc10 Mon Sep 17 00:00:00 2001

  From: Matthew Garrett <mjg@redhat.com>

  Date: Tue, 10 Jul 2012 11:58:52 -0400

- Subject: [PATCH 083/198] Add support for linuxefi

+ Subject: [PATCH 083/206] Add support for linuxefi

  

  ---

   grub-core/Makefile.core.def       |   8 +
@@ -13,7 +13,7 @@ 

   create mode 100644 grub-core/loader/i386/efi/linux.c

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 1eb86bed3..c653c71c5 100644

+ index 1eb86bed33b6..c653c71c5941 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -1764,6 +1764,14 @@ module = {
@@ -32,7 +32,7 @@ 

     name = chain;

     efi = loader/efi/chainloader.c;

  diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c

- index ac2a4c556..f5440cb1d 100644

+ index ac2a4c556b8d..f5440cb1df90 100644

  --- a/grub-core/kern/efi/mm.c

  +++ b/grub-core/kern/efi/mm.c

  @@ -49,6 +49,38 @@ static grub_efi_uintn_t finish_desc_size;
@@ -76,7 +76,7 @@ 

   grub_efi_allocate_pages_real (grub_efi_physical_address_t address,

  diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c

  new file mode 100644

- index 000000000..b79e6320b

+ index 000000000000..b79e6320ba9c

  --- /dev/null

  +++ b/grub-core/loader/i386/efi/linux.c

  @@ -0,0 +1,371 @@
@@ -452,7 +452,7 @@ 

  +  grub_unregister_command (cmd_initrd);

  +}

  diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h

- index 3fa082816..91e29ce66 100644

+ index 3fa082816ca5..91e29ce66f1b 100644

  --- a/include/grub/efi/efi.h

  +++ b/include/grub/efi/efi.h

  @@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
@@ -466,7 +466,7 @@ 

   				       grub_efi_uintn_t pages);

   int

  diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h

- index da0ca3b83..fc36bdaf3 100644

+ index da0ca3b83cdc..fc36bdaf3674 100644

  --- a/include/grub/i386/linux.h

  +++ b/include/grub/i386/linux.h

  @@ -139,6 +139,7 @@ struct linux_kernel_header

@@ -1,14 +1,14 @@ 

  From e915644108ed022ad0cc5d2d987f116d2605bcf2 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 16 Jul 2012 18:57:11 -0400

- Subject: [PATCH 084/198] Use "linuxefi" and "initrdefi" where appropriate.

+ Subject: [PATCH 084/206] Use "linuxefi" and "initrdefi" where appropriate.

  

  ---

   util/grub.d/10_linux.in | 18 ++++++++++++++++--

   1 file changed, 16 insertions(+), 2 deletions(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index cf6331f2a..8ccf012f7 100644

+ index cf6331f2a514..8ccf012f747e 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -129,17 +129,31 @@ linux_entry ()

@@ -1,7 +1,7 @@ 

  From b1eb9a8b9aa961bf6b6f40d6b4d22a5741f29ae4 Mon Sep 17 00:00:00 2001

  From: Colin Watson <cjwatson@ubuntu.com>

  Date: Tue, 23 Oct 2012 10:40:49 -0400

- Subject: [PATCH 085/198] Don't allow insmod when secure boot is enabled.

+ Subject: [PATCH 085/206] Don't allow insmod when secure boot is enabled.

  

  Hi,

  
@@ -23,7 +23,7 @@ 

   3 files changed, 51 insertions(+)

  

  diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c

- index e394cd96f..621070918 100644

+ index e394cd96f8c0..621070918d42 100644

  --- a/grub-core/kern/dl.c

  +++ b/grub-core/kern/dl.c

  @@ -32,12 +32,21 @@
@@ -69,7 +69,7 @@ 

   

     file = grub_file_open (filename);

  diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c

- index 684ca93f8..2588b481e 100644

+ index 684ca93f8f41..2588b481e76d 100644

  --- a/grub-core/kern/efi/efi.c

  +++ b/grub-core/kern/efi/efi.c

  @@ -269,6 +269,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@@ -108,7 +108,7 @@ 

   

   /* Search the mods section from the PE32/PE32+ image. This code uses

  diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h

- index 91e29ce66..bb3ab7dfd 100644

+ index 91e29ce66f1b..bb3ab7dfdeb1 100644

  --- a/include/grub/efi/efi.h

  +++ b/include/grub/efi/efi.h

  @@ -83,6 +83,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,

@@ -1,7 +1,7 @@ 

  From cc8be4cafeb5a0af779afe5d2856da434c165612 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 1 Oct 2012 13:24:37 -0400

- Subject: [PATCH 086/198] Pass "\x[[:hex:]][[:hex:]]" straight through

+ Subject: [PATCH 086/206] Pass "\x[[:hex:]][[:hex:]]" straight through

   unmolested.

  

  ---
@@ -11,7 +11,7 @@ 

   3 files changed, 84 insertions(+), 9 deletions(-)

  

  diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c

- index 9b4e72766..02c46f9fd 100644

+ index 9b4e72766ff5..02c46f9fdfae 100644

  --- a/grub-core/commands/wildcard.c

  +++ b/grub-core/commands/wildcard.c

  @@ -462,6 +462,12 @@ check_file (const char *dir, const char *basename)
@@ -45,7 +45,7 @@ 

   	  *optr++ = iptr[1];

   	  iptr += 2;

  diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c

- index d5e10ee87..0a5b2afb9 100644

+ index d5e10ee8798c..0a5b2afb94b0 100644

  --- a/grub-core/lib/cmdline.c

  +++ b/grub-core/lib/cmdline.c

  @@ -20,6 +20,12 @@
@@ -104,7 +104,7 @@ 

   

   	  *buf++ = *c;

  diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c

- index ab78ca87f..cf6cd6601 100644

+ index ab78ca87f905..cf6cd6601d69 100644

  --- a/grub-core/script/execute.c

  +++ b/grub-core/script/execute.c

  @@ -55,6 +55,12 @@ static struct grub_script_scope *scope = 0;

@@ -1,14 +1,14 @@ 

  From d3e9800ae2fe7c0ed2d7795eae2be17a66e625ff 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 087/198] Add %X option to printf functions.

+ Subject: [PATCH 087/206] Add %X option to printf functions.

  

  ---

   grub-core/kern/misc.c | 7 +++++--

   1 file changed, 5 insertions(+), 2 deletions(-)

  

  diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c

- index 952411d5d..8344526be 100644

+ index 952411d5dc63..8344526be7f3 100644

  --- a/grub-core/kern/misc.c

  +++ b/grub-core/kern/misc.c

  @@ -588,7 +588,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r)

@@ -1,7 +1,7 @@ 

  From 30c15e39be47d60f6a4a45628a687911a9f11091 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 088/198] Search for specific config file for netboot

+ Subject: [PATCH 088/206] 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:
@@ -22,7 +22,7 @@ 

   3 files changed, 135 insertions(+), 4 deletions(-)

  

  diff --git a/grub-core/net/net.c b/grub-core/net/net.c

- index 10773fc34..0769bf850 100644

+ index 10773fc3435f..0769bf850d3e 100644

  --- a/grub-core/net/net.c

  +++ b/grub-core/net/net.c

  @@ -1735,6 +1735,124 @@ grub_net_restore_hw (void)
@@ -151,7 +151,7 @@ 

   

   static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute;

  diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c

- index 759c475c4..b2654ef62 100644

+ index 759c475c4d9b..b2654ef62e81 100644

  --- a/grub-core/normal/main.c

  +++ b/grub-core/normal/main.c

  @@ -33,6 +33,7 @@
@@ -187,7 +187,7 @@ 

   	  grub_enter_normal_mode (config);

   	  grub_free (config);

  diff --git a/include/grub/net.h b/include/grub/net.h

- index e266bae23..50d62ab0c 100644

+ index e266bae23f49..50d62ab0c8c6 100644

  --- a/include/grub/net.h

  +++ b/include/grub/net.h

  @@ -566,4 +566,7 @@ extern char *grub_net_default_server;

@@ -1,7 +1,7 @@ 

  From 266c7e797971879dc229594556a687a79c92d3b6 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 089/198] blscfg: add blscfg module to parse Boot Loader

+ Subject: [PATCH 089/206] blscfg: add blscfg module to parse Boot Loader

   Specification snippets

  

  http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec
@@ -21,7 +21,7 @@ 

   create mode 100644 grub-core/commands/blscfg.c

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index c653c71c5..7f3d5a2bf 100644

+ index c653c71c5941..7f3d5a2bfe68 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -768,6 +768,14 @@ module = {
@@ -41,7 +41,7 @@ 

     common = commands/boot.c;

  diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c

  new file mode 100644

- index 000000000..4274aca5a

+ index 000000000000..4274aca5a9dc

  --- /dev/null

  +++ b/grub-core/commands/blscfg.c

  @@ -0,0 +1,201 @@

@@ -1,7 +1,7 @@ 

  From 6609ba848331d9153c554bb52f2ef0a33531cf55 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 090/198] Don't write messages to the screen

+ Subject: [PATCH 090/206] 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
@@ -15,7 +15,7 @@ 

   5 files changed, 5 insertions(+), 40 deletions(-)

  

  diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S

- index 2bd0b2d28..ea167fe12 100644

+ index 2bd0b2d2866b..ea167fe12062 100644

  --- a/grub-core/boot/i386/pc/boot.S

  +++ b/grub-core/boot/i386/pc/boot.S

  @@ -249,9 +249,6 @@ real_start:
@@ -29,7 +29,7 @@ 

   	movw	$disk_address_packet, %si

   

  diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S

- index 1ee4cf5b2..c8b87ed29 100644

+ index 1ee4cf5b2e0f..c8b87ed293c9 100644

  --- a/grub-core/boot/i386/pc/diskboot.S

  +++ b/grub-core/boot/i386/pc/diskboot.S

  @@ -50,11 +50,6 @@ _start:
@@ -45,7 +45,7 @@ 

   	movw	$LOCAL(firstlist), %di

   

  diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c

- index 4880cefe3..b22e1bcc9 100644

+ index 4880cefe3f8a..b22e1bcc94b1 100644

  --- a/grub-core/gettext/gettext.c

  +++ b/grub-core/gettext/gettext.c

  @@ -434,16 +434,12 @@ static char *
@@ -127,7 +127,7 @@ 

     grub_register_variable_hook ("locale_dir", NULL, read_main);

     grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);

  diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c

- index 8ab7794c4..da47b18b5 100644

+ index 8ab7794c47b7..da47b18b50ec 100644

  --- a/grub-core/kern/main.c

  +++ b/grub-core/kern/main.c

  @@ -268,11 +268,6 @@ grub_main (void)
@@ -143,7 +143,7 @@ 

   

     grub_boot_time ("Before loading embedded modules.");

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index 8ccf012f7..a3d9711d6 100644

+ index 8ccf012f747e..a3d9711d607e 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -128,29 +128,22 @@ linux_entry ()

@@ -1,7 +1,7 @@ 

  From 95aeba5fe67ad11a995eb8e583708a722b8bdeb9 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 091/198] Don't print GNU GRUB header

+ Subject: [PATCH 091/206] Don't print GNU GRUB header

  

  No one cares.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 5 insertions(+), 3 deletions(-)

  

  diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c

- index b2654ef62..f57b7508a 100644

+ index b2654ef62e81..f57b7508a767 100644

  --- a/grub-core/normal/main.c

  +++ b/grub-core/normal/main.c

  @@ -202,15 +202,16 @@ read_config_file (const char *config)

@@ -1,7 +1,7 @@ 

  From aca25c56911ece3e4d82ae9edbde6c705c1eaacc 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 092/198] Don't add '*' to highlighted row

+ Subject: [PATCH 092/206] Don't add '*' to highlighted row

  

  It is already highlighted.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c

- index e22bb91f6..a3d1f23f6 100644

+ index e22bb91f6e82..a3d1f23f68fe 100644

  --- a/grub-core/normal/menu_text.c

  +++ b/grub-core/normal/menu_text.c

  @@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,

@@ -1,7 +1,7 @@ 

  From eef343ff642b42f0e46eb5e8ff5d89fef375f4a2 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 093/198] Message string cleanups

+ Subject: [PATCH 093/206] Message string cleanups

  

  Make use of terminology consistent. Remove jargon.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 9 insertions(+), 12 deletions(-)

  

  diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c

- index a3d1f23f6..64a83862f 100644

+ index a3d1f23f68fe..64a83862f663 100644

  --- a/grub-core/normal/menu_text.c

  +++ b/grub-core/normal/menu_text.c

  @@ -157,9 +157,8 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)

@@ -1,14 +1,14 @@ 

  From c2e1e09485a5773dc3639d34eadc3a07ebce8fe5 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 094/198] Fix border spacing now that we aren't displaying it

+ Subject: [PATCH 094/206] Fix border spacing now that we aren't displaying it

  

  ---

   grub-core/normal/menu_text.c | 6 +++---

   1 file changed, 3 insertions(+), 3 deletions(-)

  

  diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c

- index 64a83862f..1062d64ee 100644

+ index 64a83862f663..1062d64ee293 100644

  --- a/grub-core/normal/menu_text.c

  +++ b/grub-core/normal/menu_text.c

  @@ -331,12 +331,12 @@ grub_menu_init_page (int nested, int edit,

@@ -1,7 +1,7 @@ 

  From e29b4dd346fa10dc6a073239ef1ed8fb32a0c838 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 095/198] Use the correct indentation for the term help text

+ Subject: [PATCH 095/206] Use the correct indentation for the term help text

  

  That is consistent with the menu help text

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 2 insertions(+), 2 deletions(-)

  

  diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c

- index f57b7508a..0ce59fdc3 100644

+ index f57b7508a767..0ce59fdc3f0b 100644

  --- a/grub-core/normal/main.c

  +++ b/grub-core/normal/main.c

  @@ -426,8 +426,8 @@ grub_normal_reader_init (int nested)

@@ -1,14 +1,14 @@ 

  From a67be6e17cd318ad3d4a669efb2b8c5f6e76c003 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 096/198] Indent menu entries

+ Subject: [PATCH 096/206] Indent menu entries

  

  ---

   grub-core/normal/menu_text.c | 3 ++-

   1 file changed, 2 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c

- index 1062d64ee..ecc60f99f 100644

+ index 1062d64ee293..ecc60f99fc33 100644

  --- a/grub-core/normal/menu_text.c

  +++ b/grub-core/normal/menu_text.c

  @@ -239,7 +239,8 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,

file modified
+2 -2
@@ -1,14 +1,14 @@ 

  From 8e5a006c6c48002f3debd99f4c377b443f9f8369 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 097/198] Fix margins

+ Subject: [PATCH 097/206] Fix margins

  

  ---

   grub-core/normal/menu_text.c | 8 +++-----

   1 file changed, 3 insertions(+), 5 deletions(-)

  

  diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c

- index ecc60f99f..0e43f2c10 100644

+ index ecc60f99fc33..0e43f2c10ccd 100644

  --- a/grub-core/normal/menu_text.c

  +++ b/grub-core/normal/menu_text.c

  @@ -333,17 +333,15 @@ grub_menu_init_page (int nested, int edit,

@@ -1,7 +1,7 @@ 

  From 01757871cb2a7355a7f67e80f77a57fecba26f54 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Fri, 21 Jun 2013 14:44:08 -0400

- Subject: [PATCH 098/198] Use -2 instead of -1 for our right-hand margin, so

+ Subject: [PATCH 098/206] Use -2 instead of -1 for our right-hand margin, so

   linewrapping works (#976643).

  

  Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
@@ -10,7 +10,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c

- index 0e43f2c10..537d4bf86 100644

+ index 0e43f2c10ccd..537d4bf86ffb 100644

  --- a/grub-core/normal/menu_text.c

  +++ b/grub-core/normal/menu_text.c

  @@ -334,7 +334,7 @@ grub_menu_init_page (int nested, int edit,

@@ -1,7 +1,7 @@ 

  From ac001b7b4cc1819186fbe2bc695cbe58d2077d0f Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 28 Oct 2013 10:05:07 -0400

- Subject: [PATCH 099/198] Use linux16 when appropriate (#880840)

+ Subject: [PATCH 099/206] Use linux16 when appropriate (#880840)

  

  The kernel group really would prefer that we use the 16 bit entry point

  on x86 bios machines.
@@ -14,7 +14,7 @@ 

   1 file changed, 7 insertions(+), 2 deletions(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index a3d9711d6..f3bf6acd8 100644

+ index a3d9711d607e..f3bf6acd856c 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -76,6 +76,11 @@ linux_entry ()

@@ -1,7 +1,7 @@ 

  From cc60fb5b7693dabcf100c910d42b3ffe1816597f Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 28 Oct 2013 10:09:27 -0400

- Subject: [PATCH 100/198] Enable pager by default. (#985860)

+ Subject: [PATCH 100/206] Enable pager by default. (#985860)

  

  Signed-off-by: Peter Jones <pjones@redhat.com>

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 2 insertions(+)

  

  diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in

- index 93a90233e..858b526c9 100644

+ index 93a90233ead4..858b526c925f 100644

  --- a/util/grub.d/00_header.in

  +++ b/util/grub.d/00_header.in

  @@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_

@@ -1,7 +1,7 @@ 

  From f1cb6c5a7640406294b7dffab3c5e4a4afdaf745 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 28 Oct 2013 10:13:27 -0400

- Subject: [PATCH 101/198] F10 doesn't work on serial, so don't tell the user to

+ Subject: [PATCH 101/206] F10 doesn't work on serial, so don't tell the user to

   hit it (#987443)

  

  Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -10,7 +10,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c

- index 537d4bf86..452d55bf9 100644

+ index 537d4bf86ffb..452d55bf9ff1 100644

  --- a/grub-core/normal/menu_text.c

  +++ b/grub-core/normal/menu_text.c

  @@ -157,7 +157,7 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run)

@@ -1,7 +1,7 @@ 

  From 13c028af4104555993650dd9a26dd633c516d23f Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 14 Mar 2011 14:27:42 -0400

- Subject: [PATCH 102/198] Don't say "GNU/Linux" in generated menus.

+ Subject: [PATCH 102/206] Don't say "GNU/Linux" in generated menus.

  

  ---

   util/grub.d/10_linux.in     | 4 ++--
@@ -9,7 +9,7 @@ 

   2 files changed, 4 insertions(+), 4 deletions(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index f3bf6acd8..ef52cf3db 100644

+ index f3bf6acd856c..ef52cf3dbbbf 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"
@@ -25,7 +25,7 @@ 

   fi

   

  diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in

- index c002fc9f9..54f1ec8a2 100644

+ index c002fc9f9465..54f1ec8a2fd1 100644

  --- a/util/grub.d/20_linux_xen.in

  +++ b/util/grub.d/20_linux_xen.in

  @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@"

@@ -1,7 +1,7 @@ 

  From 8b51cba8f5587746d1559bd6ec957db3e185c049 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 103/198] Don't draw a border around the menu

+ Subject: [PATCH 103/206] Don't draw a border around the menu

  

  It looks cleaner without it.

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 43 deletions(-)

  

  diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c

- index 452d55bf9..1ed2bd92c 100644

+ index 452d55bf9ff1..1ed2bd92cf87 100644

  --- a/grub-core/normal/menu_text.c

  +++ b/grub-core/normal/menu_text.c

  @@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,

@@ -1,7 +1,7 @@ 

  From 137250b0ef67150568074da35c568c6c649899f6 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 104/198] Use the standard margin for the timeout string

+ Subject: [PATCH 104/206] Use the standard margin for the timeout string

  

  So that it aligns with the other messages

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 3 insertions(+), 3 deletions(-)

  

  diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c

- index 1ed2bd92c..7681f7d28 100644

+ index 1ed2bd92cf87..7681f7d28933 100644

  --- a/grub-core/normal/menu_text.c

  +++ b/grub-core/normal/menu_text.c

  @@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit,

@@ -1,14 +1,14 @@ 

  From 0464db837a67b88a761f100391b135a70b7054eb 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 105/198] Add .eh_frame to list of relocations stripped

+ Subject: [PATCH 105/206] 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 311da61c6..044ab3abe 100644

+ index 311da61c6c59..044ab3abe88b 100644

  --- a/conf/Makefile.common

  +++ b/conf/Makefile.common

  @@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding

@@ -1,7 +1,7 @@ 

  From fb582651ea4568d7226f96e6b618ad795430c842 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 14 Jan 2014 13:12:23 -0500

- Subject: [PATCH 106/198] Make 10_linux work with our changes for linux16 and

+ Subject: [PATCH 106/206] Make 10_linux work with our changes for linux16 and

   linuxefi on aarch64

  

  Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -10,7 +10,7 @@ 

   1 file changed, 28 insertions(+), 3 deletions(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index ef52cf3db..191aebe80 100644

+ index ef52cf3dbbbf..191aebe80bb5 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -77,8 +77,18 @@ linux_entry ()

@@ -1,7 +1,7 @@ 

  From 40e56a4c2e879f5efcbcc36cf6a88ee1cb39d607 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 14 Jan 2014 16:15:46 -0500

- Subject: [PATCH 107/198] Don't print during fdt loading method.

+ Subject: [PATCH 107/206] Don't print during fdt loading method.

  

  Signed-off-by: Peter Jones <pjones@redhat.com>

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 2 deletions(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index 191aebe80..452a9f69d 100644

+ index 191aebe80bb5..452a9f69d289 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -164,9 +164,7 @@ EOF

@@ -1,7 +1,7 @@ 

  From ff25c6034ab8213d911414e666b7d44bc44496aa 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 108/198] Don't munge raw spaces when we're doing our cmdline

+ Subject: [PATCH 108/206] Don't munge raw spaces when we're doing our cmdline

   escaping (#923374)

  

  Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -10,7 +10,7 @@ 

   1 file changed, 1 insertion(+), 10 deletions(-)

  

  diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c

- index 0a5b2afb9..970ea868c 100644

+ index 0a5b2afb94b0..970ea868c14f 100644

  --- a/grub-core/lib/cmdline.c

  +++ b/grub-core/lib/cmdline.c

  @@ -97,16 +97,7 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf,

@@ -1,7 +1,7 @@ 

  From 2df38f07986a91d2a06cb3e432f9121d9f678f89 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 11 Feb 2014 11:14:50 -0500

- Subject: [PATCH 109/198] Don't require a password to boot entries generated by

+ Subject: [PATCH 109/206] 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.
@@ -14,7 +14,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index 452a9f69d..79a747ebd 100644

+ index 452a9f69d289..79a747ebd4d8 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -26,7 +26,7 @@ datarootdir="@datarootdir@"

@@ -1,7 +1,7 @@ 

  From a72d4819fb7275cbf65b5de901c50d076bf861fd Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 18 Feb 2014 09:37:49 -0500

- Subject: [PATCH 110/198] Don't emit "Booting ..." message.

+ Subject: [PATCH 110/206] Don't emit "Booting ..." message.

  

  UI team still hates this stuff, so we're disabling it for RHEL 7.

  
@@ -14,7 +14,7 @@ 

   2 files changed, 3 insertions(+), 4 deletions(-)

  

  diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c

- index d2f64b05e..5e2f5283d 100644

+ index d2f64b05e0a4..5e2f5283d3db 100644

  --- a/grub-core/normal/menu.c

  +++ b/grub-core/normal/menu.c

  @@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -34,7 +34,7 @@ 

   

   /* Callback invoked when a default menu entry executed because of a timeout

  diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c

- index cdf3590a3..5785f67ee 100644

+ index cdf3590a3646..5785f67ee1c1 100644

  --- a/grub-core/normal/menu_entry.c

  +++ b/grub-core/normal/menu_entry.c

  @@ -1167,9 +1167,6 @@ run (struct screen *screen)

@@ -1,7 +1,7 @@ 

  From 6412d775976361b52c0914f6e5e3b0a4b99cdba9 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 4 Mar 2014 11:00:23 -0500

- Subject: [PATCH 111/198] Replace a lot of man pages with slightly nicer ones.

+ Subject: [PATCH 111/206] Replace a lot of man pages with slightly nicer ones.

  

  Replace a bunch of machine generated ones with ones that look nicer.

  ---
@@ -122,7 +122,7 @@ 

   create mode 100644 util/grub-sparc64-setup.8

  

  diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist

- index b16bd9253..39eb94bde 100644

+ index b16bd9253208..39eb94bded61 100644

  --- a/conf/Makefile.extra-dist

  +++ b/conf/Makefile.extra-dist

  @@ -11,7 +11,6 @@ EXTRA_DIST += unicode
@@ -134,7 +134,7 @@ 

   EXTRA_DIST += docs/grub.cfg

   EXTRA_DIST += docs/osdetect.cfg

  diff --git a/configure.ac b/configure.ac

- index 9ae97f026..0cb971a92 100644

+ index 9ae97f026abc..0cb971a92c53 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -70,6 +70,29 @@ grub_TRANSFORM([grub-set-default])
@@ -168,7 +168,7 @@ 

   # Optimization flag.  Allow user to override.

   if test "x$TARGET_CFLAGS" = x; then

  diff --git a/docs/Makefile.am b/docs/Makefile.am

- index e396ba10f..0669729cc 100644

+ index e396ba10f469..0669729cc570 100644

  --- a/docs/Makefile.am

  +++ b/docs/Makefile.am

  @@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi
@@ -179,7 +179,7 @@ 

  -

  diff --git a/docs/man/grub-bios-setup.h2m b/docs/man/grub-bios-setup.h2m

  deleted file mode 100644

- index ac6ede362..000000000

+ index ac6ede362966..000000000000

  --- a/docs/man/grub-bios-setup.h2m

  +++ /dev/null

  @@ -1,6 +0,0 @@
@@ -191,7 +191,7 @@ 

  -.BR grub-mkrescue (1)

  diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m

  deleted file mode 100644

- index 3859d3d4c..000000000

+ index 3859d3d4c4f2..000000000000

  --- a/docs/man/grub-editenv.h2m

  +++ /dev/null

  @@ -1,5 +0,0 @@
@@ -202,7 +202,7 @@ 

  -.BR grub-set-default (8)

  diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m

  deleted file mode 100644

- index ef1c00065..000000000

+ index ef1c000656ad..000000000000

  --- a/docs/man/grub-emu.h2m

  +++ /dev/null

  @@ -1,6 +0,0 @@
@@ -214,7 +214,7 @@ 

  -rather than this program.

  diff --git a/docs/man/grub-file.h2m b/docs/man/grub-file.h2m

  deleted file mode 100644

- index e09bb4d31..000000000

+ index e09bb4d31012..000000000000

  --- a/docs/man/grub-file.h2m

  +++ /dev/null

  @@ -1,2 +0,0 @@
@@ -222,7 +222,7 @@ 

  -grub-file \- check file type

  diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m

  deleted file mode 100644

- index 9676b159a..000000000

+ index 9676b159afda..000000000000

  --- a/docs/man/grub-fstest.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -232,7 +232,7 @@ 

  -.BR grub-probe (8)

  diff --git a/docs/man/grub-glue-efi.h2m b/docs/man/grub-glue-efi.h2m

  deleted file mode 100644

- index c1c6ded49..000000000

+ index c1c6ded49ff6..000000000000

  --- a/docs/man/grub-glue-efi.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -242,7 +242,7 @@ 

  -grub-glue-efi processes ia32 and amd64 EFI images and glues them according to Apple format.

  diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m

  deleted file mode 100644

- index 8cbbc87a0..000000000

+ index 8cbbc87a0f24..000000000000

  --- a/docs/man/grub-install.h2m

  +++ /dev/null

  @@ -1,6 +0,0 @@
@@ -254,7 +254,7 @@ 

  -.BR grub-mkrescue (1)

  diff --git a/docs/man/grub-kbdcomp.h2m b/docs/man/grub-kbdcomp.h2m

  deleted file mode 100644

- index d81f9157e..000000000

+ index d81f9157e019..000000000000

  --- a/docs/man/grub-kbdcomp.h2m

  +++ /dev/null

  @@ -1,10 +0,0 @@
@@ -270,7 +270,7 @@ 

  -.BR grub-mklayout (8)

  diff --git a/docs/man/grub-macbless.h2m b/docs/man/grub-macbless.h2m

  deleted file mode 100644

- index 0197c0087..000000000

+ index 0197c0087d79..000000000000

  --- a/docs/man/grub-macbless.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -280,7 +280,7 @@ 

  -.BR grub-install (1)

  diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m

  deleted file mode 100644

- index d79aaeed8..000000000

+ index d79aaeed8f9c..000000000000

  --- a/docs/man/grub-macho2img.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -290,7 +290,7 @@ 

  -.BR grub-mkimage (1)

  diff --git a/docs/man/grub-menulst2cfg.h2m b/docs/man/grub-menulst2cfg.h2m

  deleted file mode 100644

- index c2e0055ed..000000000

+ index c2e0055ed7e7..000000000000

  --- a/docs/man/grub-menulst2cfg.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -300,7 +300,7 @@ 

  -.BR grub-mkconfig (8)

  diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m

  deleted file mode 100644

- index 9b42f8130..000000000

+ index 9b42f8130109..000000000000

  --- a/docs/man/grub-mkconfig.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -310,7 +310,7 @@ 

  -.BR grub-install (8)

  diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m

  deleted file mode 100644

- index d46fe600e..000000000

+ index d46fe600eca2..000000000000

  --- a/docs/man/grub-mkfont.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -320,7 +320,7 @@ 

  -.BR grub-mkconfig (8)

  diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m

  deleted file mode 100644

- index f0fbc2bb1..000000000

+ index f0fbc2bb1979..000000000000

  --- a/docs/man/grub-mkimage.h2m

  +++ /dev/null

  @@ -1,6 +0,0 @@
@@ -332,7 +332,7 @@ 

  -.BR grub-mknetdir (8)

  diff --git a/docs/man/grub-mklayout.h2m b/docs/man/grub-mklayout.h2m

  deleted file mode 100644

- index 1e43409c0..000000000

+ index 1e43409c0ab8..000000000000

  --- a/docs/man/grub-mklayout.h2m

  +++ /dev/null

  @@ -1,10 +0,0 @@
@@ -348,7 +348,7 @@ 

  -.BR grub-mkconfig (8)

  diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m

  deleted file mode 100644

- index a2ef13ec1..000000000

+ index a2ef13ec111f..000000000000

  --- a/docs/man/grub-mknetdir.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -358,7 +358,7 @@ 

  -.BR grub-mkimage (1)

  diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m

  deleted file mode 100644

- index 4d202f3da..000000000

+ index 4d202f3da7e9..000000000000

  --- a/docs/man/grub-mkpasswd-pbkdf2.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -368,7 +368,7 @@ 

  -.BR grub-mkconfig (8)

  diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m

  deleted file mode 100644

- index d01f3961e..000000000

+ index d01f3961e3f6..000000000000

  --- a/docs/man/grub-mkrelpath.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -378,7 +378,7 @@ 

  -.BR grub-probe (8)

  diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m

  deleted file mode 100644

- index a427f02e3..000000000

+ index a427f02e3c6f..000000000000

  --- a/docs/man/grub-mkrescue.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -388,7 +388,7 @@ 

  -.BR grub-mkimage (1)

  diff --git a/docs/man/grub-mkstandalone.h2m b/docs/man/grub-mkstandalone.h2m

  deleted file mode 100644

- index c77313978..000000000

+ index c77313978ade..000000000000

  --- a/docs/man/grub-mkstandalone.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -398,7 +398,7 @@ 

  -.BR grub-mkimage (1)

  diff --git a/docs/man/grub-mount.h2m b/docs/man/grub-mount.h2m

  deleted file mode 100644

- index 8d168982d..000000000

+ index 8d168982d720..000000000000

  --- a/docs/man/grub-mount.h2m

  +++ /dev/null

  @@ -1,2 +0,0 @@
@@ -406,7 +406,7 @@ 

  -grub-mount \- export GRUB filesystem with FUSE

  diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m

  deleted file mode 100644

- index 74b43eea0..000000000

+ index 74b43eea0399..000000000000

  --- a/docs/man/grub-ofpathname.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -416,7 +416,7 @@ 

  -.BR grub-probe (8)

  diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m

  deleted file mode 100644

- index 7ca29bd70..000000000

+ index 7ca29bd703c6..000000000000

  --- a/docs/man/grub-pe2elf.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -426,7 +426,7 @@ 

  -.BR grub-mkimage (1)

  diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m

  deleted file mode 100644

- index 6e1ffdcf9..000000000

+ index 6e1ffdcf937c..000000000000

  --- a/docs/man/grub-probe.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -436,7 +436,7 @@ 

  -.BR grub-fstest (1)

  diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m

  deleted file mode 100644

- index e4acace65..000000000

+ index e4acace65cea..000000000000

  --- a/docs/man/grub-reboot.h2m

  +++ /dev/null

  @@ -1,5 +0,0 @@
@@ -447,7 +447,7 @@ 

  -.BR grub-editenv (1)

  diff --git a/docs/man/grub-render-label.h2m b/docs/man/grub-render-label.h2m

  deleted file mode 100644

- index 50ae5247c..000000000

+ index 50ae5247c054..000000000000

  --- a/docs/man/grub-render-label.h2m

  +++ /dev/null

  @@ -1,3 +0,0 @@
@@ -456,7 +456,7 @@ 

  -

  diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m

  deleted file mode 100644

- index 365368267..000000000

+ index 3653682671a3..000000000000

  --- a/docs/man/grub-script-check.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -466,7 +466,7 @@ 

  -.BR grub-mkconfig (8)

  diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m

  deleted file mode 100644

- index 7945001c1..000000000

+ index 7945001c1543..000000000000

  --- a/docs/man/grub-set-default.h2m

  +++ /dev/null

  @@ -1,5 +0,0 @@
@@ -477,7 +477,7 @@ 

  -.BR grub-editenv (1)

  diff --git a/docs/man/grub-sparc64-setup.h2m b/docs/man/grub-sparc64-setup.h2m

  deleted file mode 100644

- index 18f803a50..000000000

+ index 18f803a50dbf..000000000000

  --- a/docs/man/grub-sparc64-setup.h2m

  +++ /dev/null

  @@ -1,6 +0,0 @@
@@ -489,7 +489,7 @@ 

  -.BR grub-mkrescue (1)

  diff --git a/docs/man/grub-syslinux2cfg.h2m b/docs/man/grub-syslinux2cfg.h2m

  deleted file mode 100644

- index ad25c8ab7..000000000

+ index ad25c8ab7537..000000000000

  --- a/docs/man/grub-syslinux2cfg.h2m

  +++ /dev/null

  @@ -1,4 +0,0 @@
@@ -498,7 +498,7 @@ 

  -[SEE ALSO]

  -.BR grub-menulst2cfg (8)

  diff --git a/gentpl.py b/gentpl.py

- index da67965a4..bf8439fa7 100644

+ index da67965a41a4..bf8439fa7435 100644

  --- a/gentpl.py

  +++ b/gentpl.py

  @@ -802,10 +802,7 @@ def manpage(defn, adddeps):
@@ -515,7 +515,7 @@ 

   

  diff --git a/util/grub-bios-setup.8 b/util/grub-bios-setup.8

  new file mode 100644

- index 000000000..56f582b3d

+ index 000000000000..56f582b3d757

  --- /dev/null

  +++ b/util/grub-bios-setup.8

  @@ -0,0 +1,54 @@
@@ -575,7 +575,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-editenv.1 b/util/grub-editenv.1

  new file mode 100644

- index 000000000..d28ba03ba

+ index 000000000000..d28ba03ba421

  --- /dev/null

  +++ b/util/grub-editenv.1

  @@ -0,0 +1,46 @@
@@ -627,7 +627,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-file.1 b/util/grub-file.1

  new file mode 100644

- index 000000000..b29cb3278

+ index 000000000000..b29cb3278896

  --- /dev/null

  +++ b/util/grub-file.1

  @@ -0,0 +1,165 @@
@@ -798,7 +798,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-fstest.1 b/util/grub-fstest.1

  new file mode 100644

- index 000000000..792fa7863

+ index 000000000000..792fa78634cb

  --- /dev/null

  +++ b/util/grub-fstest.1

  @@ -0,0 +1,99 @@
@@ -903,7 +903,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-glue-efi.1 b/util/grub-glue-efi.1

  new file mode 100644

- index 000000000..72bd555d5

+ index 000000000000..72bd555d577c

  --- /dev/null

  +++ b/util/grub-glue-efi.1

  @@ -0,0 +1,31 @@
@@ -940,7 +940,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-install.8 b/util/grub-install.8

  new file mode 100644

- index 000000000..76272a39d

+ index 000000000000..76272a39d2e7

  --- /dev/null

  +++ b/util/grub-install.8

  @@ -0,0 +1,129 @@
@@ -1075,7 +1075,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-kbdcomp.1 b/util/grub-kbdcomp.1

  new file mode 100644

- index 000000000..0bb969a5b

+ index 000000000000..0bb969a5b430

  --- /dev/null

  +++ b/util/grub-kbdcomp.1

  @@ -0,0 +1,19 @@
@@ -1100,7 +1100,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-macbless.1 b/util/grub-macbless.1

  new file mode 100644

- index 000000000..41a96186f

+ index 000000000000..41a96186f703

  --- /dev/null

  +++ b/util/grub-macbless.1

  @@ -0,0 +1,22 @@
@@ -1128,7 +1128,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-menulst2cfg.1 b/util/grub-menulst2cfg.1

  new file mode 100644

- index 000000000..91e2ef871

+ index 000000000000..91e2ef87113a

  --- /dev/null

  +++ b/util/grub-menulst2cfg.1

  @@ -0,0 +1,12 @@
@@ -1146,7 +1146,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8

  new file mode 100644

- index 000000000..a2d1f577b

+ index 000000000000..a2d1f577b9b8

  --- /dev/null

  +++ b/util/grub-mkconfig.8

  @@ -0,0 +1,17 @@
@@ -1169,7 +1169,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-mkfont.1 b/util/grub-mkfont.1

  new file mode 100644

- index 000000000..349485798

+ index 000000000000..3494857987d1

  --- /dev/null

  +++ b/util/grub-mkfont.1

  @@ -0,0 +1,87 @@
@@ -1262,7 +1262,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1

  new file mode 100644

- index 000000000..4dea4f545

+ index 000000000000..4dea4f54597c

  --- /dev/null

  +++ b/util/grub-mkimage.1

  @@ -0,0 +1,95 @@
@@ -1363,7 +1363,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-mklayout.1 b/util/grub-mklayout.1

  new file mode 100644

- index 000000000..d1bbc2ec5

+ index 000000000000..d1bbc2ec515a

  --- /dev/null

  +++ b/util/grub-mklayout.1

  @@ -0,0 +1,27 @@
@@ -1396,7 +1396,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-mknetdir.1 b/util/grub-mknetdir.1

  new file mode 100644

- index 000000000..fa7e8d4ef

+ index 000000000000..fa7e8d4ef0d3

  --- /dev/null

  +++ b/util/grub-mknetdir.1

  @@ -0,0 +1,12 @@
@@ -1414,7 +1414,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-mkpasswd-pbkdf2.1 b/util/grub-mkpasswd-pbkdf2.1

  new file mode 100644

- index 000000000..73c437c15

+ index 000000000000..73c437c15d81

  --- /dev/null

  +++ b/util/grub-mkpasswd-pbkdf2.1

  @@ -0,0 +1,27 @@
@@ -1447,7 +1447,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-mkrelpath.1 b/util/grub-mkrelpath.1

  new file mode 100644

- index 000000000..85f111362

+ index 000000000000..85f1113621d9

  --- /dev/null

  +++ b/util/grub-mkrelpath.1

  @@ -0,0 +1,12 @@
@@ -1465,7 +1465,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-mkrescue.1 b/util/grub-mkrescue.1

  new file mode 100644

- index 000000000..4ed9fc723

+ index 000000000000..4ed9fc723fd5

  --- /dev/null

  +++ b/util/grub-mkrescue.1

  @@ -0,0 +1,123 @@
@@ -1594,7 +1594,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-mkstandalone.1 b/util/grub-mkstandalone.1

  new file mode 100644

- index 000000000..ba2d2bdf2

+ index 000000000000..ba2d2bdf2799

  --- /dev/null

  +++ b/util/grub-mkstandalone.1

  @@ -0,0 +1,100 @@
@@ -1700,7 +1700,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-ofpathname.8 b/util/grub-ofpathname.8

  new file mode 100644

- index 000000000..bf3743aeb

+ index 000000000000..bf3743aeba14

  --- /dev/null

  +++ b/util/grub-ofpathname.8

  @@ -0,0 +1,12 @@
@@ -1718,7 +1718,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-probe.8 b/util/grub-probe.8

  new file mode 100644

- index 000000000..04e26c832

+ index 000000000000..04e26c832bbd

  --- /dev/null

  +++ b/util/grub-probe.8

  @@ -0,0 +1,80 @@
@@ -1804,7 +1804,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-reboot.8 b/util/grub-reboot.8

  new file mode 100644

- index 000000000..faa5e4eec

+ index 000000000000..faa5e4eece27

  --- /dev/null

  +++ b/util/grub-reboot.8

  @@ -0,0 +1,21 @@
@@ -1831,7 +1831,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-render-label.1 b/util/grub-render-label.1

  new file mode 100644

- index 000000000..4d51c8abf

+ index 000000000000..4d51c8abf018

  --- /dev/null

  +++ b/util/grub-render-label.1

  @@ -0,0 +1,51 @@
@@ -1888,7 +1888,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-script-check.1 b/util/grub-script-check.1

  new file mode 100644

- index 000000000..0f1f625b0

+ index 000000000000..0f1f625b05df

  --- /dev/null

  +++ b/util/grub-script-check.1

  @@ -0,0 +1,21 @@
@@ -1915,7 +1915,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-set-default.8 b/util/grub-set-default.8

  new file mode 100644

- index 000000000..a96265a15

+ index 000000000000..a96265a15094

  --- /dev/null

  +++ b/util/grub-set-default.8

  @@ -0,0 +1,21 @@
@@ -1942,7 +1942,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-sparc64-setup.8 b/util/grub-sparc64-setup.8

  new file mode 100644

- index 000000000..37ea2dd5e

+ index 000000000000..37ea2dd5eaa6

  --- /dev/null

  +++ b/util/grub-sparc64-setup.8

  @@ -0,0 +1,12 @@

@@ -1,7 +1,7 @@ 

  From acf4cfa6d1691a9476b36949af7e296080c88d25 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 112/198] use fw_path prefix when fallback searching for grub

+ Subject: [PATCH 112/206] use fw_path prefix when fallback searching for grub

   config

  

  When PXE booting via UEFI firmware, grub was searching for grub.cfg
@@ -18,7 +18,7 @@ 

   1 file changed, 3 insertions(+), 2 deletions(-)

  

  diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c

- index 0ce59fdc3..a3713efcd 100644

+ index 0ce59fdc3f0b..a3713efcd902 100644

  --- a/grub-core/normal/main.c

  +++ b/grub-core/normal/main.c

  @@ -343,7 +343,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From b7aa57a2f879d185888e4d47f77a1a30370973f9 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 6 Mar 2014 11:51:33 -0500

- Subject: [PATCH 113/198] Try mac/guid/etc before grub.cfg on tftp config

+ Subject: [PATCH 113/206] Try mac/guid/etc before grub.cfg on tftp config

   files.

  

  Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -10,7 +10,7 @@ 

   1 file changed, 43 insertions(+), 37 deletions(-)

  

  diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c

- index a3713efcd..7d9c4f09b 100644

+ index a3713efcd902..7d9c4f09b9b1 100644

  --- a/grub-core/normal/main.c

  +++ b/grub-core/normal/main.c

  @@ -341,53 +341,59 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From 69946054baab92385b9f6518cc78e94810b40c48 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 18 Feb 2014 11:34:00 -0500

- Subject: [PATCH 114/198] Fix convert function to support NVMe devices

+ Subject: [PATCH 114/206] 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
@@ -18,7 +18,7 @@ 

   1 file changed, 19 insertions(+)

  

  diff --git a/util/getroot.c b/util/getroot.c

- index 847406fba..fa3460d6c 100644

+ index 847406fbab0e..fa3460d6cd87 100644

  --- a/util/getroot.c

  +++ b/util/getroot.c

  @@ -153,6 +153,7 @@ convert_system_partition_to_system_disk (const char *os_dev, int *is_part)

@@ -1,7 +1,7 @@ 

  From f168a0803d8d35e431ef6888755f9b2622304846 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 115/198] Switch to use APM Mustang device tree, for hardware

+ Subject: [PATCH 115/206] Switch to use APM Mustang device tree, for hardware

   testing.

  

  Signed-off-by: David A. Marlin <d.marlin@redhat.com>
@@ -10,7 +10,7 @@ 

   1 file changed, 2 insertions(+), 2 deletions(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index 79a747ebd..462b461ff 100644

+ index 79a747ebd4d8..462b461ff497 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -232,8 +232,8 @@ while [ "x$list" != "x" ] ; do

@@ -1,7 +1,7 @@ 

  From 6ec36777aae0c4afd98f67f22d4d511b447dbb02 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 116/198] Use the default device tree from the grub default

+ Subject: [PATCH 116/206] Use the default device tree from the grub default

   file

  

  instead of hardcoding a value.
@@ -13,7 +13,7 @@ 

   2 files changed, 4 insertions(+), 3 deletions(-)

  

  diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in

- index c088b7054..9d595ac05 100644

+ index c088b7054427..9d595ac058aa 100644

  --- a/util/grub-mkconfig.in

  +++ b/util/grub-mkconfig.in

  @@ -235,7 +235,8 @@ export GRUB_DEFAULT \
@@ -27,7 +27,7 @@ 

   if test "x${grub_cfg}" != "x"; then

     rm -f "${grub_cfg}.new"

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index 462b461ff..a9692a0c2 100644

+ index 462b461ff497..a9692a0c2a2a 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -232,8 +232,8 @@ while [ "x$list" != "x" ] ; do

@@ -1,14 +1,14 @@ 

  From debcbbacd18bfbbcbd5fd9dce947f2cbce09c916 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 117/198] reopen SNP protocol for exclusive use by grub

+ Subject: [PATCH 117/206] 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 5388f952b..ea0e0ca36 100644

+ index 5388f952ba9b..ea0e0ca360ef 100644

  --- a/grub-core/net/drivers/efi/efinet.c

  +++ b/grub-core/net/drivers/efi/efinet.c

  @@ -330,6 +330,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,

@@ -1,7 +1,7 @@ 

  From 88892eedb9beb9d8c295329fad87edb339e4e27c Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Fri, 4 Mar 2016 15:13:59 -0500

- Subject: [PATCH 118/198] Revert "reopen SNP protocol for exclusive use by

+ Subject: [PATCH 118/206] Revert "reopen SNP protocol for exclusive use by

   grub"

  

  This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is
@@ -17,7 +17,7 @@ 

   1 file changed, 16 deletions(-)

  

  diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c

- index ea0e0ca36..5388f952b 100644

+ index ea0e0ca360ef..5388f952ba9b 100644

  --- a/grub-core/net/drivers/efi/efinet.c

  +++ b/grub-core/net/drivers/efi/efinet.c

  @@ -330,7 +330,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,

@@ -1,7 +1,7 @@ 

  From 9c1af9c0a44353f6b72691456a4a2883246b6346 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 3 Sep 2014 10:01:03 -0400

- Subject: [PATCH 119/198] Add grub_util_readlink()

+ Subject: [PATCH 119/206] Add grub_util_readlink()

  

  Add grub_util_readlink().  This requires pulling in stat and readlink from

  gnulib, which pulls in stat and related headers, but after that the
@@ -53,7 +53,7 @@ 

   create mode 100644 m4/time_h.m4

  

  diff --git a/grub-core/gnulib/Makefile.am b/grub-core/gnulib/Makefile.am

- index 3444397fe..b7c5e60e1 100644

+ index 3444397fe373..b7c5e60e1c30 100644

  --- a/grub-core/gnulib/Makefile.am

  +++ b/grub-core/gnulib/Makefile.am

  @@ -21,7 +21,7 @@
@@ -284,7 +284,7 @@ 

   BUILT_SOURCES += unistd.h

  diff --git a/grub-core/gnulib/gettimeofday.c b/grub-core/gnulib/gettimeofday.c

  new file mode 100644

- index 000000000..8b2058e8c

+ index 000000000000..8b2058e8c87f

  --- /dev/null

  +++ b/grub-core/gnulib/gettimeofday.c

  @@ -0,0 +1,154 @@
@@ -444,7 +444,7 @@ 

  +}

  diff --git a/grub-core/gnulib/pathmax.h b/grub-core/gnulib/pathmax.h

  new file mode 100644

- index 000000000..33fc3553d

+ index 000000000000..33fc3553d756

  --- /dev/null

  +++ b/grub-core/gnulib/pathmax.h

  @@ -0,0 +1,83 @@
@@ -533,7 +533,7 @@ 

  +#endif /* _PATHMAX_H */

  diff --git a/grub-core/gnulib/readlink.c b/grub-core/gnulib/readlink.c

  new file mode 100644

- index 000000000..4c4963951

+ index 000000000000..4c4963951764

  --- /dev/null

  +++ b/grub-core/gnulib/readlink.c

  @@ -0,0 +1,74 @@
@@ -613,7 +613,7 @@ 

  +#endif /* HAVE_READLINK */

  diff --git a/grub-core/gnulib/stat.c b/grub-core/gnulib/stat.c

  new file mode 100644

- index 000000000..35f4b0b1a

+ index 000000000000..35f4b0b1a51b

  --- /dev/null

  +++ b/grub-core/gnulib/stat.c

  @@ -0,0 +1,138 @@
@@ -757,7 +757,7 @@ 

  +}

  diff --git a/grub-core/gnulib/sys_stat.in.h b/grub-core/gnulib/sys_stat.in.h

  new file mode 100644

- index 000000000..b47a7ff0a

+ index 000000000000..b47a7ff0ae7e

  --- /dev/null

  +++ b/grub-core/gnulib/sys_stat.in.h

  @@ -0,0 +1,732 @@
@@ -1495,7 +1495,7 @@ 

  +#endif

  diff --git a/grub-core/gnulib/sys_time.in.h b/grub-core/gnulib/sys_time.in.h

  new file mode 100644

- index 000000000..30057ad49

+ index 000000000000..30057ad49fd7

  --- /dev/null

  +++ b/grub-core/gnulib/sys_time.in.h

  @@ -0,0 +1,213 @@
@@ -1713,7 +1713,7 @@ 

  +#endif /* _CYGWIN_SYS_TIME_H */

  +#endif /* _@GUARD_PREFIX@_SYS_TIME_H */

  diff --git a/grub-core/gnulib/sys_types.in.h b/grub-core/gnulib/sys_types.in.h

- index d7da35623..9520c0903 100644

+ index d7da35623b1e..9520c09030c5 100644

  --- a/grub-core/gnulib/sys_types.in.h

  +++ b/grub-core/gnulib/sys_types.in.h

  @@ -23,7 +23,9 @@
@@ -1728,7 +1728,7 @@ 

   #define _@GUARD_PREFIX@_SYS_TYPES_H

  diff --git a/grub-core/gnulib/time.h b/grub-core/gnulib/time.h

  new file mode 100644

- index 000000000..b9203d556

+ index 000000000000..b9203d5569ad

  --- /dev/null

  +++ b/grub-core/gnulib/time.h

  @@ -0,0 +1,586 @@
@@ -2320,7 +2320,7 @@ 

  +#endif

  diff --git a/grub-core/gnulib/time.in.h b/grub-core/gnulib/time.in.h

  new file mode 100644

- index 000000000..81abdf46e

+ index 000000000000..81abdf46e0bb

  --- /dev/null

  +++ b/grub-core/gnulib/time.in.h

  @@ -0,0 +1,274 @@
@@ -2599,7 +2599,7 @@ 

  +

  +#endif

  diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c

- index 85507af88..6f49df465 100644

+ index 85507af88e39..6f49df465d70 100644

  --- a/grub-core/osdep/windows/hostdisk.c

  +++ b/grub-core/osdep/windows/hostdisk.c

  @@ -353,6 +353,12 @@ grub_util_mkdir (const char *dir)
@@ -2616,7 +2616,7 @@ 

   grub_util_rename (const char *from, const char *to)

   {

  diff --git a/include/grub/osdep/hostfile_aros.h b/include/grub/osdep/hostfile_aros.h

- index a059c0fa4..161fbb7bd 100644

+ index a059c0fa40a5..161fbb7bdfd6 100644

  --- a/include/grub/osdep/hostfile_aros.h

  +++ b/include/grub/osdep/hostfile_aros.h

  @@ -68,6 +68,12 @@ grub_util_rename (const char *from, const char *to)
@@ -2633,7 +2633,7 @@ 

   

   struct grub_util_fd

  diff --git a/include/grub/osdep/hostfile_unix.h b/include/grub/osdep/hostfile_unix.h

- index 9ffe46fa3..17cd3aa8b 100644

+ index 9ffe46fa3ca5..17cd3aa8b304 100644

  --- a/include/grub/osdep/hostfile_unix.h

  +++ b/include/grub/osdep/hostfile_unix.h

  @@ -71,6 +71,12 @@ grub_util_rename (const char *from, const char *to)
@@ -2650,7 +2650,7 @@ 

   

   #if defined (__NetBSD__)

  diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h

- index bf6451b6d..8c92d0591 100644

+ index bf6451b6db49..8c92d0591bb4 100644

  --- a/include/grub/osdep/hostfile_windows.h

  +++ b/include/grub/osdep/hostfile_windows.h

  @@ -41,6 +41,8 @@ typedef struct grub_util_fd_dir *grub_util_fd_dir_t;
@@ -2664,7 +2664,7 @@ 

   void

  diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4

  new file mode 100644

- index 000000000..1c2d66ee2

+ index 000000000000..1c2d66ee261f

  --- /dev/null

  +++ b/m4/gettimeofday.m4

  @@ -0,0 +1,138 @@
@@ -2807,7 +2807,7 @@ 

  +  AC_CHECK_FUNCS([_ftime])

  +])

  diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4

- index 408918440..ef2ec5bcc 100644

+ index 408918440b66..ef2ec5bcce02 100644

  --- a/m4/gnulib-cache.m4

  +++ b/m4/gnulib-cache.m4

  @@ -27,7 +27,7 @@
@@ -2828,7 +2828,7 @@ 

   ])

   gl_AVOID([])

  diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4

- index 7a19f60d8..66fd0eda9 100644

+ index 7a19f60d85e6..66fd0eda901e 100644

  --- a/m4/gnulib-comp.m4

  +++ b/m4/gnulib-comp.m4

  @@ -60,10 +60,13 @@ AC_DEFUN([gl_EARLY],
@@ -3035,7 +3035,7 @@ 

     m4/vasnprintf.m4

  diff --git a/m4/largefile.m4 b/m4/largefile.m4

  new file mode 100644

- index 000000000..a1b564ad9

+ index 000000000000..a1b564ad9afb

  --- /dev/null

  +++ b/m4/largefile.m4

  @@ -0,0 +1,146 @@
@@ -3187,7 +3187,7 @@ 

  +])

  diff --git a/m4/pathmax.m4 b/m4/pathmax.m4

  new file mode 100644

- index 000000000..114f91f04

+ index 000000000000..114f91f04b55

  --- /dev/null

  +++ b/m4/pathmax.m4

  @@ -0,0 +1,42 @@
@@ -3235,7 +3235,7 @@ 

  +])

  diff --git a/m4/readlink.m4 b/m4/readlink.m4

  new file mode 100644

- index 000000000..f9ce868c2

+ index 000000000000..f9ce868c2e49

  --- /dev/null

  +++ b/m4/readlink.m4

  @@ -0,0 +1,71 @@
@@ -3312,7 +3312,7 @@ 

  +])

  diff --git a/m4/stat.m4 b/m4/stat.m4

  new file mode 100644

- index 000000000..1ae327b36

+ index 000000000000..1ae327b36845

  --- /dev/null

  +++ b/m4/stat.m4

  @@ -0,0 +1,71 @@
@@ -3389,7 +3389,7 @@ 

  +AC_DEFUN([gl_PREREQ_STAT], [:])

  diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4

  new file mode 100644

- index 000000000..eaa7642ba

+ index 000000000000..eaa7642ba311

  --- /dev/null

  +++ b/m4/sys_stat_h.m4

  @@ -0,0 +1,96 @@
@@ -3491,7 +3491,7 @@ 

  +])

  diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4

  new file mode 100644

- index 000000000..5c79300f8

+ index 000000000000..5c79300f8ec6

  --- /dev/null

  +++ b/m4/sys_time_h.m4

  @@ -0,0 +1,110 @@
@@ -3607,7 +3607,7 @@ 

  +])

  diff --git a/m4/time_h.m4 b/m4/time_h.m4

  new file mode 100644

- index 000000000..9852778f9

+ index 000000000000..9852778f9a5d

  --- /dev/null

  +++ b/m4/time_h.m4

  @@ -0,0 +1,118 @@

@@ -1,7 +1,7 @@ 

  From 5c54e71e4b4a3f8fbfedd5eca821238a7d80b491 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 3 Sep 2014 10:38:00 -0400

- Subject: [PATCH 120/198] Make editenv chase symlinks including those across

+ Subject: [PATCH 120/206] Make editenv chase symlinks including those across

   devices.

  

  This lets us make /boot/grub2/grubenv a symlink to
@@ -17,7 +17,7 @@ 

   2 files changed, 53 insertions(+), 2 deletions(-)

  

  diff --git a/Makefile.util.def b/Makefile.util.def

- index 6d452da02..206110458 100644

+ index 6d452da029ff..206110458938 100644

  --- a/Makefile.util.def

  +++ b/Makefile.util.def

  @@ -230,8 +230,17 @@ program = {
@@ -39,7 +39,7 @@ 

     ldadd = libgrubgcry.a;

     ldadd = libgrubkern.a;

  diff --git a/util/editenv.c b/util/editenv.c

- index c6f8d2298..d8d1dad6a 100644

+ index c6f8d2298c37..d8d1dad6ab95 100644

  --- a/util/editenv.c

  +++ b/util/editenv.c

  @@ -37,6 +37,7 @@ grub_util_create_envblk_file (const char *name)

@@ -1,7 +1,7 @@ 

  From 7ca8e2b9e23a3588654d53a8e84bb22743896f80 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 4 Sep 2014 14:23:23 -0400

- Subject: [PATCH 121/198] Generate OS and CLASS in 10_linux from

+ Subject: [PATCH 121/206] Generate OS and CLASS in 10_linux from

   /etc/os-release

  

  This makes us use pretty names in the titles we generate in
@@ -15,7 +15,7 @@ 

   1 file changed, 2 insertions(+), 1 deletion(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index a9692a0c2..c6627268c 100644

+ index a9692a0c2a2a..c6627268cca5 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@"

@@ -1,7 +1,7 @@ 

  From e84a66eb07c96db182d57f4d40ff7c607a0e5296 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 4 Sep 2014 15:52:08 -0400

- Subject: [PATCH 122/198] Minimize the sort ordering for .debug and -rescue-

+ Subject: [PATCH 122/206] Minimize the sort ordering for .debug and -rescue-

   kernels.

  

  Resolves: rhbz#1065360
@@ -11,7 +11,7 @@ 

   1 file changed, 8 insertions(+)

  

  diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in

- index cf35e4174..10fabee5e 100644

+ index cf35e4174707..10fabee5e14d 100644

  --- a/util/grub-mkconfig_lib.in

  +++ b/util/grub-mkconfig_lib.in

  @@ -248,6 +248,14 @@ version_test_gt ()

@@ -1,7 +1,7 @@ 

  From 87206b6fc4fcb9ac5fb5778ec7c9fbb4ef1841b7 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 18 Sep 2014 11:26:14 -0400

- Subject: [PATCH 123/198] Load arm with SB enabled.

+ Subject: [PATCH 123/206] Load arm with SB enabled.

  

  Make sure we actually try to validate secure boot on this platform (even

  though we're not shipping it enabled by default.)
@@ -21,7 +21,7 @@ 

   create mode 100644 include/grub/efi/linux.h

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 7f3d5a2bf..5ae70204c 100644

+ index 7f3d5a2bfe68..5ae70204cd29 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -1709,6 +1709,8 @@ module = {
@@ -42,7 +42,7 @@ 

     enable = x86_64_efi;

   };

  diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c

- index 746edd104..03ff83563 100644

+ index 746edd104159..03ff835633cc 100644

  --- a/grub-core/loader/arm64/linux.c

  +++ b/grub-core/loader/arm64/linux.c

  @@ -28,6 +28,7 @@
@@ -71,7 +71,7 @@ 

   

     void *fdt;

   

- @@ -100,6 +103,25 @@ finalize_params_linux (void)

+ @@ -100,6 +103,26 @@ finalize_params_linux (void)

     if (grub_fdt_install() != GRUB_ERR_NONE)

       goto failure;

   
@@ -86,7 +86,8 @@ 

  +  loaded_image->load_options_size = len =

  +    (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t);

  +  loaded_image->load_options =

- +    grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));

+ +    grub_efi_allocate_pages_max (0,

+ +				 GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));

  +  if (!loaded_image->load_options)

  +    return grub_error(GRUB_ERR_BAD_OS, "failed to create kernel parameters");

  +
@@ -97,7 +98,7 @@ 

     return GRUB_ERR_NONE;

   

   failure:

- @@ -107,72 +129,47 @@ failure:

+ @@ -107,72 +130,47 @@ failure:

     return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT");

   }

   
@@ -198,7 +199,7 @@ 

   }

   

   static grub_err_t

- @@ -249,6 +246,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

+ @@ -249,6 +247,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

   {

     grub_file_t file = 0;

     struct grub_arm64_linux_kernel_header lh;
@@ -206,7 +207,7 @@ 

   

     grub_dl_ref (my_mod);

   

- @@ -293,6 +291,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

+ @@ -293,6 +292,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

   

     grub_dprintf ("linux", "kernel @ %p\n", kernel_addr);

   
@@ -224,7 +225,7 @@ 

     if (!linux_args)

  diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c

  new file mode 100644

- index 000000000..aea378adf

+ index 000000000000..aea378adf5cb

  --- /dev/null

  +++ b/grub-core/loader/efi/linux.c

  @@ -0,0 +1,65 @@
@@ -294,7 +295,7 @@ 

  +  return GRUB_ERR_BUG;

  +}

  diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c

- index b79e6320b..e5b778577 100644

+ index b79e6320ba9c..e5b778577f94 100644

  --- a/grub-core/loader/i386/efi/linux.c

  +++ b/grub-core/loader/i386/efi/linux.c

  @@ -26,6 +26,7 @@
@@ -361,7 +362,7 @@ 

   

   static grub_err_t

  diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h

- index a981df5d1..0df384133 100644

+ index a981df5d15f5..0df384133381 100644

  --- a/include/grub/arm64/linux.h

  +++ b/include/grub/arm64/linux.h

  @@ -20,6 +20,7 @@
@@ -386,7 +387,7 @@ 

   #endif /* ! GRUB_LINUX_CPU_HEADER */

  diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h

  new file mode 100644

- index 000000000..d9ede3677

+ index 000000000000..d9ede36773bf

  --- /dev/null

  +++ b/include/grub/efi/linux.h

  @@ -0,0 +1,31 @@

@@ -1,7 +1,7 @@ 

  From 2d50086f8689da717502383fc3f29678493a054b Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Fri, 3 Oct 2014 11:08:03 -0400

- Subject: [PATCH 124/198] Try $prefix if $fw_path doesn't work.

+ Subject: [PATCH 124/206] Try $prefix if $fw_path doesn't work.

  

  Related: rhbz#1148652

  
@@ -13,7 +13,7 @@ 

   3 files changed, 75 insertions(+), 75 deletions(-)

  

  diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c

- index e69c0133e..4dfa41a37 100644

+ index e69c0133e699..4dfa41a37d57 100644

  --- a/grub-core/kern/ieee1275/init.c

  +++ b/grub-core/kern/ieee1275/init.c

  @@ -138,23 +138,25 @@ grub_machine_get_bootlocation (char **device, char **path)
@@ -57,7 +57,7 @@ 

   }

   

  diff --git a/grub-core/net/net.c b/grub-core/net/net.c

- index 0769bf850..16d2ce06d 100644

+ index 0769bf850d3e..16d2ce06d5a1 100644

  --- a/grub-core/net/net.c

  +++ b/grub-core/net/net.c

  @@ -1850,7 +1850,7 @@ grub_net_search_configfile (char *config)
@@ -70,7 +70,7 @@ 

   

   static struct grub_preboot *fini_hnd;

  diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c

- index 7d9c4f09b..b69f9e738 100644

+ index 7d9c4f09b9b1..b69f9e738fa4 100644

  --- a/grub-core/normal/main.c

  +++ b/grub-core/normal/main.c

  @@ -331,74 +331,72 @@ grub_enter_normal_mode (const char *config)

@@ -1,7 +1,7 @@ 

  From ce7e8db6a534b0b3653ec8a20bdd5550500706f4 Mon Sep 17 00:00:00 2001

  From: Robert Marshall <rmarshall@redhat.com>

  Date: Mon, 16 Mar 2015 16:34:51 -0400

- Subject: [PATCH 125/198] Update info with grub.cfg netboot selection order

+ Subject: [PATCH 125/206] Update info with grub.cfg netboot selection order

   (#1148650)

  

  Added documentation to the grub info page that specifies the order
@@ -13,7 +13,7 @@ 

   1 file changed, 42 insertions(+)

  

  diff --git a/docs/grub.texi b/docs/grub.texi

- index 6fdd2a041..15a90b26e 100644

+ index 6fdd2a041f71..15a90b26e4d6 100644

  --- a/docs/grub.texi

  +++ b/docs/grub.texi

  @@ -2414,6 +2414,48 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38

@@ -1,7 +1,7 @@ 

  From 3bafdc90cd92f95c0dbc373ae9f408d5f6883ec3 Mon Sep 17 00:00:00 2001

  From: Robert Marshall <rmarshall@redhat.com>

  Date: Mon, 16 Mar 2015 14:14:19 -0400

- Subject: [PATCH 126/198] Use Distribution Package Sort for grub2-mkconfig

+ Subject: [PATCH 126/206] Use Distribution Package Sort for grub2-mkconfig

   (#1124074)

  

  Users reported that newly installed kernels on their systems installed
@@ -22,7 +22,7 @@ 

   create mode 100644 util/grub-rpm-sort.c

  

  diff --git a/.gitignore b/.gitignore

- index d95fac578..1c8537129 100644

+ index d95fac5789c7..1c85371298c4 100644

  --- a/.gitignore

  +++ b/.gitignore

  @@ -101,6 +101,8 @@ grub-*.tar.*
@@ -35,7 +35,7 @@ 

   /grub*-script-check.1

   /grub*-set-default

  diff --git a/Makefile.util.def b/Makefile.util.def

- index 206110458..d846b81b5 100644

+ index 206110458938..d846b81b5f98 100644

  --- a/Makefile.util.def

  +++ b/Makefile.util.def

  @@ -684,6 +684,22 @@ program = {
@@ -62,7 +62,7 @@ 

     name = grub-mkconfig;

     common = util/grub-mkconfig.in;

  diff --git a/configure.ac b/configure.ac

- index 0cb971a92..49427cbf9 100644

+ index 0cb971a92c53..49427cbf989a 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -116,7 +116,7 @@ 

   if test x$host_kernel = xkfreebsd; then

     AC_CHECK_LIB([geom], [geom_gettree], [],

  diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in

- index 10fabee5e..954844d2d 100644

+ index 10fabee5e14d..954844d2d952 100644

  --- a/util/grub-mkconfig_lib.in

  +++ b/util/grub-mkconfig_lib.in

  @@ -213,6 +213,12 @@ version_sort ()
@@ -143,7 +143,7 @@ 

       return 1

  diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8

  new file mode 100644

- index 000000000..8ce214884

+ index 000000000000..8ce214884485

  --- /dev/null

  +++ b/util/grub-rpm-sort.8

  @@ -0,0 +1,12 @@
@@ -161,7 +161,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c

  new file mode 100644

- index 000000000..f33bd1ed5

+ index 000000000000..f33bd1ed5684

  --- /dev/null

  +++ b/util/grub-rpm-sort.c

  @@ -0,0 +1,281 @@

@@ -1,7 +1,7 @@ 

  From 8f42cdcaaffec149276d2a5a3faa2540432edc4c Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 30 Jun 2015 15:50:41 -0400

- Subject: [PATCH 127/198] Handle rssd storage devices.

+ Subject: [PATCH 127/206] Handle rssd storage devices.

  

  Resolves: rhbz#1087962

  
@@ -11,7 +11,7 @@ 

   1 file changed, 13 insertions(+)

  

  diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c

- index 90d92d3ad..6d9f4e5fa 100644

+ index 90d92d3ad5ca..6d9f4e5faa24 100644

  --- a/grub-core/osdep/linux/getroot.c

  +++ b/grub-core/osdep/linux/getroot.c

  @@ -921,6 +921,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,

@@ -1,7 +1,7 @@ 

  From 1daf969815f1487e02a78725e592b4d973641a4f Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 27 Oct 2014 09:22:55 -0400

- Subject: [PATCH 128/198] Try to emit linux16/initrd16 and linuxefi/initrdefi

+ Subject: [PATCH 128/206] Try to emit linux16/initrd16 and linuxefi/initrdefi

   in 30-os_prober.

  

  Resolves: rhbz#1108296
@@ -12,7 +12,7 @@ 

   1 file changed, 26 insertions(+), 4 deletions(-)

  

  diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in

- index 9b8f5968e..dc98eace9 100644

+ index 9b8f5968e2d7..dc98eace9345 100644

  --- a/util/grub.d/30_os-prober.in

  +++ b/util/grub.d/30_os-prober.in

  @@ -141,6 +141,28 @@ for OS in ${OSPROBED} ; do

@@ -1,7 +1,7 @@ 

  From 114b6f132798b8819e899e3dc7988519dedc07e2 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 28 Apr 2015 11:15:03 -0400

- Subject: [PATCH 129/198] Make grub2-mkconfig construct titles that look like

+ Subject: [PATCH 129/206] Make grub2-mkconfig construct titles that look like

   the ones we want elsewhere.

  

  Resolves: rhbz#1215839
@@ -12,7 +12,7 @@ 

   1 file changed, 11 insertions(+), 3 deletions(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index c6627268c..121524185 100644

+ index c6627268cca5..1215241859be 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -68,6 +68,15 @@ case x"$GRUB_FS" in

@@ -1,7 +1,7 @@ 

  From b970cde9a609dce14c52145aaa61b87299f55086 Mon Sep 17 00:00:00 2001

  From: Robert Marshall <rmarshall@redhat.com>

  Date: Thu, 25 Jun 2015 11:13:11 -0400

- Subject: [PATCH 130/198] Add friendly grub2 password config tool (#985962)

+ Subject: [PATCH 130/206] Add friendly grub2 password config tool (#985962)

  

  Provided a tool for users to reset the grub2 root user password

  without having to alter the grub.cfg. The hashed password now
@@ -22,7 +22,7 @@ 

   create mode 100644 util/grub.d/01_users.in

  

  diff --git a/.gitignore b/.gitignore

- index 1c8537129..387e3554c 100644

+ index 1c85371298c4..387e3554cd5a 100644

  --- a/.gitignore

  +++ b/.gitignore

  @@ -107,6 +107,8 @@ grub-*.tar.*
@@ -35,7 +35,7 @@ 

   /grub*-shell-tester

   /grub*-sparc64-setup

  diff --git a/Makefile.util.def b/Makefile.util.def

- index d846b81b5..226c46b2d 100644

+ index d846b81b5f98..226c46b2d797 100644

  --- a/Makefile.util.def

  +++ b/Makefile.util.def

  @@ -439,6 +439,12 @@ script = {
@@ -66,7 +66,7 @@ 

     name = grub-mkconfig_lib;

     common = util/grub-mkconfig_lib.in;

  diff --git a/configure.ac b/configure.ac

- index 49427cbf9..196084004 100644

+ index 49427cbf989a..1960840048f2 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-mkrelpath])
@@ -78,7 +78,7 @@ 

   grub_TRANSFORM([grub-script-check])

   grub_TRANSFORM([grub-set-default])

  diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in

- index 9d595ac05..fb8724708 100644

+ index 9d595ac058aa..fb8724708b5d 100644

  --- a/util/grub-mkconfig.in

  +++ b/util/grub-mkconfig.in

  @@ -263,6 +263,8 @@ for i in "${grub_mkconfig_dir}"/* ; do
@@ -92,7 +92,7 @@ 

           echo

  diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8

  new file mode 100644

- index 000000000..49200a848

+ index 000000000000..49200a848b78

  --- /dev/null

  +++ b/util/grub-setpassword.8

  @@ -0,0 +1,28 @@
@@ -126,7 +126,7 @@ 

  +.BR "info grub2-mkpasswd-pbkdf2"

  diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in

  new file mode 100644

- index 000000000..dd76f00fc

+ index 000000000000..dd76f00fc0e5

  --- /dev/null

  +++ b/util/grub-setpassword.in

  @@ -0,0 +1,123 @@
@@ -255,7 +255,7 @@ 

  +echo "GRUB2_PASSWORD=${MYPASS}" > "${grubdir}/user.cfg"

  diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in

  new file mode 100644

- index 000000000..db2f44bfb

+ index 000000000000..db2f44bfb786

  --- /dev/null

  +++ b/util/grub.d/01_users.in

  @@ -0,0 +1,11 @@

@@ -1,7 +1,7 @@ 

  From 28c26e2c86d4b1218004d9e73ba3350704548e32 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 28 Apr 2015 11:15:03 -0400

- Subject: [PATCH 131/198] Make grub2-mkconfig construct titles that look like

+ Subject: [PATCH 131/206] Make grub2-mkconfig construct titles that look like

   the ones we want elsewhere.

  

  Resolves: rhbz#1215839
@@ -12,7 +12,7 @@ 

   1 file changed, 23 insertions(+), 11 deletions(-)

  

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index 121524185..584ad1f46 100644

+ index 1215241859be..584ad1f46399 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -70,11 +70,28 @@ esac

@@ -1,7 +1,7 @@ 

  From 000e91150ac5831e54e0cd1176c113f5358a7876 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 3 Aug 2015 11:46:42 -0400

- Subject: [PATCH 132/198] Try to make sure configure.ac and grub-rpm-sort play

+ Subject: [PATCH 132/206] Try to make sure configure.ac and grub-rpm-sort play

   nice.

  

  Apparently the test for whether to use grub-rpm-sort and also the
@@ -16,7 +16,7 @@ 

   2 files changed, 7 insertions(+), 4 deletions(-)

  

  diff --git a/configure.ac b/configure.ac

- index 196084004..3c4b9a19b 100644

+ index 1960840048f2..3c4b9a19b10f 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -1795,7 +1795,7 @@ AC_SUBST([LIBDEVMAPPER])
@@ -29,7 +29,7 @@ 

   fi

   

  diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in

- index 954844d2d..9c410eae4 100644

+ index 954844d2d952..9c410eae4936 100644

  --- a/util/grub-mkconfig_lib.in

  +++ b/util/grub-mkconfig_lib.in

  @@ -33,6 +33,9 @@ fi

@@ -1,7 +1,7 @@ 

  From e6aef714ded4e1b93464368eae39f7354e0053e6 Mon Sep 17 00:00:00 2001

  From: Josef Bacik <jbacik@fb.com>

  Date: Wed, 12 Aug 2015 08:57:55 -0700

- Subject: [PATCH 133/198] tcp: add window scaling support

+ Subject: [PATCH 133/206] tcp: add window scaling support

  

  Sometimes we have to provision boxes across regions, such as California to

  Sweden.  The http server has a 10 minute timeout, so if we can't get our 250mb
@@ -17,7 +17,7 @@ 

   1 file changed, 29 insertions(+), 13 deletions(-)

  

  diff --git a/grub-core/net/tcp.c b/grub-core/net/tcp.c

- index e8ad34b84..7d4b82262 100644

+ index e8ad34b84d4e..7d4b822626d5 100644

  --- a/grub-core/net/tcp.c

  +++ b/grub-core/net/tcp.c

  @@ -106,6 +106,18 @@ struct tcphdr

@@ -1,7 +1,7 @@ 

  From 44d4ff84eddb7cc679b8bfa6799824df6d43d413 Mon Sep 17 00:00:00 2001

  From: Josef Bacik <jbacik@fb.com>

  Date: Mon, 31 Aug 2015 13:34:35 -0400

- Subject: [PATCH 134/198] efinet: retransmit if our device is busy

+ Subject: [PATCH 134/206] efinet: retransmit if our device is busy

  

  When I fixed the txbuf handling I ripped out the retransmission code since it

  was flooding our network when we had the buggy behavior.  Turns out this was too
@@ -16,7 +16,7 @@ 

   1 file changed, 10 insertions(+)

  

  diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c

- index 5388f952b..3f112438a 100644

+ index 5388f952ba9b..3f112438a932 100644

  --- a/grub-core/net/drivers/efi/efinet.c

  +++ b/grub-core/net/drivers/efi/efinet.c

  @@ -38,6 +38,7 @@ send_card_buffer (struct grub_net_card *dev,

@@ -1,7 +1,7 @@ 

  From 457789395b36baa8348b4594f9dc9fc2e8c5ef6c Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Fri, 11 Sep 2015 17:30:49 -0400

- Subject: [PATCH 135/198] Be more aggro about actually using the *configured*

+ Subject: [PATCH 135/206] Be more aggro about actually using the *configured*

   network device.

  

  Right now we use any SNP device with the same mac+IP block, but when
@@ -18,7 +18,7 @@ 

   2 files changed, 102 insertions(+), 26 deletions(-)

  

  diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c

- index 3f112438a..a3ce4c67c 100644

+ index 3f112438a932..a3ce4c67cce1 100644

  --- a/grub-core/net/drivers/efi/efinet.c

  +++ b/grub-core/net/drivers/efi/efinet.c

  @@ -239,46 +239,85 @@ grub_efinet_get_device_handle (struct grub_net_card *card)
@@ -205,7 +205,7 @@ 

       if (! cdp)

         continue;

  diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h

- index c7c9f0e1d..97b9aa7a4 100644

+ index c7c9f0e1db16..97b9aa7a4d70 100644

  --- a/include/grub/efi/api.h

  +++ b/include/grub/efi/api.h

  @@ -622,6 +622,10 @@ typedef struct grub_efi_device_path grub_efi_device_path_t;

@@ -1,7 +1,7 @@ 

  From cc02f809a13a9efa0f3c6295f7dd0ea29cc030b9 Mon Sep 17 00:00:00 2001

  From: RHEL Ninjas <example@example.com>

  Date: Fri, 25 Sep 2015 16:24:23 +0900

- Subject: [PATCH 136/198] efinet: add filter for the first exclusive reopen of

+ Subject: [PATCH 136/206] efinet: add filter for the first exclusive reopen of

   SNP

  

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 39 insertions(+)

  

  diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c

- index a3ce4c67c..b870d3f19 100644

+ index a3ce4c67cce1..b870d3f1938e 100644

  --- a/grub-core/net/drivers/efi/efinet.c

  +++ b/grub-core/net/drivers/efi/efinet.c

  @@ -465,6 +465,45 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,

@@ -1,7 +1,7 @@ 

  From 1f03d841b2872f5118fc7cbde39f0f19021d16ae Mon Sep 17 00:00:00 2001

  From: Hector Marco-Gisbert <hecmargi@upv.es>

  Date: Fri, 13 Nov 2015 16:21:09 +0100

- Subject: [PATCH 137/198] Fix security issue when reading username and password

+ Subject: [PATCH 137/206] Fix security issue when reading username and password

  

    This patch fixes two integer underflows at:

      * grub-core/lib/crypto.c
@@ -17,7 +17,7 @@ 

   2 files changed, 2 insertions(+), 2 deletions(-)

  

  diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c

- index ca334d5a4..e6c78d16d 100644

+ index ca334d5a40e0..e6c78d16d39f 100644

  --- a/grub-core/lib/crypto.c

  +++ b/grub-core/lib/crypto.c

  @@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size)
@@ -30,7 +30,7 @@ 

   	  if (cur_len)

   	    cur_len--;

  diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c

- index 6be678c0d..c35ce9724 100644

+ index 6be678c0de1a..c35ce9724737 100644

  --- a/grub-core/normal/auth.c

  +++ b/grub-core/normal/auth.c

  @@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size)

@@ -1,7 +1,7 @@ 

  From d2367e799a35076aa94b940ee04c88df616f9278 Mon Sep 17 00:00:00 2001

  From: Robert Marshall <rmarshall@redhat.com>

  Date: Mon, 22 Feb 2016 15:30:05 -0500

- Subject: [PATCH 138/198] Warn if grub password will not be read (#1290803)

+ Subject: [PATCH 138/206] Warn if grub password will not be read (#1290803)

  

  It is possible for a system to have never run grub-mkconfig and add the

  section that reads the user.cfg file which contains a user set GRUB
@@ -14,7 +14,7 @@ 

   1 file changed, 5 insertions(+)

  

  diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in

- index dd76f00fc..fb9d3a3b6 100644

+ index dd76f00fc0e5..fb9d3a3b6f92 100644

  --- a/util/grub-setpassword.in

  +++ b/util/grub-setpassword.in

  @@ -121,3 +121,8 @@ fi

@@ -1,7 +1,7 @@ 

  From 2166377a018bc26bc565fecf76d31057a3533603 Mon Sep 17 00:00:00 2001

  From: Robert Marshall <rmarshall@redhat.com>

  Date: Tue, 26 Jan 2016 10:28:35 -0500

- Subject: [PATCH 139/198] Clean up grub-setpassword documentation (#1290799)

+ Subject: [PATCH 139/206] Clean up grub-setpassword documentation (#1290799)

  

  The output for --help had some errors. Corrected those and polished the

  text to be a little easier to follow. Carried verbage over to man page
@@ -14,7 +14,7 @@ 

   2 files changed, 8 insertions(+), 9 deletions(-)

  

  diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8

- index 49200a848..dc91dd669 100644

+ index 49200a848b78..dc91dd6697bc 100644

  --- a/util/grub-setpassword.8

  +++ b/util/grub-setpassword.8

  @@ -19,7 +19,7 @@ Display program usage and exit.
@@ -27,7 +27,7 @@ 

   

   .SH SEE ALSO

  diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in

- index fb9d3a3b6..c8c0fa419 100644

+ index fb9d3a3b6f92..c8c0fa4199d2 100644

  --- a/util/grub-setpassword.in

  +++ b/util/grub-setpassword.in

  @@ -16,15 +16,14 @@ grub_mkpasswd="${bindir}/@grub_mkpasswd_pbkdf2@"

@@ -1,7 +1,7 @@ 

  From 27f304a75c966a1daad262d34c84c7de0c5dab69 Mon Sep 17 00:00:00 2001

  From: Robert Marshall <rmarshall@redhat.com>

  Date: Fri, 29 Jan 2016 16:56:11 -0500

- Subject: [PATCH 140/198] Fix locale issue in grub-setpassword (#1294243)

+ Subject: [PATCH 140/206] Fix locale issue in grub-setpassword (#1294243)

  

  A shell substitution was expecting non-translated output to grab the

  hashed password and put it in the user.cfg file. Modified code to force
@@ -13,7 +13,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in

- index c8c0fa419..d7924af51 100644

+ index c8c0fa4199d2..d7924af51921 100644

  --- a/util/grub-setpassword.in

  +++ b/util/grub-setpassword.in

  @@ -104,7 +104,7 @@ getpass() {

@@ -1,7 +1,7 @@ 

  From cd5e17c01c996bcf446e16978e37569aa0d889dd Mon Sep 17 00:00:00 2001

  From: Robert Elliott <elliott@hpe.com>

  Date: Fri, 22 Jan 2016 13:32:30 +0100

- Subject: [PATCH 141/198] efiemu: Handle persistent RAM and unknown possible

+ Subject: [PATCH 141/206] efiemu: Handle persistent RAM and unknown possible

   future additions.

  

  (cherry picked from commit ae3b83a4d4df75a01198a2fed7542391e7c449e0)
@@ -12,7 +12,7 @@ 

   1 file changed, 2 insertions(+), 2 deletions(-)

  

  diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c

- index 52a032f7b..92e7df7e5 100644

+ index 52a032f7b2e6..92e7df7e5012 100644

  --- a/grub-core/efiemu/mm.c

  +++ b/grub-core/efiemu/mm.c

  @@ -410,8 +410,8 @@ fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,

@@ -1,7 +1,7 @@ 

  From 54e9e666d32c0a18a7cc529cda86686462f04151 Mon Sep 17 00:00:00 2001

  From: Vladimir Serbinenko <phcoder@gmail.com>

  Date: Fri, 22 Jan 2016 14:10:30 +0100

- Subject: [PATCH 142/198] efiemu: Fix compilation failure

+ Subject: [PATCH 142/206] efiemu: Fix compilation failure

  

  (cherry picked from commit b6a03dfd327489d53ee07c6d7d593b99c7b7cb62)

  
@@ -11,7 +11,7 @@ 

   1 file changed, 2 insertions(+), 2 deletions(-)

  

  diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c

- index 92e7df7e5..52a032f7b 100644

+ index 92e7df7e5012..52a032f7b2e6 100644

  --- a/grub-core/efiemu/mm.c

  +++ b/grub-core/efiemu/mm.c

  @@ -410,8 +410,8 @@ fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,

@@ -1,7 +1,7 @@ 

  From e5df22a8207a4b09c7bc89a7ac92719a529c2a63 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 7 Apr 2016 10:58:06 -0400

- Subject: [PATCH 143/198] Revert "reopen SNP protocol for exclusive use by

+ Subject: [PATCH 143/206] Revert "reopen SNP protocol for exclusive use by

   grub"

  

  I *think* this should have been replaced by upstream's
@@ -15,7 +15,7 @@ 

   1 file changed, 39 deletions(-)

  

  diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c

- index b870d3f19..a3ce4c67c 100644

+ index b870d3f1938e..a3ce4c67cce1 100644

  --- a/grub-core/net/drivers/efi/efinet.c

  +++ b/grub-core/net/drivers/efi/efinet.c

  @@ -465,45 +465,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,

file modified
+6 -6
@@ -1,7 +1,7 @@ 

  From 283d44e07b5c02cd87a0eec5cdd596306a9c1b41 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 14 Jun 2016 16:18:44 -0400

- Subject: [PATCH 144/198] Add a url parser.

+ Subject: [PATCH 144/206] Add a url parser.

  

  This patch adds a url parser that can parse http, https, tftp, and tftps

  urls, and is easily extensible to handle more types.
@@ -20,7 +20,7 @@ 

   create mode 100644 include/grub/net/url.h

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 5ae70204c..4857a1e5f 100644

+ index 5ae70204cd29..4857a1e5f615 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -2199,6 +2199,7 @@ module = {
@@ -32,7 +32,7 @@ 

   

   module = {

  diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c

- index 8344526be..f1fab7000 100644

+ index 8344526be7f3..f1fab7000487 100644

  --- a/grub-core/kern/misc.c

  +++ b/grub-core/kern/misc.c

  @@ -296,6 +296,19 @@ grub_strrchr (const char *s, int c)
@@ -57,7 +57,7 @@ 

   {

  diff --git a/grub-core/net/url.c b/grub-core/net/url.c

  new file mode 100644

- index 000000000..146858284

+ index 000000000000..146858284cd9

  --- /dev/null

  +++ b/grub-core/net/url.c

  @@ -0,0 +1,861 @@
@@ -923,7 +923,7 @@ 

  +}

  +#endif

  diff --git a/include/grub/misc.h b/include/grub/misc.h

- index 062081437..4737da1ea 100644

+ index 062081437790..4737da1eaa95 100644

  --- a/include/grub/misc.h

  +++ b/include/grub/misc.h

  @@ -85,6 +85,7 @@ int EXPORT_FUNC(grub_strncmp) (const char *s1, const char *s2, grub_size_t n);
@@ -987,7 +987,7 @@ 

   {

  diff --git a/include/grub/net/url.h b/include/grub/net/url.h

  new file mode 100644

- index 000000000..a215fa27d

+ index 000000000000..a215fa27d0a1

  --- /dev/null

  +++ b/include/grub/net/url.h

  @@ -0,0 +1,28 @@

@@ -1,7 +1,7 @@ 

  From 89b9b60f3bf638786a686eb86344a73523168034 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 8 Jun 2016 21:03:37 -0400

- Subject: [PATCH 145/198] efinet and bootp: add support for dhcpv6

+ Subject: [PATCH 145/206] efinet and bootp: add support for dhcpv6

  

  Signed-off-by: Peter Jones <pjones@redhat.com>

  ---
@@ -14,7 +14,7 @@ 

   6 files changed, 480 insertions(+), 14 deletions(-)

  

  diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c

- index f03eeab2f..da3e45446 100644

+ index f03eeab2fb42..da3e454466bf 100644

  --- a/grub-core/net/bootp.c

  +++ b/grub-core/net/bootp.c

  @@ -23,6 +23,7 @@
@@ -206,7 +206,7 @@ 

   grub_net_process_dhcp (struct grub_net_buff *nb,

   		       struct grub_net_card *card)

  diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c

- index a3ce4c67c..329024b6f 100644

+ index a3ce4c67cce1..329024b6f2ca 100644

  --- a/grub-core/net/drivers/efi/efinet.c

  +++ b/grub-core/net/drivers/efi/efinet.c

  @@ -18,11 +18,15 @@
@@ -319,7 +319,7 @@ 

     }

   }

  diff --git a/grub-core/net/net.c b/grub-core/net/net.c

- index 16d2ce06d..4be228d95 100644

+ index 16d2ce06d5a1..4be228d95766 100644

  --- a/grub-core/net/net.c

  +++ b/grub-core/net/net.c

  @@ -955,6 +955,78 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
@@ -402,7 +402,7 @@ 

   grub_err_t

   grub_net_add_ipv4_local (struct grub_net_network_level_interface *inter,

  diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c

- index 7d90bf66e..1157524fc 100644

+ index 7d90bf66e763..1157524fc504 100644

  --- a/grub-core/net/tftp.c

  +++ b/grub-core/net/tftp.c

  @@ -379,19 +379,23 @@ tftp_open (struct grub_file *file, const char *filename)
@@ -430,7 +430,7 @@ 

         grub_free (data);

         return grub_errno;

  diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h

- index 97b9aa7a4..02488ec35 100644

+ index 97b9aa7a4d70..02488ec35ae8 100644

  --- a/include/grub/efi/api.h

  +++ b/include/grub/efi/api.h

  @@ -572,10 +572,16 @@ typedef void *grub_efi_handle_t;
@@ -585,7 +585,7 @@ 

   

   typedef struct grub_efi_pxe

  diff --git a/include/grub/net.h b/include/grub/net.h

- index 50d62ab0c..f8f3ec13a 100644

+ index 50d62ab0c8c6..f8f3ec13acc5 100644

  --- a/include/grub/net.h

  +++ b/include/grub/net.h

  @@ -442,6 +442,51 @@ struct grub_net_bootp_packet

@@ -1,7 +1,7 @@ 

  From 38b9ded25e7f0b2b0265759bbf3a69e07df50eb9 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 23 Jun 2016 11:01:39 -0400

- Subject: [PATCH 146/198] Add grub-get-kernel-settings and use it in 10_linux

+ Subject: [PATCH 146/206] Add grub-get-kernel-settings and use it in 10_linux

  

  This patch adds grub-get-kernel-settings, which reads the system kernel

  installation configuration from /etc/sysconfig/kernel, and outputs
@@ -24,7 +24,7 @@ 

   create mode 100644 util/grub-get-kernel-settings.in

  

  diff --git a/.gitignore b/.gitignore

- index 387e3554c..9f258735a 100644

+ index 387e3554cd5a..9f258735aaa8 100644

  --- a/.gitignore

  +++ b/.gitignore

  @@ -64,6 +64,8 @@ grub-*.tar.*
@@ -37,7 +37,7 @@ 

   /grub*-glue-efi.1

   /grub*-install

  diff --git a/Makefile.util.def b/Makefile.util.def

- index 226c46b2d..ed27351eb 100644

+ index 226c46b2d797..ed27351eb472 100644

  --- a/Makefile.util.def

  +++ b/Makefile.util.def

  @@ -713,6 +713,13 @@ script = {
@@ -55,7 +55,7 @@ 

     name = grub-set-default;

     common = util/grub-set-default.in;

  diff --git a/configure.ac b/configure.ac

- index 3c4b9a19b..40be70019 100644

+ index 3c4b9a19b10f..40be70019e2c 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -58,6 +58,7 @@ grub_TRANSFORM([grub-install])
@@ -75,7 +75,7 @@ 

   grub_TRANSFORM([grub-install.1])

   grub_TRANSFORM([grub-kbdcomp.3])

  diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in

- index 44bf135b9..5c4acd496 100644

+ index 44bf135b9f83..5c4acd496d4b 100644

  --- a/util/bash-completion.d/grub-completion.bash.in

  +++ b/util/bash-completion.d/grub-completion.bash.in

  @@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \
@@ -109,7 +109,7 @@ 

   #

  diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3

  new file mode 100644

- index 000000000..ba33330e2

+ index 000000000000..ba33330e28d8

  --- /dev/null

  +++ b/util/grub-get-kernel-settings.3

  @@ -0,0 +1,20 @@
@@ -135,7 +135,7 @@ 

  +.BR "info grub"

  diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in

  new file mode 100644

- index 000000000..120462198

+ index 000000000000..120462198780

  --- /dev/null

  +++ b/util/grub-get-kernel-settings.in

  @@ -0,0 +1,78 @@
@@ -218,7 +218,7 @@ 

  +    echo export GRUB_LINUX_DEBUG_TITLE_POSTFIX

  +fi

  diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in

- index fb8724708..e32de5ef3 100644

+ index fb8724708b5d..e32de5ef361f 100644

  --- a/util/grub-mkconfig.in

  +++ b/util/grub-mkconfig.in

  @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@"
@@ -239,7 +239,7 @@ 

     GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED"

   fi

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index 584ad1f46..c9bf223f2 100644

+ index 584ad1f46399..c9bf223f2737 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -101,7 +101,8 @@ linux_entry ()

@@ -1,7 +1,7 @@ 

  From 17fc1314e398d7ab2f3ae5a6d1114543653e8a91 Mon Sep 17 00:00:00 2001

  From: Lenny Szubowicz <lszubowi@redhat.com>

  Date: Mon, 29 Aug 2016 11:04:48 -0400

- Subject: [PATCH 147/198] Normalize slashes in tftp paths.

+ Subject: [PATCH 147/206] Normalize slashes in tftp paths.

  

  Some tftp servers do not handle multiple consecutive slashes correctly;

  this patch avoids sending tftp requests with non-normalized paths.
@@ -12,7 +12,7 @@ 

   1 file changed, 23 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c

- index 1157524fc..5ca0a96a6 100644

+ index 1157524fc504..5ca0a96a6f6b 100644

  --- a/grub-core/net/tftp.c

  +++ b/grub-core/net/tftp.c

  @@ -300,6 +300,25 @@ destroy_pq (tftp_data_t data)

@@ -1,7 +1,7 @@ 

  From 94758538586b3fb2602d41c5ccc0b58769a09933 Mon Sep 17 00:00:00 2001

  From: Mark Salter <msalter@redhat.com>

  Date: Tue, 7 Mar 2017 18:26:17 -0500

- Subject: [PATCH 148/198] Fix malformed tftp packets

+ Subject: [PATCH 148/206] Fix malformed tftp packets

  

  0088-Normalize-slashes-in-tftp-paths.patch collapses multiple contiguous

  slashes in a filename into one slash in the tftp packet filename field.
@@ -16,7 +16,7 @@ 

   1 file changed, 2 insertions(+), 2 deletions(-)

  

  diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c

- index 5ca0a96a6..dcd824943 100644

+ index 5ca0a96a6f6b..dcd824943093 100644

  --- a/grub-core/net/tftp.c

  +++ b/grub-core/net/tftp.c

  @@ -360,8 +360,8 @@ tftp_open (struct grub_file *file, const char *filename)

@@ -1,14 +1,14 @@ 

  From bb2ea94b6dcccec798e8728c51d53786f2fe0d2c Mon Sep 17 00:00:00 2001

  From: Matthew Garrett <mjg59@coreos.com>

  Date: Tue, 14 Jul 2015 16:58:51 -0700

- Subject: [PATCH 149/198] Fix race in EFI validation

+ Subject: [PATCH 149/206] Fix race in EFI validation

  

  ---

   grub-core/loader/i386/efi/linux.c | 44 ++++++++++-----------------------------

   1 file changed, 11 insertions(+), 33 deletions(-)

  

  diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c

- index e5b778577..7ccf32d9d 100644

+ index e5b778577f94..7ccf32d9d45f 100644

  --- a/grub-core/loader/i386/efi/linux.c

  +++ b/grub-core/loader/i386/efi/linux.c

  @@ -154,7 +154,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From 09a5e37fe9bbe1b7cf7fe0a1211e06de555b0b54 Mon Sep 17 00:00:00 2001

  From: Masahiro Matsuya <mmatsuya@redhat.com>

  Date: Sat, 29 Oct 2016 08:35:26 +0900

- Subject: [PATCH 150/198] bz1374141 fix incorrect mask for ppc64

+ Subject: [PATCH 150/206] bz1374141 fix incorrect mask for ppc64

  

  The netmask configured in firmware is not respected on ppc64 (big endian).

  When 255.255.252.0 is set as netmask in firmware, the following is the value of bootpath string in grub_ieee1275_parse_bootpath().
@@ -30,7 +30,7 @@ 

   1 file changed, 1 insertion(+), 2 deletions(-)

  

  diff --git a/grub-core/net/drivers/ieee1275/ofnet.c b/grub-core/net/drivers/ieee1275/ofnet.c

- index 002446be1..3df75357a 100644

+ index 002446be1c38..3df75357a707 100644

  --- a/grub-core/net/drivers/ieee1275/ofnet.c

  +++ b/grub-core/net/drivers/ieee1275/ofnet.c

  @@ -220,8 +220,7 @@ grub_ieee1275_parse_bootpath (const char *devpath, char *bootpath,

@@ -1,7 +1,7 @@ 

  From 79da61bd99b4cd4c817eeb022bd9f7d3e1d38258 Mon Sep 17 00:00:00 2001

  From: Raymund Will <rw@suse.com>

  Date: Fri, 10 Apr 2015 01:45:02 -0400

- Subject: [PATCH 151/198] Use device part of chainloader target, if present.

+ Subject: [PATCH 151/206] Use device part of chainloader target, if present.

  

  Otherwise chainloading is restricted to '$root', which might not even

  be readable by EFI!
@@ -15,7 +15,7 @@ 

   1 file changed, 5 insertions(+), 2 deletions(-)

  

  diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c

- index adc856366..14ce6ddd7 100644

+ index adc856366332..14ce6ddd7ad2 100644

  --- a/grub-core/loader/efi/chainloader.c

  +++ b/grub-core/loader/efi/chainloader.c

  @@ -223,8 +223,11 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From cffa3c44d259122720382c8d2c08ff3e57b00de4 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 6 Oct 2015 13:04:37 -0400

- Subject: [PATCH 152/198] Add secureboot support on efi chainloader

+ Subject: [PATCH 152/206] Add secureboot support on efi chainloader

  

  Expand the chainloader to be able to verify the image by means of shim

  lock protocol. The PE/COFF image is loaded and relocated by the
@@ -22,7 +22,7 @@ 

   2 files changed, 595 insertions(+), 37 deletions(-)

  

  diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c

- index 14ce6ddd7..87a91e16f 100644

+ index 14ce6ddd7ad2..87a91e16f173 100644

  --- a/grub-core/loader/efi/chainloader.c

  +++ b/grub-core/loader/efi/chainloader.c

  @@ -32,6 +32,8 @@
@@ -758,7 +758,7 @@ 

   

     return grub_errno;

  diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h

- index 7d44732d2..6e24dae2c 100644

+ index 7d44732d2c35..6e24dae2cb66 100644

  --- a/include/grub/efi/pe32.h

  +++ b/include/grub/efi/pe32.h

  @@ -214,7 +214,11 @@ struct grub_pe64_optional_header

@@ -1,7 +1,7 @@ 

  From a59984e248881a8c47d0c6035ce3dc062fa2113f Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 6 Oct 2015 16:09:25 -0400

- Subject: [PATCH 153/198] Make any of the loaders that link in efi mode honor

+ Subject: [PATCH 153/206] Make any of the loaders that link in efi mode honor

   secure boot.

  

  And in this case "honor" means "even if somebody does link this in, they
@@ -37,7 +37,7 @@ 

   create mode 100644 include/grub/sparc64/linux.h

  

  diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

- index 104513847..f7b4d29b0 100644

+ index 104513847204..f7b4d29b0b30 100644

  --- a/grub-core/Makefile.am

  +++ b/grub-core/Makefile.am

  @@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
@@ -49,7 +49,7 @@ 

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h

   KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 4857a1e5f..75a7ab344 100644

+ index 4857a1e5f615..75a7ab3441d0 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -196,6 +196,7 @@ kernel = {
@@ -61,7 +61,7 @@ 

     x86 = kern/i386/tsc.c;

     x86 = kern/i386/tsc_pit.c;

  diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c

- index a0c164e54..41a7f3f04 100644

+ index a0c164e54f06..41a7f3f0466d 100644

  --- a/grub-core/commands/iorw.c

  +++ b/grub-core/commands/iorw.c

  @@ -23,6 +23,7 @@
@@ -93,7 +93,7 @@ 

     grub_unregister_extcmd (cmd_read_word);

     grub_unregister_extcmd (cmd_read_dword);

  diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c

- index 98769eadb..088cbe9e2 100644

+ index 98769eadb34a..088cbe9e2bcd 100644

  --- a/grub-core/commands/memrw.c

  +++ b/grub-core/commands/memrw.c

  @@ -22,6 +22,7 @@
@@ -125,7 +125,7 @@ 

     grub_unregister_extcmd (cmd_read_word);

     grub_unregister_extcmd (cmd_read_dword);

  diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c

- index 2588b481e..684ca93f8 100644

+ index 2588b481e76d..684ca93f8f41 100644

  --- a/grub-core/kern/efi/efi.c

  +++ b/grub-core/kern/efi/efi.c

  @@ -269,34 +269,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@@ -165,7 +165,7 @@ 

   /* Search the mods section from the PE32/PE32+ image. This code uses

  diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c

  new file mode 100644

- index 000000000..a41b6c5b8

+ index 000000000000..a41b6c5b851e

  --- /dev/null

  +++ b/grub-core/kern/efi/sb.c

  @@ -0,0 +1,58 @@
@@ -228,7 +228,7 @@ 

  +#endif

  +}

  diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c

- index 74888c463..69c2a10d3 100644

+ index 74888c463bad..69c2a10d3518 100644

  --- a/grub-core/loader/efi/appleloader.c

  +++ b/grub-core/loader/efi/appleloader.c

  @@ -24,6 +24,7 @@
@@ -259,7 +259,7 @@ 

     grub_unregister_command (cmd);

   }

  diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c

- index 87a91e16f..aee8e6bec 100644

+ index 87a91e16f173..aee8e6becf6b 100644

  --- a/grub-core/loader/efi/chainloader.c

  +++ b/grub-core/loader/efi/chainloader.c

  @@ -34,6 +34,7 @@
@@ -271,7 +271,7 @@ 

   #include <grub/i18n.h>

   #include <grub/net.h>

  diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c

- index 7f96515da..87709aa23 100644

+ index 7f96515da652..87709aa23e85 100644

  --- a/grub-core/loader/i386/bsd.c

  +++ b/grub-core/loader/i386/bsd.c

  @@ -38,6 +38,7 @@
@@ -303,7 +303,7 @@ 

     grub_unregister_extcmd (cmd_openbsd);

     grub_unregister_extcmd (cmd_netbsd);

  diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c

- index 083f9417c..b2438547d 100644

+ index 083f9417cb65..b2438547dd09 100644

  --- a/grub-core/loader/i386/linux.c

  +++ b/grub-core/loader/i386/linux.c

  @@ -35,6 +35,7 @@
@@ -335,7 +335,7 @@ 

     grub_unregister_command (cmd_initrd);

   }

  diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c

- index a293b17aa..91283157e 100644

+ index a293b17aa101..91283157e30f 100644

  --- a/grub-core/loader/i386/pc/linux.c

  +++ b/grub-core/loader/i386/pc/linux.c

  @@ -35,6 +35,7 @@
@@ -367,7 +367,7 @@ 

     grub_unregister_command (cmd_initrd);

   }

  diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c

- index bd9d5b3e6..fb044a60c 100644

+ index bd9d5b3e6985..fb044a60c790 100644

  --- a/grub-core/loader/multiboot.c

  +++ b/grub-core/loader/multiboot.c

  @@ -42,6 +42,7 @@
@@ -399,7 +399,7 @@ 

     grub_unregister_command (cmd_module);

   }

  diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c

- index c9885b1bc..df8dfdb4b 100644

+ index c9885b1bcd73..df8dfdb4ba09 100644

  --- a/grub-core/loader/xnu.c

  +++ b/grub-core/loader/xnu.c

  @@ -33,6 +33,7 @@
@@ -431,7 +431,7 @@ 

     grub_unregister_command (cmd_resume);

   #endif

  diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h

- index bb3ab7dfd..91e29ce66 100644

+ index bb3ab7dfdeb1..91e29ce66f1b 100644

  --- a/include/grub/efi/efi.h

  +++ b/include/grub/efi/efi.h

  @@ -83,7 +83,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
@@ -444,7 +444,7 @@ 

   					     const grub_efi_device_path_t *dp2);

  diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h

  new file mode 100644

- index 000000000..9629fbb0f

+ index 000000000000..9629fbb0f9e4

  --- /dev/null

  +++ b/include/grub/efi/sb.h

  @@ -0,0 +1,29 @@
@@ -479,16 +479,16 @@ 

  +#endif /* ! GRUB_EFI_SB_HEADER */

  diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h

  new file mode 100644

- index 000000000..e69de29bb

+ index 000000000000..e69de29bb2d1

  diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h

  new file mode 100644

- index 000000000..e69de29bb

+ index 000000000000..e69de29bb2d1

  diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h

  new file mode 100644

- index 000000000..e69de29bb

+ index 000000000000..e69de29bb2d1

  diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h

  new file mode 100644

- index 000000000..e69de29bb

+ index 000000000000..e69de29bb2d1

  -- 

  2.14.3

  

@@ -1,7 +1,7 @@ 

  From 37e08ec93e219ece7547b3d4bdbd594eb691fe1a Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 27 Jan 2016 09:22:42 -0500

- Subject: [PATCH 154/198] Make grub_fatal() also backtrace.

+ Subject: [PATCH 154/206] Make grub_fatal() also backtrace.

  

  ---

   grub-core/Makefile.core.def     |  3 ++
@@ -13,7 +13,7 @@ 

   create mode 100644 grub-core/lib/arm64/backtrace.c

  

  diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

- index 75a7ab344..3a5d450f3 100644

+ index 75a7ab3441d0..3a5d450f3d08 100644

  --- a/grub-core/Makefile.core.def

  +++ b/grub-core/Makefile.core.def

  @@ -175,6 +175,9 @@ kernel = {
@@ -27,7 +27,7 @@ 

     i386_xen = kern/i386/dl.c;

   

  diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c

- index f1fab7000..5ce89a40c 100644

+ index f1fab7000487..5ce89a40c68e 100644

  --- a/grub-core/kern/misc.c

  +++ b/grub-core/kern/misc.c

  @@ -24,6 +24,7 @@
@@ -55,7 +55,7 @@ 

   #endif

  diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c

  new file mode 100644

- index 000000000..1079b5380

+ index 000000000000..1079b5380e1b

  --- /dev/null

  +++ b/grub-core/lib/arm64/backtrace.c

  @@ -0,0 +1,62 @@
@@ -122,7 +122,7 @@ 

  +}

  +

  diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c

- index 825a8800e..c0ad6ab8b 100644

+ index 825a8800e25d..c0ad6ab8be1c 100644

  --- a/grub-core/lib/backtrace.c

  +++ b/grub-core/lib/backtrace.c

  @@ -29,6 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -142,7 +142,7 @@ 

   }

   

  diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c

- index c3e03c727..c67273db3 100644

+ index c3e03c7275c5..c67273db3aed 100644

  --- a/grub-core/lib/i386/backtrace.c

  +++ b/grub-core/lib/i386/backtrace.c

  @@ -15,11 +15,23 @@

@@ -1,7 +1,7 @@ 

  From b7c180177336f1979385e02651ba41f7ee79fefc Mon Sep 17 00:00:00 2001

  From: Matthew Garrett <mjg59@coreos.com>

  Date: Sun, 9 Aug 2015 16:12:39 -0700

- Subject: [PATCH 155/198] Rework linux command

+ Subject: [PATCH 155/206] Rework linux command

  

  We want a single buffer that contains the entire kernel image in order to

  perform a TPM measurement. Allocate one and copy the entire kernel into it
@@ -11,7 +11,7 @@ 

   1 file changed, 21 insertions(+), 13 deletions(-)

  

  diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c

- index b2438547d..e4b8342f5 100644

+ index b2438547dd09..e4b8342f5d08 100644

  --- a/grub-core/loader/i386/linux.c

  +++ b/grub-core/loader/i386/linux.c

  @@ -681,12 +681,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From 60e7a1d746e39f10808a1cbd2c4928624026fbf1 Mon Sep 17 00:00:00 2001

  From: Matthew Garrett <mjg59@coreos.com>

  Date: Sun, 9 Aug 2015 16:20:58 -0700

- Subject: [PATCH 156/198] Rework linux16 command

+ Subject: [PATCH 156/206] Rework linux16 command

  

  We want a single buffer that contains the entire kernel image in order to

  perform a TPM measurement. Allocate one and copy the entire kernel int it
@@ -11,7 +11,7 @@ 

   1 file changed, 21 insertions(+), 13 deletions(-)

  

  diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c

- index 91283157e..b864e5403 100644

+ index 91283157e30f..b864e5403332 100644

  --- a/grub-core/loader/i386/pc/linux.c

  +++ b/grub-core/loader/i386/pc/linux.c

  @@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From 587b65a7c706440b5e8592922d36173cb77e6b6e Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Fri, 4 Mar 2016 16:29:13 -0500

- Subject: [PATCH 157/198] Make grub-editenv build again.

+ Subject: [PATCH 157/206] Make grub-editenv build again.

  

  36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage

  utility functions are defined, and they wind up being linked into
@@ -13,7 +13,7 @@ 

   1 file changed, 2 insertions(+)

  

  diff --git a/Makefile.util.def b/Makefile.util.def

- index ed27351eb..38cdf4ccc 100644

+ index ed27351eb472..38cdf4ccc09f 100644

  --- a/Makefile.util.def

  +++ b/Makefile.util.def

  @@ -236,6 +236,8 @@ program = {

@@ -1,7 +1,7 @@ 

  From c3d456a824ccf8c728cae4f50254239bafaf50a1 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 23 Sep 2014 09:58:49 -0400

- Subject: [PATCH 158/198] Fix up some man pages rpmdiff noticed.

+ Subject: [PATCH 158/206] Fix up some man pages rpmdiff noticed.

  

  ---

   configure.ac             |  2 ++
@@ -13,7 +13,7 @@ 

   create mode 100644 util/grub-syslinux2cfg.1

  

  diff --git a/configure.ac b/configure.ac

- index 40be70019..ae371a97d 100644

+ index 40be70019e2c..ae371a97d30a 100644

  --- a/configure.ac

  +++ b/configure.ac

  @@ -80,6 +80,7 @@ grub_TRANSFORM([grub-get-kernel-settings.3])
@@ -34,7 +34,7 @@ 

   if test "x$TARGET_CFLAGS" = x; then

  diff --git a/util/grub-macbless.8 b/util/grub-macbless.8

  new file mode 100644

- index 000000000..ae842f3a6

+ index 000000000000..ae842f3a606c

  --- /dev/null

  +++ b/util/grub-macbless.8

  @@ -0,0 +1,26 @@
@@ -65,7 +65,7 @@ 

  +.SH SEE ALSO

  +.BR "info grub"

  diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1

- index 4dea4f545..0eaaafe50 100644

+ index 4dea4f54597c..0eaaafe505bd 100644

  --- a/util/grub-mkimage.1

  +++ b/util/grub-mkimage.1

  @@ -17,7 +17,7 @@
@@ -79,7 +79,7 @@ 

   .TP

  diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1

  new file mode 100644

- index 000000000..853094827

+ index 000000000000..85309482718e

  --- /dev/null

  +++ b/util/grub-syslinux2cfg.1

  @@ -0,0 +1,65 @@

@@ -1,7 +1,7 @@ 

  From 982d11a87ce05b6e4305b03a29945843311007d0 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 9 Jun 2016 12:22:29 -0400

- Subject: [PATCH 159/198] Re-work some intricacies of PE loading.

+ Subject: [PATCH 159/206] Re-work some intricacies of PE loading.

  

  The PE spec is not a well written document, and awesomely every place

  where there's an ambiguous way to read something, Windows' bootmgfw.efi
@@ -12,7 +12,7 @@ 

   2 files changed, 152 insertions(+), 36 deletions(-)

  

  diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c

- index aee8e6bec..4b77a7d5a 100644

+ index aee8e6becf6b..4b77a7d5adbc 100644

  --- a/grub-core/loader/efi/chainloader.c

  +++ b/grub-core/loader/efi/chainloader.c

  @@ -301,7 +301,7 @@ image_is_64_bit (grub_pe_header_t *pe_hdr)
@@ -293,7 +293,7 @@ 

         efi_call_1 (b->free_pool, buffer);

   

  diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h

- index 6e24dae2c..c03cc599f 100644

+ index 6e24dae2cb66..c03cc599f63f 100644

  --- a/include/grub/efi/pe32.h

  +++ b/include/grub/efi/pe32.h

  @@ -229,12 +229,18 @@ struct grub_pe32_section_table

@@ -1,7 +1,7 @@ 

  From 91943cb164e03979132310784ad802ea9dc3bbd9 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Fri, 10 Jun 2016 14:06:15 -0400

- Subject: [PATCH 160/198] Rework even more of efi chainload so non-sb cases

+ Subject: [PATCH 160/206] Rework even more of efi chainload so non-sb cases

   work right.

  

  This ensures that if shim protocol is not loaded, or is loaded but shim
@@ -51,7 +51,7 @@ 

   6 files changed, 102 insertions(+), 63 deletions(-)

  

  diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c

- index a41b6c5b8..d74778b0c 100644

+ index a41b6c5b851e..d74778b0cacf 100644

  --- a/grub-core/kern/efi/sb.c

  +++ b/grub-core/kern/efi/sb.c

  @@ -36,14 +36,20 @@ grub_efi_secure_boot (void)
@@ -80,7 +80,7 @@ 

     if (*secure_boot && !*setup_mode)

       ret = 1;

  diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c

- index 03ff83563..34f34e65a 100644

+ index 03ff835633cc..34f34e65afd1 100644

  --- a/grub-core/loader/arm64/linux.c

  +++ b/grub-core/loader/arm64/linux.c

  @@ -248,6 +248,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -102,7 +102,7 @@ 

         grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]);

         goto fail;

  diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c

- index 4b77a7d5a..b977c7b55 100644

+ index 4b77a7d5adbc..b977c7b5573c 100644

  --- a/grub-core/loader/efi/chainloader.c

  +++ b/grub-core/loader/efi/chainloader.c

  @@ -182,7 +182,6 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename)
@@ -331,7 +331,7 @@ 

       grub_device_close (dev);

   

  diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c

- index aea378adf..8890bdf05 100644

+ index aea378adf5cb..8890bdf059ae 100644

  --- a/grub-core/loader/efi/linux.c

  +++ b/grub-core/loader/efi/linux.c

  @@ -33,21 +33,24 @@ struct grub_efi_shim_lock
@@ -365,7 +365,7 @@ 

   

   typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *);

  diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c

- index 7ccf32d9d..82f75b7f3 100644

+ index 7ccf32d9d45f..82f75b7f3ab7 100644

  --- a/grub-core/loader/i386/efi/linux.c

  +++ b/grub-core/loader/i386/efi/linux.c

  @@ -155,6 +155,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
@@ -397,7 +397,7 @@ 

         goto fail;

       }

  diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h

- index d9ede3677..0033d9305 100644

+ index d9ede36773bf..0033d9305a9f 100644

  --- a/include/grub/efi/linux.h

  +++ b/include/grub/efi/linux.h

  @@ -22,7 +22,7 @@

@@ -1,7 +1,7 @@ 

  From 0e8eb89517d9621b2595f7d2b152f711309600ee Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 14 Jun 2016 09:50:25 -0400

- Subject: [PATCH 161/198] linuxefi: fix double free on verification failure.

+ Subject: [PATCH 161/206] linuxefi: fix double free on verification failure.

  

  Signed-off-by: Peter Jones <pjones@redhat.com>

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 1 deletion(-)

  

  diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c

- index 82f75b7f3..010bf982d 100644

+ index 82f75b7f3ab7..010bf982d808 100644

  --- a/grub-core/loader/i386/efi/linux.c

  +++ b/grub-core/loader/i386/efi/linux.c

  @@ -191,7 +191,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From 5661d4a67e4b13da0dc375946f07a56bb577e0f4 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 11 Jul 2016 13:36:45 -0400

- Subject: [PATCH 162/198] fix machine type test in 30_os-prober.in

+ Subject: [PATCH 162/206] fix machine type test in 30_os-prober.in

  

  Signed-off-by: Peter Jones <pjones@redhat.com>

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 1 insertion(+)

  

  diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in

- index dc98eace9..e40274fc0 100644

+ index dc98eace9345..e40274fc0f42 100644

  --- a/util/grub.d/30_os-prober.in

  +++ b/util/grub.d/30_os-prober.in

  @@ -144,6 +144,7 @@ for OS in ${OSPROBED} ; do

@@ -1,7 +1,7 @@ 

  From a8b65c0ac1e2ddd001e8b837c798f1b135f2a522 Mon Sep 17 00:00:00 2001

  From: Laszlo Ersek <lersek@redhat.com>

  Date: Mon, 21 Nov 2016 15:34:00 +0100

- Subject: [PATCH 163/198] efi/chainloader: fix wrong sanity check in

+ Subject: [PATCH 163/206] efi/chainloader: fix wrong sanity check in

   relocate_coff()

  

  In relocate_coff(), the relocation entries are parsed from the original
@@ -22,7 +22,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c

- index b977c7b55..d5ab21d09 100644

+ index b977c7b5573c..d5ab21d09c35 100644

  --- a/grub-core/loader/efi/chainloader.c

  +++ b/grub-core/loader/efi/chainloader.c

  @@ -401,7 +401,7 @@ relocate_coff (pe_coff_loader_image_context_t *context,

@@ -1,7 +1,7 @@ 

  From a503341b2bb28a86d940305fb91e3c3827e15f0f Mon Sep 17 00:00:00 2001

  From: Laszlo Ersek <lersek@redhat.com>

  Date: Wed, 23 Nov 2016 06:27:09 +0100

- Subject: [PATCH 164/198] efi/chainloader: truncate overlong relocation section

+ Subject: [PATCH 164/206] efi/chainloader: truncate overlong relocation section

  

  The UEFI Windows 7 boot loader ("EFI/Microsoft/Boot/bootmgfw.efi", SHA1

  31b410e029bba87d2068c65a80b88882f9f8ea25) has inconsistent headers.
@@ -63,7 +63,7 @@ 

   1 file changed, 21 insertions(+), 5 deletions(-)

  

  diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c

- index d5ab21d09..7826e794a 100644

+ index d5ab21d09c35..7826e794ad9f 100644

  --- a/grub-core/loader/efi/chainloader.c

  +++ b/grub-core/loader/efi/chainloader.c

  @@ -596,7 +596,7 @@ handle_image (void *data, grub_efi_uint32_t datasize)

@@ -1,7 +1,7 @@ 

  From 2d1e45c97ab97cc924769095521664192e8196ed Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 14 Feb 2017 16:31:52 -0500

- Subject: [PATCH 165/198] linuxefi: minor cleanups

+ Subject: [PATCH 165/206] linuxefi: minor cleanups

  

  Signed-off-by: Peter Jones <pjones@redhat.com>

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 20 insertions(+), 10 deletions(-)

  

  diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c

- index 010bf982d..8b5a817b9 100644

+ index 010bf982d808..8b5a817b9d1a 100644

  --- a/grub-core/loader/i386/efi/linux.c

  +++ b/grub-core/loader/i386/efi/linux.c

  @@ -61,13 +61,18 @@ grub_linuxefi_unload (void)

@@ -1,7 +1,7 @@ 

  From 7f34f8d670e4dccf341de5acf388cfa79c7361fd Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 14 Feb 2017 16:18:54 -0500

- Subject: [PATCH 166/198] Handle multi-arch (64-on-32) boot in linuxefi loader.

+ Subject: [PATCH 166/206] Handle multi-arch (64-on-32) boot in linuxefi loader.

  

  Allow booting 64-bit kernels on 32-bit EFI on x86.

  
@@ -13,7 +13,7 @@ 

   3 files changed, 95 insertions(+), 35 deletions(-)

  

  diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c

- index 8890bdf05..2a7024134 100644

+ index 8890bdf059ae..2a7024134da3 100644

  --- a/grub-core/loader/efi/linux.c

  +++ b/grub-core/loader/efi/linux.c

  @@ -56,12 +56,17 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
@@ -37,7 +37,7 @@ 

   

     return GRUB_ERR_BUG;

  diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c

- index 8b5a817b9..bed5919ca 100644

+ index 8b5a817b9d1a..bed5919cab30 100644

  --- a/grub-core/loader/i386/efi/linux.c

  +++ b/grub-core/loader/i386/efi/linux.c

  @@ -44,14 +44,10 @@ static char *linux_cmdline;
@@ -256,7 +256,7 @@ 

     if (kernel_mem && !loaded)

       grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t)kernel_mem,

  diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h

- index fc36bdaf3..110ecf806 100644

+ index fc36bdaf3674..110ecf806fb5 100644

  --- a/include/grub/i386/linux.h

  +++ b/include/grub/i386/linux.h

  @@ -130,7 +130,12 @@ struct linux_kernel_header

@@ -1,7 +1,7 @@ 

  From 45a648d1dc7a63cbff180848ca6ab6e26365de11 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 30 May 2017 14:16:07 -0400

- Subject: [PATCH 167/198] Fix up linux params usage...

+ Subject: [PATCH 167/206] Fix up linux params usage...

  

  Signed-off-by: Peter Jones <pjones@redhat.com>

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 4 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c

- index e4b8342f5..c9e89310b 100644

+ index e4b8342f5d08..c9e89310bdd8 100644

  --- a/grub-core/loader/i386/linux.c

  +++ b/grub-core/loader/i386/linux.c

  @@ -680,6 +680,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From 71af399a49085b805028f1faadda16b503ce46a0 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 26 Feb 2014 21:49:12 -0500

- Subject: [PATCH 168/198] Make "exit" take a return code.

+ Subject: [PATCH 168/206] Make "exit" take a return code.

  

  This adds "exit" with a return code.  With this patch, any "exit"

  command /may/ include a return code, and on platforms that support
@@ -15,7 +15,7 @@ 

   2 files changed, 15 insertions(+)

  

  diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c

- index 55ea5a11c..7e47ec812 100644

+ index 55ea5a11ccd2..7e47ec812636 100644

  --- a/grub-core/kern/emu/main.c

  +++ b/grub-core/kern/emu/main.c

  @@ -72,6 +72,12 @@ grub_exit (int retval __attribute__((unused)))
@@ -32,7 +32,7 @@ 

   grub_machine_init (void)

   {

  diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c

- index 5ce89a40c..04371ac49 100644

+ index 5ce89a40c68e..04371ac49f2a 100644

  --- a/grub-core/kern/misc.c

  +++ b/grub-core/kern/misc.c

  @@ -1120,6 +1120,15 @@ grub_abort (void)

@@ -1,7 +1,7 @@ 

  From 6246598c06a27ca40a6101e39fb788d1a02976d7 Mon Sep 17 00:00:00 2001

  From: Mark Salter <msalter@redhat.com>

  Date: Mon, 17 Apr 2017 08:44:29 -0400

- Subject: [PATCH 169/198] arm64: make sure fdt has #address-cells and

+ Subject: [PATCH 169/206] arm64: make sure fdt has #address-cells and

   #size-cells properties

  

  Recent upstream changes to kexec-tools relies on #address-cells
@@ -14,7 +14,7 @@ 

   1 file changed, 15 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c

- index 34f34e65a..530c4ba2d 100644

+ index 34f34e65afd1..530c4ba2d5dc 100644

  --- a/grub-core/loader/arm64/linux.c

  +++ b/grub-core/loader/arm64/linux.c

  @@ -79,7 +79,21 @@ finalize_params_linux (void)

@@ -1,7 +1,7 @@ 

  From c293c4a99ef27e210014b4c87f0330df40571a4c Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 9 May 2016 14:15:17 -0400

- Subject: [PATCH 170/198] Add some grub_dprintf() in the secure boot verify

+ Subject: [PATCH 170/206] Add some grub_dprintf() in the secure boot verify

   code.

  

  Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -10,7 +10,7 @@ 

   1 file changed, 13 insertions(+), 3 deletions(-)

  

  diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c

- index 2a7024134..7fe7201a3 100644

+ index 2a7024134da3..7fe7201a3885 100644

  --- a/grub-core/loader/efi/linux.c

  +++ b/grub-core/loader/efi/linux.c

  @@ -43,12 +43,22 @@ grub_linuxefi_secure_validate (void *data, grub_uint32_t size)

@@ -1,7 +1,7 @@ 

  From 12e056f068df6a17ddee61959a3d5da409366a91 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Fri, 6 May 2016 18:43:08 -0400

- Subject: [PATCH 171/198] Make our info pages say "grub2" where appropriate.

+ Subject: [PATCH 171/206] Make our info pages say "grub2" where appropriate.

  

  This needs to be hooked up to --program-transform=, but I haven't had

  time.
@@ -13,7 +13,7 @@ 

   2 files changed, 161 insertions(+), 161 deletions(-)

  

  diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi

- index a9f4de631..3ce827ab7 100644

+ index a9f4de6318c6..3ce827ab7267 100644

  --- a/docs/grub-dev.texi

  +++ b/docs/grub-dev.texi

  @@ -1,7 +1,7 @@
@@ -35,7 +35,7 @@ 

   

   @setchapternewpage odd

  diff --git a/docs/grub.texi b/docs/grub.texi

- index 15a90b26e..f28c4cd52 100644

+ index 15a90b26e4d6..f28c4cd5247d 100644

  --- a/docs/grub.texi

  +++ b/docs/grub.texi

  @@ -1,7 +1,7 @@

@@ -1,7 +1,7 @@ 

  From 10d3df4413dde0edf41ba1adeba50ef62577d967 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 1 May 2017 11:19:40 -0400

- Subject: [PATCH 172/198] print more debug info in our module loader.

+ Subject: [PATCH 172/206] print more debug info in our module loader.

  

  Signed-off-by: Peter Jones <pjones@redhat.com>

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 13 insertions(+), 3 deletions(-)

  

  diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c

- index 684ca93f8..1f3ac5e1d 100644

+ index 684ca93f8f41..1f3ac5e1d082 100644

  --- a/grub-core/kern/efi/efi.c

  +++ b/grub-core/kern/efi/efi.c

  @@ -304,13 +304,23 @@ grub_efi_modules_addr (void)

@@ -1,7 +1,7 @@ 

  From f92f6c050e5c1bfc3146dd674dc37ac12cbb1c76 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 24 May 2017 12:42:32 -0400

- Subject: [PATCH 173/198] macos: just build chainloader entries, don't try any

+ Subject: [PATCH 173/206] macos: just build chainloader entries, don't try any

   xnu xnu.

  

  Since our bugs tell us that the xnu boot entries really just don't work
@@ -21,7 +21,7 @@ 

   1 file changed, 18 insertions(+), 60 deletions(-)

  

  diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in

- index e40274fc0..d979de198 100644

+ index e40274fc0f42..d979de1982a4 100644

  --- a/util/grub.d/30_os-prober.in

  +++ b/util/grub.d/30_os-prober.in

  @@ -42,68 +42,25 @@ if [ -z "${OSPROBED}" ] ; then

@@ -1,7 +1,7 @@ 

  From 1a7e8fd6eaff05a32889e48e9fae6f9c80219a04 Mon Sep 17 00:00:00 2001

  From: Jeff Mahoney <jeffm@suse.com>

  Date: Wed, 18 Dec 2013 09:57:04 +0000

- Subject: [PATCH 174/198] grub2/btrfs: Add ability to boot from subvolumes

+ Subject: [PATCH 174/206] grub2/btrfs: Add ability to boot from subvolumes

  

  This patch adds the ability to specify a different root on a btrfs

  filesystem too boot from other than the default one.
@@ -24,7 +24,7 @@ 

   2 files changed, 531 insertions(+), 18 deletions(-)

  

  diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c

- index 4849c1ceb..38facf3cb 100644

+ index 4849c1ceb653..38facf3cb8b8 100644

  --- a/grub-core/fs/btrfs.c

  +++ b/grub-core/fs/btrfs.c

  @@ -29,6 +29,9 @@
@@ -685,7 +685,7 @@ 

  +

  +// vim: si et sw=2:

  diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h

- index 9d93fb6c1..234ad9767 100644

+ index 9d93fb6c1826..234ad9767714 100644

  --- a/include/grub/btrfs.h

  +++ b/include/grub/btrfs.h

  @@ -29,6 +29,7 @@ enum

@@ -1,7 +1,7 @@ 

  From e32ed89b520f2cbe6303ba78242cb1c645ab8cb6 Mon Sep 17 00:00:00 2001

  From: Michael Chang <mchang@suse.com>

  Date: Wed, 18 Dec 2013 09:57:04 +0000

- Subject: [PATCH 175/198] export btrfs_subvol and btrfs_subvolid

+ Subject: [PATCH 175/206] export btrfs_subvol and btrfs_subvolid

  

  We should export btrfs_subvol and btrfs_subvolid to have both visible

  to subsidiary configuration files loaded using configfile.
@@ -12,7 +12,7 @@ 

   1 file changed, 2 insertions(+)

  

  diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c

- index 38facf3cb..396296166 100644

+ index 38facf3cb8b8..3962961666ed 100644

  --- a/grub-core/fs/btrfs.c

  +++ b/grub-core/fs/btrfs.c

  @@ -2273,6 +2273,8 @@ GRUB_MOD_INIT (btrfs)

@@ -1,14 +1,14 @@ 

  From 6c59dbc93e8757b6b79d93e3e3cd97a506778682 Mon Sep 17 00:00:00 2001

  From: Michael Chang <mchang@suse.com>

  Date: Thu, 21 Aug 2014 03:39:11 +0000

- Subject: [PATCH 176/198] grub2-btrfs-03-follow_default

+ Subject: [PATCH 176/206] grub2-btrfs-03-follow_default

  

  ---

   grub-core/fs/btrfs.c | 107 ++++++++++++++++++++++++++++++++++++---------------

   1 file changed, 76 insertions(+), 31 deletions(-)

  

  diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c

- index 396296166..2c462584e 100644

+ index 3962961666ed..2c462584e91b 100644

  --- a/grub-core/fs/btrfs.c

  +++ b/grub-core/fs/btrfs.c

  @@ -920,6 +920,7 @@ grub_btrfs_mount (grub_device_t dev)

@@ -1,7 +1,7 @@ 

  From fab60e6bf20b1759145eab3056846dfba3610a62 Mon Sep 17 00:00:00 2001

  From: Michael Chang <mchang@suse.com>

  Date: Thu, 21 Aug 2014 03:39:11 +0000

- Subject: [PATCH 177/198] grub2-btrfs-04-grub2-install

+ Subject: [PATCH 177/206] grub2-btrfs-04-grub2-install

  

  ---

   grub-core/osdep/linux/getroot.c |  7 +++++++
@@ -13,7 +13,7 @@ 

   6 files changed, 54 insertions(+), 2 deletions(-)

  

  diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c

- index 6d9f4e5fa..5d50dd6f8 100644

+ index 6d9f4e5faa24..5d50dd6f8dcc 100644

  --- a/grub-core/osdep/linux/getroot.c

  +++ b/grub-core/osdep/linux/getroot.c

  @@ -376,6 +376,7 @@ get_btrfs_fs_prefix (const char *mount_path)
@@ -38,7 +38,7 @@ 

         else if (!retry && grub_strcmp (entries[i].fstype, "autofs") == 0)

   	{

  diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c

- index 65effa9f3..b637c58ef 100644

+ index 65effa9f3a70..b637c58efb75 100644

  --- a/grub-core/osdep/unix/config.c

  +++ b/grub-core/osdep/unix/config.c

  @@ -82,6 +82,19 @@ grub_util_load_config (struct grub_util_config *cfg)
@@ -73,7 +73,7 @@ 

     argv[2] = script;

     argv[3] = '\0';

  diff --git a/include/grub/emu/config.h b/include/grub/emu/config.h

- index 875d5896c..c9a7e5f4a 100644

+ index 875d5896ce1e..c9a7e5f4ade7 100644

  --- a/include/grub/emu/config.h

  +++ b/include/grub/emu/config.h

  @@ -37,6 +37,7 @@ struct grub_util_config
@@ -85,7 +85,7 @@ 

   

   void

  diff --git a/util/config.c b/util/config.c

- index ebcdd8f5e..f044a880a 100644

+ index ebcdd8f5e229..f044a880a76d 100644

  --- a/util/config.c

  +++ b/util/config.c

  @@ -42,6 +42,16 @@ grub_util_parse_config (FILE *f, struct grub_util_config *cfg, int simple)
@@ -106,7 +106,7 @@ 

   			sizeof ("GRUB_DISTRIBUTOR=") - 1) == 0)

   	{

  diff --git a/util/grub-install.c b/util/grub-install.c

- index 75e3e5ba6..036fe1822 100644

+ index 75e3e5ba6f07..036fe1822e00 100644

  --- a/util/grub-install.c

  +++ b/util/grub-install.c

  @@ -816,6 +816,8 @@ fill_core_services (const char *core_services)
@@ -146,7 +146,7 @@ 

     char *install_drive = NULL;

   

  diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c

- index 47a241a39..5db7a9a7d 100644

+ index 47a241a391b2..5db7a9a7d97d 100644

  --- a/util/grub-mkrelpath.c

  +++ b/util/grub-mkrelpath.c

  @@ -40,9 +40,12 @@ struct arguments

@@ -1,7 +1,7 @@ 

  From 54f7769a22e9f82a9c894746e61d86f33d226218 Mon Sep 17 00:00:00 2001

  From: Michael Chang <mchang@suse.com>

  Date: Thu, 21 Aug 2014 03:39:11 +0000

- Subject: [PATCH 178/198] grub2-btrfs-05-grub2-mkconfig

+ Subject: [PATCH 178/206] grub2-btrfs-05-grub2-mkconfig

  

  ---

   util/grub-mkconfig.in       |  3 ++-
@@ -12,7 +12,7 @@ 

   5 files changed, 37 insertions(+), 2 deletions(-)

  

  diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in

- index e32de5ef3..3b0bfe403 100644

+ index e32de5ef361f..3b0bfe403087 100644

  --- a/util/grub-mkconfig.in

  +++ b/util/grub-mkconfig.in

  @@ -239,7 +239,8 @@ export GRUB_DEFAULT \
@@ -26,7 +26,7 @@ 

   if test "x${grub_cfg}" != "x"; then

     rm -f "${grub_cfg}.new"

  diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in

- index 9c410eae4..2fb4f4f81 100644

+ index 9c410eae4936..2fb4f4f81438 100644

  --- a/util/grub-mkconfig_lib.in

  +++ b/util/grub-mkconfig_lib.in

  @@ -52,7 +52,11 @@ grub_warn ()
@@ -42,7 +42,7 @@ 

   

   is_path_readable_by_grub ()

  diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in

- index 858b526c9..e2a533001 100644

+ index 858b526c925f..e2a533001268 100644

  --- a/util/grub.d/00_header.in

  +++ b/util/grub.d/00_header.in

  @@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@"
@@ -88,7 +88,7 @@ 

  +EOF

  +fi

  diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

- index c9bf223f2..7e78ad336 100644

+ index c9bf223f2737..7e78ad336369 100644

  --- a/util/grub.d/10_linux.in

  +++ b/util/grub.d/10_linux.in

  @@ -56,10 +56,14 @@ fi
@@ -107,7 +107,7 @@ 

       xzfs)

   	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`

  diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in

- index 54f1ec8a2..462f8e1f8 100644

+ index 54f1ec8a2fd1..462f8e1f819d 100644

  --- a/util/grub.d/20_linux_xen.in

  +++ b/util/grub.d/20_linux_xen.in

  @@ -63,10 +63,14 @@ fi

@@ -1,7 +1,7 @@ 

  From a27ef49601c7c4c58dc23663df1e0c1c960481af Mon Sep 17 00:00:00 2001

  From: Michael Chang <mchang@suse.com>

  Date: Fri, 22 May 2015 11:45:25 +0000

- Subject: [PATCH 179/198] grub2-btrfs-06-subvol-mount

+ Subject: [PATCH 179/206] grub2-btrfs-06-subvol-mount

  

  ---

   grub-core/fs/btrfs.c            | 195 +++++++++++++++++++++++++++++++++++++++-
@@ -11,7 +11,7 @@ 

   4 files changed, 392 insertions(+), 5 deletions(-)

  

  diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c

- index 2c462584e..d111147e8 100644

+ index 2c462584e91b..d111147e836b 100644

  --- a/grub-core/fs/btrfs.c

  +++ b/grub-core/fs/btrfs.c

  @@ -32,6 +32,7 @@
@@ -277,7 +277,7 @@ 

   					 grub_cmd_btrfs_list_subvols, 0,

   					 "[-p|-n] [-o var] DEVICE",

  diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c

- index 5d50dd6f8..4c5a13022 100644

+ index 5d50dd6f8dcc..4c5a13022dc7 100644

  --- a/grub-core/osdep/linux/getroot.c

  +++ b/grub-core/osdep/linux/getroot.c

  @@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key
@@ -460,7 +460,7 @@ 

   grub_make_system_path_relative_to_its_root_os (const char *path)

   {

  diff --git a/include/grub/emu/getroot.h b/include/grub/emu/getroot.h

- index 73fa2d34a..9c642ae3f 100644

+ index 73fa2d34abb6..9c642ae3fe38 100644

  --- a/include/grub/emu/getroot.h

  +++ b/include/grub/emu/getroot.h

  @@ -53,6 +53,11 @@ char **
@@ -476,7 +476,7 @@ 

   void

   grub_util_pull_devmapper (const char *os_dev);

  diff --git a/util/grub-install.c b/util/grub-install.c

- index 036fe1822..cd84a72b9 100644

+ index 036fe1822e00..cd84a72b97b9 100644

  --- a/util/grub-install.c

  +++ b/util/grub-install.c

  @@ -1534,6 +1534,55 @@ main (int argc, char *argv[])

@@ -1,7 +1,7 @@ 

  From 24ffe7f751ba5ca1fcaef235f104c385091af25f Mon Sep 17 00:00:00 2001

  From: Dusty Mabe <dusty@dustymabe.com>

  Date: Sat, 18 Jul 2015 15:38:08 +0000

- Subject: [PATCH 180/198] No more "Bootable Snapshot" submenu in grub.cfg.

+ Subject: [PATCH 180/206] No more "Bootable Snapshot" submenu in grub.cfg.

  

  This breaks grubby (run on kernel upgrades) because grubby just

  does a search for "menuentry".
@@ -10,7 +10,7 @@ 

   1 file changed, 12 deletions(-)

  

  diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in

- index e2a533001..8a16fea34 100644

+ index e2a533001268..8a16fea347ea 100644

  --- a/util/grub.d/00_header.in

  +++ b/util/grub.d/00_header.in

  @@ -366,15 +366,3 @@ fi

@@ -1,7 +1,7 @@ 

  From 7cfb7a4b2d8c90ef6aa17c32b059eb2c5ed45b3d Mon Sep 17 00:00:00 2001

  From: Andrei Borzenkov <arvidjaar@gmail.com>

  Date: Tue, 21 Jun 2016 16:44:17 +0000

- Subject: [PATCH 181/198] Fallback to old subvol name scheme to support old

+ Subject: [PATCH 181/206] Fallback to old subvol name scheme to support old

   snapshot config

  

  Ref: bsc#953538
@@ -10,7 +10,7 @@ 

   1 file changed, 31 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c

- index d111147e8..a5c000805 100644

+ index d111147e836b..a5c000805a7c 100644

  --- a/grub-core/fs/btrfs.c

  +++ b/grub-core/fs/btrfs.c

  @@ -924,11 +924,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)

@@ -1,7 +1,7 @@ 

  From c7fb2b491daae42caa1395d724b956f6f2f892af Mon Sep 17 00:00:00 2001

  From: Michael Chang <mchang@suse.com>

  Date: Thu, 11 May 2017 08:56:57 +0000

- Subject: [PATCH 182/198] Grub not working correctly with btrfs snapshots

+ Subject: [PATCH 182/206] Grub not working correctly with btrfs snapshots

   (bsc#1026511)

  

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 238 insertions(+)

  

  diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c

- index a5c000805..3cd947219 100644

+ index a5c000805a7c..3cd9472197c7 100644

  --- a/grub-core/fs/btrfs.c

  +++ b/grub-core/fs/btrfs.c

  @@ -2446,6 +2446,238 @@ out:

@@ -1,7 +1,7 @@ 

  From ac370b7bd9060c8e2aaaf91c2099ca89b8b65f14 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 1 Jun 2017 09:59:56 -0400

- Subject: [PATCH 183/198] Add grub_efi_allocate_pool() and grub_efi_free_pool()

+ Subject: [PATCH 183/206] Add grub_efi_allocate_pool() and grub_efi_free_pool()

   wrappers.

  

  Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -10,7 +10,7 @@ 

   1 file changed, 32 insertions(+), 4 deletions(-)

  

  diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h

- index 91e29ce66..68326d96f 100644

+ index 91e29ce66f1b..68326d96f5aa 100644

  --- a/include/grub/efi/efi.h

  +++ b/include/grub/efi/efi.h

  @@ -24,6 +24,10 @@

@@ -1,7 +1,7 @@ 

  From 81550ebac8fea549c1bbc149688be17ce195bc08 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 1 Jun 2017 10:06:38 -0400

- Subject: [PATCH 184/198] Use grub_efi_...() memory helpers where reasonable.

+ Subject: [PATCH 184/206] Use grub_efi_...() memory helpers where reasonable.

  

  This uses grub_efi_allocate_pool(), grub_efi_free_pool(), and

  grub_efi_free_pages() instead of open-coded efi_call_N() calls, so we
@@ -13,7 +13,7 @@ 

   1 file changed, 9 insertions(+), 15 deletions(-)

  

  diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c

- index 7826e794a..d2557b38d 100644

+ index 7826e794ad9f..d2557b38dced 100644

  --- a/grub-core/loader/efi/chainloader.c

  +++ b/grub-core/loader/efi/chainloader.c

  @@ -65,7 +65,7 @@ grub_chainloader_unload (void)

@@ -1,7 +1,7 @@ 

  From ab3ef81acf4ee5cdf7a1e21db794cdb2e71c49a5 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 1 Jun 2017 10:07:50 -0400

- Subject: [PATCH 185/198] Add PRIxGRUB_EFI_STATUS and use it.

+ Subject: [PATCH 185/206] Add PRIxGRUB_EFI_STATUS and use it.

  

  This avoids syntax checkers getting confused about if it's llx or lx.

  
@@ -12,7 +12,7 @@ 

   2 files changed, 10 insertions(+), 1 deletion(-)

  

  diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c

- index d2557b38d..2c62faa29 100644

+ index d2557b38dced..2c62faa2943c 100644

  --- a/grub-core/loader/efi/chainloader.c

  +++ b/grub-core/loader/efi/chainloader.c

  @@ -783,7 +783,8 @@ handle_image (void *data, grub_efi_uint32_t datasize)
@@ -26,7 +26,7 @@ 

     efi_status = grub_efi_free_pool (buffer);

   

  diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h

- index 02488ec35..ddc5ecfb0 100644

+ index 02488ec35ae8..ddc5ecfb03d7 100644

  --- a/include/grub/efi/api.h

  +++ b/include/grub/efi/api.h

  @@ -527,6 +527,14 @@ typedef grub_uint8_t grub_efi_char8_t;

@@ -1,7 +1,7 @@ 

  From 8bda2ce6ce3a91a0d84b0489679522add72780ef Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 26 Jun 2017 12:42:57 -0400

- Subject: [PATCH 186/198] Don't use dynamic sized arrays since we don't build

+ Subject: [PATCH 186/206] Don't use dynamic sized arrays since we don't build

   with -std=c99

  

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 14 insertions(+), 3 deletions(-)

  

  diff --git a/grub-core/net/net.c b/grub-core/net/net.c

- index 4be228d95..fa3e29126 100644

+ index 4be228d95766..fa3e29126433 100644

  --- a/grub-core/net/net.c

  +++ b/grub-core/net/net.c

  @@ -1853,14 +1853,25 @@ grub_net_search_configfile (char *config)

@@ -1,14 +1,14 @@ 

  From 47309830cd0c84bbb565004bd06d5aef3c9c0f57 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 26 Jun 2017 12:43:22 -0400

- Subject: [PATCH 187/198] don't ignore const

+ Subject: [PATCH 187/206] don't ignore const

  

  ---

   grub-core/net/tftp.c | 2 +-

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c

- index dcd824943..f90071353 100644

+ index dcd824943093..f90071353ad1 100644

  --- a/grub-core/net/tftp.c

  +++ b/grub-core/net/tftp.c

  @@ -307,7 +307,7 @@ static void

@@ -1,14 +1,14 @@ 

  From 1e16b840df6b6d1cfb3429fbac8440b507ff07a6 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 26 Jun 2017 12:44:59 -0400

- Subject: [PATCH 188/198] don't use int for efi status

+ Subject: [PATCH 188/206] don't use int for efi status

  

  ---

   grub-core/kern/efi/efi.c | 2 +-

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c

- index 1f3ac5e1d..2b60a6e27 100644

+ index 1f3ac5e1d082..2b60a6e27ea5 100644

  --- a/grub-core/kern/efi/efi.c

  +++ b/grub-core/kern/efi/efi.c

  @@ -157,7 +157,7 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)

@@ -1,14 +1,14 @@ 

  From 9e5389a4074b38ef9d27177b40092fca515b2d2b Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Mon, 26 Jun 2017 12:46:23 -0400

- Subject: [PATCH 189/198] make GRUB_MOD_INIT() declare its function prototypes.

+ Subject: [PATCH 189/206] make GRUB_MOD_INIT() declare its function prototypes.

  

  ---

   include/grub/dl.h | 2 ++

   1 file changed, 2 insertions(+)

  

  diff --git a/include/grub/dl.h b/include/grub/dl.h

- index 2bca56ce0..b1ed3c333 100644

+ index 2bca56ce0e89..b1ed3c333172 100644

  --- a/include/grub/dl.h

  +++ b/include/grub/dl.h

  @@ -54,6 +54,7 @@ grub_mod_fini (void)

@@ -1,7 +1,7 @@ 

  From 1351ba7ec388e9449b209c76fad61e6b9792044e Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 24 May 2017 15:58:18 -0400

- Subject: [PATCH 190/198] Clean up some errors in the linuxefi loader

+ Subject: [PATCH 190/206] Clean up some errors in the linuxefi loader

  

  Signed-off-by: Peter Jones <pjones@redhat.com>

  ---
@@ -9,7 +9,7 @@ 

   1 file changed, 8 insertions(+), 8 deletions(-)

  

  diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c

- index bed5919ca..6db5d0bf3 100644

+ index bed5919cab30..6db5d0bf3a04 100644

  --- a/grub-core/loader/i386/efi/linux.c

  +++ b/grub-core/loader/i386/efi/linux.c

  @@ -161,8 +161,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),

@@ -1,7 +1,7 @@ 

  From 9141af91bed0d27afa0f87ed6ac5965bed6f791a Mon Sep 17 00:00:00 2001

  From: Jonathan Lebon <jlebon@redhat.com>

  Date: Mon, 14 Aug 2017 14:37:20 -0400

- Subject: [PATCH 191/198] editenv: handle relative symlinks

+ Subject: [PATCH 191/206] editenv: handle relative symlinks

  

  Handle symlinks with targets relative to the containing dir. This

  ensures that the rename operation does not depend on the cwd.
@@ -14,7 +14,7 @@ 

   1 file changed, 14 insertions(+), 2 deletions(-)

  

  diff --git a/util/editenv.c b/util/editenv.c

- index d8d1dad6a..41bc7cb1c 100644

+ index d8d1dad6ab95..41bc7cb1c9a1 100644

  --- a/util/editenv.c

  +++ b/util/editenv.c

  @@ -28,6 +28,7 @@

@@ -1,7 +1,7 @@ 

  From 210eb8d06d2b1db324ef0e158000c4590035fea3 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Wed, 23 Aug 2017 10:37:27 -0400

- Subject: [PATCH 192/198] Make libgrub.pp depend on config-util.h

+ Subject: [PATCH 192/206] Make libgrub.pp depend on config-util.h

  

  If you build with "make -j48" a lot, sometimes you see:

  
@@ -31,7 +31,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/Makefile.am b/Makefile.am

- index 7795baeb6..c7b0e6a9c 100644

+ index 7795baeb6549..c7b0e6a9c463 100644

  --- a/Makefile.am

  +++ b/Makefile.am

  @@ -37,7 +37,7 @@ grub_script.yy.c: grub_script.yy.h

@@ -1,7 +1,7 @@ 

  From d47f8b7d1d9bf708cfd989d20cc0fd87ba72c058 Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 20 Apr 2017 13:29:06 -0400

- Subject: [PATCH 193/198] Don't guess /boot/efi/ as HFS+ on ppc machines in

+ Subject: [PATCH 193/206] Don't guess /boot/efi/ as HFS+ on ppc machines in

   grub-install

  

  This should never be trying this, and since we've consolidated the
@@ -16,7 +16,7 @@ 

   1 file changed, 1 insertion(+), 11 deletions(-)

  

  diff --git a/util/grub-install.c b/util/grub-install.c

- index cd84a72b9..48f2abc3e 100644

+ index cd84a72b97b9..48f2abc3ea54 100644

  --- a/util/grub-install.c

  +++ b/util/grub-install.c

  @@ -1159,18 +1159,8 @@ main (int argc, char *argv[])

@@ -1,7 +1,7 @@ 

  From 40e6d913ad65d357a13205d3392f613ac52508c2 Mon Sep 17 00:00:00 2001

  From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

  Date: Mon, 28 Aug 2017 13:51:14 -0400

- Subject: [PATCH 194/198] Fix util/grub.d/20_linux_xen.in: Add xen_boot command

+ Subject: [PATCH 194/206] Fix util/grub.d/20_linux_xen.in: Add xen_boot command

   support for aarch64

  

  Commit d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe introduced
@@ -36,7 +36,7 @@ 

   1 file changed, 4 insertions(+), 5 deletions(-)

  

  diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in

- index 462f8e1f8..9b1bd7169 100644

+ index 462f8e1f819d..9b1bd7169650 100644

  --- a/util/grub.d/20_linux_xen.in

  +++ b/util/grub.d/20_linux_xen.in

  @@ -210,13 +210,12 @@ while [ "x${xen_list}" != "x" ] ; do

@@ -1,7 +1,7 @@ 

  From ac0fa764dfdd5e45ccda6f91c6e136e84e284c4a Mon Sep 17 00:00:00 2001

  From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

  Date: Mon, 28 Aug 2017 13:59:12 -0400

- Subject: [PATCH 195/198] Use grub-file to figure out whether multiboot2 should

+ Subject: [PATCH 195/206] Use grub-file to figure out whether multiboot2 should

   be used for Xen.gz

  

  The multiboot2 is much more preferable than multiboot. Especiall
@@ -14,7 +14,7 @@ 

   1 file changed, 4 insertions(+)

  

  diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in

- index 9b1bd7169..fae1ffe94 100644

+ index 9b1bd7169650..fae1ffe94942 100644

  --- a/util/grub.d/20_linux_xen.in

  +++ b/util/grub.d/20_linux_xen.in

  @@ -216,6 +216,10 @@ while [ "x${xen_list}" != "x" ] ; do

@@ -1,7 +1,7 @@ 

  From b0260d2f586390b19294f5b98194c9e78a33ccad Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Thu, 19 Oct 2017 11:29:11 -0400

- Subject: [PATCH 196/198] 20_linux_xen: load xen or multiboot{,2} modules as

+ Subject: [PATCH 196/206] 20_linux_xen: load xen or multiboot{,2} modules as

   needed.

  

  Signed-off-by: Peter Jones <pjones@redhat.com>
@@ -10,7 +10,7 @@ 

   1 file changed, 3 insertions(+)

  

  diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in

- index fae1ffe94..fc53bd542 100644

+ index fae1ffe94942..fc53bd54231e 100644

  --- a/util/grub.d/20_linux_xen.in

  +++ b/util/grub.d/20_linux_xen.in

  @@ -126,6 +126,8 @@ linux_entry ()

@@ -1,7 +1,7 @@ 

  From 5b1b2603175923e8d1eac701308d220ac39ad8c7 Mon Sep 17 00:00:00 2001

  From: "David E. Box" <david.e.box@linux.intel.com>

  Date: Fri, 15 Sep 2017 15:37:05 -0700

- Subject: [PATCH 197/198] tsc: Change default tsc calibration method to pmtimer

+ Subject: [PATCH 197/206] tsc: Change default tsc calibration method to pmtimer

   on EFI systems

  

  On efi systems, make pmtimer based tsc calibration the default over the
@@ -15,7 +15,7 @@ 

   1 file changed, 1 insertion(+), 1 deletion(-)

  

  diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c

- index 2e85289d8..f266eb131 100644

+ index 2e85289d8489..f266eb13185f 100644

  --- a/grub-core/kern/i386/tsc.c

  +++ b/grub-core/kern/i386/tsc.c

  @@ -68,7 +68,7 @@ grub_tsc_init (void)

@@ -1,7 +1,7 @@ 

  From 8df97294d653219ad03ac031c01b723ed7f6556d Mon Sep 17 00:00:00 2001

  From: Peter Jones <pjones@redhat.com>

  Date: Tue, 7 Nov 2017 17:12:17 -0500

- Subject: [PATCH 198/198] Make pmtimer tsc calibration not take 51 seconds to

+ Subject: [PATCH 198/206] Make pmtimer tsc calibration not take 51 seconds to

   fail.

  

  On my laptop running at 2.4GHz, if I run a VM where tsc calibration
@@ -24,7 +24,7 @@ 

   1 file changed, 33 insertions(+), 10 deletions(-)

  

  diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c

- index c9c361699..609402b83 100644

+ index c9c36169978f..609402b83766 100644

  --- a/grub-core/kern/i386/tsc_pmtimer.c

  +++ b/grub-core/kern/i386/tsc_pmtimer.c

  @@ -38,30 +38,53 @@ grub_pmtimer_wait_count_tsc (grub_port_t pmtimer,

@@ -0,0 +1,30 @@ 

+ From c541fed9825770f8a379c00423e7db0882447108 Mon Sep 17 00:00:00 2001

+ From: Peter Jones <pjones@redhat.com>

+ Date: Tue, 3 Jan 2017 17:39:25 -0500

+ Subject: [PATCH 199/206] Trivial fix for an error message in

+  get_header_from_pointer()

+ 

+ get_header_from_pointer() prints an error when a double-free happens,

+ but it doesn't have a newline.  It obviously should.

+ 

+ Signed-off-by: Peter Jones <pjones@redhat.com>

+ ---

+  grub-core/kern/mm.c | 2 +-

+  1 file changed, 1 insertion(+), 1 deletion(-)

+ 

+ diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c

+ index ee88ff61187a..9c73c12f1be7 100644

+ --- a/grub-core/kern/mm.c

+ +++ b/grub-core/kern/mm.c

+ @@ -99,7 +99,7 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r)

+  

+    *p = (grub_mm_header_t) ptr - 1;

+    if ((*p)->magic == GRUB_MM_FREE_MAGIC)

+ -    grub_fatal ("double free at %p", *p);

+ +    grub_fatal ("double free at %p\n", *p);

+    if ((*p)->magic != GRUB_MM_ALLOC_MAGIC)

+      grub_fatal ("alloc magic is broken at %p: %lx", *p,

+  		(unsigned long) (*p)->magic);

+ -- 

+ 2.14.3

+ 

@@ -0,0 +1,325 @@ 

+ From 10e48109f0565757de6bee390debef421bf46c0a Mon Sep 17 00:00:00 2001

+ From: Peter Jones <pjones@redhat.com>

+ Date: Fri, 9 Dec 2016 15:39:47 -0500

+ Subject: [PATCH 200/206] Add quicksort implementation

+ 

+ This will be used to sort the boot menu entries that are read from

+ the BootLoaderSpec config files.

+ ---

+  grub-core/kern/qsort.c | 279 +++++++++++++++++++++++++++++++++++++++++++++++++

+  include/grub/misc.h    |  15 +++

+  2 files changed, 294 insertions(+)

+  create mode 100644 grub-core/kern/qsort.c

+ 

+ diff --git a/grub-core/kern/qsort.c b/grub-core/kern/qsort.c

+ new file mode 100644

+ index 000000000000..7f3fc9ffdaea

+ --- /dev/null

+ +++ b/grub-core/kern/qsort.c

+ @@ -0,0 +1,279 @@

+ +/* quicksort

+ + * This file from the GNU C Library.

+ + * Copyright (C) 1991-2016 Free Software Foundation, Inc.

+ + * Written by Douglas C. Schmidt (schmidt@ics.uci.edu).

+ + *

+ + *  GRUB  --  GRand Unified Bootloader

+ + *

+ + *  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/>.

+ + */

+ +

+ +/* If you consider tuning this algorithm, you should consult first:

+ +   Engineering a sort function; Jon Bentley and M. Douglas McIlroy;

+ +   Software - Practice and Experience; Vol. 23 (11), 1249-1265, 1993.  */

+ +

+ +#include <grub/types.h>

+ +#include <grub/misc.h>

+ +#include <grub/mm.h>

+ +

+ +#define CHAR_BIT 8

+ +

+ +/* Byte-wise swap two items of size SIZE. */

+ +#define SWAP(a, b, size)						      \

+ +  do									      \

+ +    {									      \

+ +      grub_size_t __size = (size);						      \

+ +      char *__a = (a), *__b = (b);					      \

+ +      do								      \

+ +	{								      \

+ +	  char __tmp = *__a;						      \

+ +	  *__a++ = *__b;						      \

+ +	  *__b++ = __tmp;						      \

+ +	} while (--__size > 0);						      \

+ +    } while (0)

+ +

+ +/* Discontinue quicksort algorithm when partition gets below this size.

+ +   This particular magic number was chosen to work best on a Sun 4/260. */

+ +#define MAX_THRESH 4

+ +

+ +/* Stack node declarations used to store unfulfilled partition obligations. */

+ +typedef struct

+ +  {

+ +    char *lo;

+ +    char *hi;

+ +  } stack_node;

+ +

+ +/* The next 4 #defines implement a very fast in-line stack abstraction. */

+ +/* The stack needs log (total_elements) entries (we could even subtract

+ +   log(MAX_THRESH)).  Since total_elements has type grub_size_t, we get as

+ +   upper bound for log (total_elements):

+ +   bits per byte (CHAR_BIT) * sizeof(grub_size_t).  */

+ +#define STACK_SIZE	(CHAR_BIT * sizeof(grub_size_t))

+ +#define PUSH(low, high)	((void) ((top->lo = (low)), (top->hi = (high)), ++top))

+ +#define	POP(low, high)	((void) (--top, (low = top->lo), (high = top->hi)))

+ +#define	STACK_NOT_EMPTY	(stack < top)

+ +

+ +

+ +/* Order size using quicksort.  This implementation incorporates

+ +   four optimizations discussed in Sedgewick:

+ +

+ +   1. Non-recursive, using an explicit stack of pointer that store the

+ +      next array partition to sort.  To save time, this maximum amount

+ +      of space required to store an array of SIZE_MAX is allocated on the

+ +      stack.  Assuming a 32-bit (64 bit) integer for grub_size_t, this needs

+ +      only 32 * sizeof(stack_node) == 256 bytes (for 64 bit: 1024 bytes).

+ +      Pretty cheap, actually.

+ +

+ +   2. Chose the pivot element using a median-of-three decision tree.

+ +      This reduces the probability of selecting a bad pivot value and

+ +      eliminates certain extraneous comparisons.

+ +

+ +   3. Only quicksorts TOTAL_ELEMS / MAX_THRESH partitions, leaving

+ +      insertion sort to order the MAX_THRESH items within each partition.

+ +      This is a big win, since insertion sort is faster for small, mostly

+ +      sorted array segments.

+ +

+ +   4. The larger of the two sub-partitions is always pushed onto the

+ +      stack first, with the algorithm then concentrating on the

+ +      smaller partition.  This *guarantees* no more than log (total_elems)

+ +      stack size is needed (actually O(1) in this case)!  */

+ +

+ +void

+ +grub_qsort (void *const pbase, grub_size_t total_elems, grub_size_t size,

+ +	    grub_compar_d_fn_t cmp, void *arg)

+ +{

+ +  char *base_ptr = (char *) pbase;

+ +

+ +  const grub_size_t max_thresh = MAX_THRESH * size;

+ +

+ +  if (total_elems == 0)

+ +    /* Avoid lossage with unsigned arithmetic below.  */

+ +    return;

+ +

+ +  if (total_elems > MAX_THRESH)

+ +    {

+ +      char *lo = base_ptr;

+ +      char *hi = &lo[size * (total_elems - 1)];

+ +      stack_node stack[STACK_SIZE];

+ +      stack_node *top = stack;

+ +

+ +      PUSH (NULL, NULL);

+ +

+ +      while (STACK_NOT_EMPTY)

+ +        {

+ +          char *left_ptr;

+ +          char *right_ptr;

+ +

+ +	  /* Select median value from among LO, MID, and HI. Rearrange

+ +	     LO and HI so the three values are sorted. This lowers the

+ +	     probability of picking a pathological pivot value and

+ +	     skips a comparison for both the LEFT_PTR and RIGHT_PTR in

+ +	     the while loops. */

+ +

+ +	  char *mid = lo + size * ((hi - lo) / size >> 1);

+ +

+ +	  if ((*cmp) ((void *) mid, (void *) lo, arg) < 0)

+ +	    SWAP (mid, lo, size);

+ +	  if ((*cmp) ((void *) hi, (void *) mid, arg) < 0)

+ +	    SWAP (mid, hi, size);

+ +	  else

+ +	    goto jump_over;

+ +	  if ((*cmp) ((void *) mid, (void *) lo, arg) < 0)

+ +	    SWAP (mid, lo, size);

+ +	jump_over:;

+ +

+ +	  left_ptr  = lo + size;

+ +	  right_ptr = hi - size;

+ +

+ +	  /* Here's the famous ``collapse the walls'' section of quicksort.

+ +	     Gotta like those tight inner loops!  They are the main reason

+ +	     that this algorithm runs much faster than others. */

+ +	  do

+ +	    {

+ +	      while ((*cmp) ((void *) left_ptr, (void *) mid, arg) < 0)

+ +		left_ptr += size;

+ +

+ +	      while ((*cmp) ((void *) mid, (void *) right_ptr, arg) < 0)

+ +		right_ptr -= size;

+ +

+ +	      if (left_ptr < right_ptr)

+ +		{

+ +		  SWAP (left_ptr, right_ptr, size);

+ +		  if (mid == left_ptr)

+ +		    mid = right_ptr;

+ +		  else if (mid == right_ptr)

+ +		    mid = left_ptr;

+ +		  left_ptr += size;

+ +		  right_ptr -= size;

+ +		}

+ +	      else if (left_ptr == right_ptr)

+ +		{

+ +		  left_ptr += size;

+ +		  right_ptr -= size;

+ +		  break;

+ +		}

+ +	    }

+ +	  while (left_ptr <= right_ptr);

+ +

+ +          /* Set up pointers for next iteration.  First determine whether

+ +             left and right partitions are below the threshold size.  If so,

+ +             ignore one or both.  Otherwise, push the larger partition's

+ +             bounds on the stack and continue sorting the smaller one. */

+ +

+ +          if ((grub_size_t) (right_ptr - lo) <= max_thresh)

+ +            {

+ +              if ((grub_size_t) (hi - left_ptr) <= max_thresh)

+ +		/* Ignore both small partitions. */

+ +                POP (lo, hi);

+ +              else

+ +		/* Ignore small left partition. */

+ +                lo = left_ptr;

+ +            }

+ +          else if ((grub_size_t) (hi - left_ptr) <= max_thresh)

+ +	    /* Ignore small right partition. */

+ +            hi = right_ptr;

+ +          else if ((right_ptr - lo) > (hi - left_ptr))

+ +            {

+ +	      /* Push larger left partition indices. */

+ +              PUSH (lo, right_ptr);

+ +              lo = left_ptr;

+ +            }

+ +          else

+ +            {

+ +	      /* Push larger right partition indices. */

+ +              PUSH (left_ptr, hi);

+ +              hi = right_ptr;

+ +            }

+ +        }

+ +    }

+ +

+ +  /* Once the BASE_PTR array is partially sorted by quicksort the rest

+ +     is completely sorted using insertion sort, since this is efficient

+ +     for partitions below MAX_THRESH size. BASE_PTR points to the beginning

+ +     of the array to sort, and END_PTR points at the very last element in

+ +     the array (*not* one beyond it!). */

+ +

+ +#define min(x, y) ((x) < (y) ? (x) : (y))

+ +

+ +  {

+ +    char *const end_ptr = &base_ptr[size * (total_elems - 1)];

+ +    char *tmp_ptr = base_ptr;

+ +    char *thresh = min(end_ptr, base_ptr + max_thresh);

+ +    char *run_ptr;

+ +

+ +    /* Find smallest element in first threshold and place it at the

+ +       array's beginning.  This is the smallest array element,

+ +       and the operation speeds up insertion sort's inner loop. */

+ +

+ +    for (run_ptr = tmp_ptr + size; run_ptr <= thresh; run_ptr += size)

+ +      if ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, arg) < 0)

+ +        tmp_ptr = run_ptr;

+ +

+ +    if (tmp_ptr != base_ptr)

+ +      SWAP (tmp_ptr, base_ptr, size);

+ +

+ +    /* Insertion sort, running from left-hand-side up to right-hand-side.  */

+ +

+ +    run_ptr = base_ptr + size;

+ +    while ((run_ptr += size) <= end_ptr)

+ +      {

+ +	tmp_ptr = run_ptr - size;

+ +	while ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, arg) < 0)

+ +	  tmp_ptr -= size;

+ +

+ +	tmp_ptr += size;

+ +        if (tmp_ptr != run_ptr)

+ +          {

+ +            char *trav;

+ +

+ +	    trav = run_ptr + size;

+ +	    while (--trav >= run_ptr)

+ +              {

+ +                char c = *trav;

+ +                char *hi, *lo;

+ +

+ +                for (hi = lo = trav; (lo -= size) >= tmp_ptr; hi = lo)

+ +                  *hi = *lo;

+ +                *hi = c;

+ +              }

+ +          }

+ +      }

+ +  }

+ +}

+ +

+ +void *

+ +grub_bsearch (const void *key, const void *base, grub_size_t nmemb, grub_size_t size,

+ +	 grub_compar_d_fn_t compar, void *state)

+ +{

+ +  grub_size_t l, u, idx;

+ +  const void *p;

+ +  int comparison;

+ +

+ +  l = 0;

+ +  u = nmemb;

+ +  while (l < u)

+ +    {

+ +      idx = (l + u) / 2;

+ +      p = (void *) (((const char *) base) + (idx * size));

+ +      comparison = (*compar) (key, p, state);

+ +      if (comparison < 0)

+ +	u = idx;

+ +      else if (comparison > 0)

+ +	l = idx + 1;

+ +      else

+ +	return (void *) p;

+ +    }

+ +

+ +  return NULL;

+ +}

+ diff --git a/include/grub/misc.h b/include/grub/misc.h

+ index 4737da1eaa95..3d55bafd64e3 100644

+ --- a/include/grub/misc.h

+ +++ b/include/grub/misc.h

+ @@ -506,4 +506,19 @@ void EXPORT_FUNC(grub_real_boot_time) (const char *file,

+  #define grub_max(a, b) (((a) > (b)) ? (a) : (b))

+  #define grub_min(a, b) (((a) < (b)) ? (a) : (b))

+  

+ +typedef int (*grub_compar_d_fn_t) (const void *p0, const void *p1, void *state);

+ +

+ +void *EXPORT_FUNC(grub_bsearch) (const void *key,

+ +			    const void *base,

+ +			    grub_size_t nmemb,

+ +			    grub_size_t size,

+ +			    grub_compar_d_fn_t compar,

+ +			    void *state);

+ +

+ +void EXPORT_FUNC(grub_qsort) (void *const pbase,

+ +			 grub_size_t total_elems,

+ +			 grub_size_t size,

+ +			 grub_compar_d_fn_t cmp,

+ +			 void *state);

+ +

+  #endif /* ! GRUB_MISC_HEADER */

+ -- 

+ 2.14.3

+ 

@@ -0,0 +1,169 @@ 

+ From 0a1829ae74610e0fd75a3da4866f164e1d934043 Mon Sep 17 00:00:00 2001

+ From: Peter Jones <pjones@redhat.com>

+ Date: Fri, 9 Dec 2016 15:40:29 -0500

+ Subject: [PATCH 202/206] Add BLS support to grub-mkconfig

+ 

+ GRUB now has BootLoaderSpec support, the user can choose to use this by

+ setting GRUB_ENABLE_BLSCFG to true in /etc/default/grub. On this setup,

+ the boot menu entries are not added to the grub.cfg, instead BLS config

+ files are parsed by blscfg command and the entries created dynamically.

+ ---

+  util/grub-mkconfig.in     |  3 ++-

+  util/grub-mkconfig_lib.in | 29 +++++++++++++++++++----------

+  util/grub.d/10_linux.in   | 36 ++++++++++++++++++++++++++++++++++--

+  3 files changed, 55 insertions(+), 13 deletions(-)

+ 

+ diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in

+ index 3b0bfe403087..760fe08727f9 100644

+ --- a/util/grub-mkconfig.in

+ +++ b/util/grub-mkconfig.in

+ @@ -240,7 +240,8 @@ export GRUB_DEFAULT \

+    GRUB_OS_PROBER_SKIP_LIST \

+    GRUB_DISABLE_SUBMENU \

+    GRUB_DEFAULT_DTB \

+ -  SUSE_BTRFS_SNAPSHOT_BOOTING

+ +  SUSE_BTRFS_SNAPSHOT_BOOTING \

+ +  GRUB_ENABLE_BLSCFG

+  

+  if test "x${grub_cfg}" != "x"; then

+    rm -f "${grub_cfg}.new"

+ diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in

+ index 2fb4f4f81438..70dc8d57e921 100644

+ --- a/util/grub-mkconfig_lib.in

+ +++ b/util/grub-mkconfig_lib.in

+ @@ -30,6 +30,9 @@ fi

+  if test "x$grub_file" = x; then

+    grub_file="${bindir}/@grub_file@"

+  fi

+ +if test "x$grub_editenv" = x; then

+ +  grub_editenv="${bindir}/@grub_editenv@"

+ +fi

+  if test "x$grub_mkrelpath" = x; then

+    grub_mkrelpath="${bindir}/@grub_mkrelpath@"

+  fi

+ @@ -127,10 +130,16 @@ EOF

+  

+  prepare_grub_to_access_device ()

+  {

+ +  local device=$1 && shift

+ +  if [ "$#" -gt 0 ]; then

+ +    local variable=$1 && shift

+ +  else

+ +    local variable=root

+ +  fi

+    old_ifs="$IFS"

+    IFS='

+  '

+ -  partmap="`"${grub_probe}" --device $@ --target=partmap`"

+ +  partmap="`"${grub_probe}" --device ${device} --target=partmap`"

+    for module in ${partmap} ; do

+      case "${module}" in

+        netbsd | openbsd)

+ @@ -141,34 +150,34 @@ prepare_grub_to_access_device ()

+    done

+  

+    # Abstraction modules aren't auto-loaded.

+ -  abstraction="`"${grub_probe}" --device $@ --target=abstraction`"

+ +  abstraction="`"${grub_probe}" --device ${device} --target=abstraction`"

+    for module in ${abstraction} ; do

+      echo "insmod ${module}"

+    done

+  

+ -  fs="`"${grub_probe}" --device $@ --target=fs`"

+ +  fs="`"${grub_probe}" --device ${device} --target=fs`"

+    for module in ${fs} ; do

+      echo "insmod ${module}"

+    done

+  

+    if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then

+ -      for uuid in `"${grub_probe}" --device $@ --target=cryptodisk_uuid`; do

+ +      for uuid in `"${grub_probe}" --device ${device} --target=cryptodisk_uuid`; do

+  	  echo "cryptomount -u $uuid"

+        done

+    fi

+  

+    # If there's a filesystem UUID that GRUB is capable of identifying, use it;

+    # otherwise set root as per value in device.map.

+ -  fs_hint="`"${grub_probe}" --device $@ --target=compatibility_hint`"

+ +  fs_hint="`"${grub_probe}" --device ${device} --target=compatibility_hint`"

+    if [ "x$fs_hint" != x ]; then

+ -    echo "set root='$fs_hint'"

+ +    echo "set ${variable}='$fs_hint'"

+    fi

+ -  if [ "x$GRUB_DISABLE_UUID" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then

+ -    hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints=

+ +  if [ "x$GRUB_DISABLE_UUID" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device ${device} --target=fs_uuid 2> /dev/null`" ; then

+ +    hints="`"${grub_probe}" --device ${device} --target=hints_string 2> /dev/null`" || hints=

+      echo "if [ x\$feature_platform_search_hint = xy ]; then"

+ -    echo "  search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"

+ +    echo "  search --no-floppy --fs-uuid --set=${variable} ${hints} ${fs_uuid}"

+      echo "else"

+ -    echo "  search --no-floppy --fs-uuid --set=root ${fs_uuid}"

+ +    echo "  search --no-floppy --fs-uuid --set=${variable} ${fs_uuid}"

+      echo "fi"

+    fi

+    IFS="$old_ifs"

+ diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in

+ index 7e78ad336369..68f631772c31 100644

+ --- a/util/grub.d/10_linux.in

+ +++ b/util/grub.d/10_linux.in

+ @@ -126,6 +126,33 @@ linux_entry ()

+    if [ -z "$boot_device_id" ]; then

+        boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"

+    fi

+ +

+ +  if [ "x${GRUB_ENABLE_BLSCFG}" = "xtrue" ]; then

+ +    if [ x$dirname = x/ ]; then

+ +      if [ -z "${prepare_root_cache}" ]; then

+ +        prepare_grub_to_access_device ${GRUB_DEVICE}

+ +      fi

+ +    else

+ +      if [ -z "${prepare_boot_cache}" ]; then

+ +        prepare_grub_to_access_device ${GRUB_DEVICE_BOOT}

+ +      fi

+ +    fi

+ +

+ +    bootefi_device="`${grub_probe} --target=device /boot/efi/`"

+ +    prepare_grub_to_access_device ${bootefi_device} boot

+ +

+ +    cat << EOF

+ +blscfg

+ +if [ -s \$prefix/grubenv ]; then

+ +  load_env

+ +fi

+ +EOF

+ +

+ +    ${grub_editenv} - set kernelopts="root=${linux_root_device_thisversion} ro ${args}"

+ +

+ +    exit 0

+ +  fi

+ +

+    if [ x$type != xsimple ] ; then

+        title=$(mktitle "$type" "$version")

+        if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then

+ @@ -236,7 +263,10 @@ submenu_indentation=""

+  is_top_level=true

+  while [ "x$list" != "x" ] ; do

+    linux=`version_find_latest $list`

+ -  gettext_printf "Found linux image: %s\n" "$linux" >&2

+ +  if [ "x${GRUB_ENABLE_BLSCFG}" != "xtrue" ]; then

+ +    gettext_printf "Found linux image: %s\n" "$linux" >&2

+ +  fi

+ +

+    basename=`basename $linux`

+    dirname=`dirname $linux`

+    rel_dirname=`make_system_path_relative_to_its_root $dirname`

+ @@ -281,7 +311,9 @@ while [ "x$list" != "x" ] ; do

+    fi

+  

+    if test -n "${initrd}" ; then

+ -    gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2

+ +    if [ "x${GRUB_ENABLE_BLSCFG}" != "xtrue" ]; then

+ +      gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2

+ +    fi

+    elif test -z "${initramfs}" ; then

+      # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs.  Since there's

+      # no initrd or builtin initramfs, it can't work here.

+ -- 

+ 2.14.3

+ 

@@ -0,0 +1,36 @@ 

+ From 025b7af3bac7f1326a1b6e9122cf394d24848e5a Mon Sep 17 00:00:00 2001

+ From: Javier Martinez Canillas <javierm@redhat.com>

+ Date: Tue, 6 Feb 2018 11:02:09 +0100

+ Subject: [PATCH 203/206] Remove duplicated grub_exit() definition for grub-emu

+  platform

+ 

+ The grub_exit() function signature was changed on all platforms to take a

+ return code, but latter on a following commit the grub_exit() for the emu

+ platform was duplicated. It causes a build error so remove the duplicated

+ function definition.

+ 

+ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

+ ---

+  grub-core/kern/emu/main.c | 6 ------

+  1 file changed, 6 deletions(-)

+ 

+ diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c

+ index 7e47ec812636..55ea5a11ccd2 100644

+ --- a/grub-core/kern/emu/main.c

+ +++ b/grub-core/kern/emu/main.c

+ @@ -72,12 +72,6 @@ grub_exit (int retval __attribute__((unused)))

+    grub_reboot ();

+  }

+  

+ -void

+ -grub_exit (int retval __attribute__((unused)))

+ -{

+ -  grub_reboot ();

+ -}

+ -

+  void

+  grub_machine_init (void)

+  {

+ -- 

+ 2.14.3

+ 

@@ -0,0 +1,30 @@ 

+ From c99f62ba1dc34c5111cff9ca3ce49b01bfd0774e Mon Sep 17 00:00:00 2001

+ From: Javier Martinez Canillas <javierm@redhat.com>

+ Date: Tue, 6 Feb 2018 11:16:28 +0100

+ Subject: [PATCH 204/206] Don't attempt to backtrace on grub_abort() for

+  grub-emu

+ 

+ The emu platform doesn't have a grub_backtrace() implementation, so this

+ causes a build error. Don't attempt to call this when building grub-emu.

+ 

+ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

+ ---

+  grub-core/kern/misc.c | 2 +-

+  1 file changed, 1 insertion(+), 1 deletion(-)

+ 

+ diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c

+ index 04371ac49f2a..636f97e1ba12 100644

+ --- a/grub-core/kern/misc.c

+ +++ b/grub-core/kern/misc.c

+ @@ -1103,7 +1103,7 @@ static void __attribute__ ((noreturn))

+  grub_abort (void)

+  {

+  #ifndef GRUB_UTIL

+ -#if defined(__i386__) || defined(__x86_64__)

+ +#if (defined(__i386__) || defined(__x86_64__)) && !defined(GRUB_MACHINE_EMU)

+    grub_backtrace();

+  #endif

+  #endif

+ -- 

+ 2.14.3

+ 

@@ -0,0 +1,167 @@ 

+ From 4e4a5b7af8e7dc673731d0d494447189c9da07dd Mon Sep 17 00:00:00 2001

+ From: Javier Martinez Canillas <javierm@redhat.com>

+ Date: Fri, 2 Feb 2018 11:36:29 +0100

+ Subject: [PATCH 205/206] Enable blscfg command for the emu platform

+ 

+ Allow grub-emu to call a blscfg command. This may be useful for platforms

+ that don't support GRUB, so grub-emu can be used to parse the BLS configs

+ and kexec a new kernel using that information.

+ 

+ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

+ ---

+  grub-core/Makefile.core.def |  1 +

+  grub-core/commands/blscfg.c | 46 +++++++++++++++++++++++++++++++++++----------

+  2 files changed, 37 insertions(+), 10 deletions(-)

+ 

+ diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

+ index 0ca0bdad4124..420cbf0a0243 100644

+ --- a/grub-core/Makefile.core.def

+ +++ b/grub-core/Makefile.core.def

+ @@ -778,6 +778,7 @@ module = {

+    common = commands/blscfg.c;

+    enable = efi;

+    enable = i386_pc;

+ +  enable = emu;

+  };

+  

+  module = {

+ diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c

+ index 87e7d9a4c647..12104d490ecd 100644

+ --- a/grub-core/commands/blscfg.c

+ +++ b/grub-core/commands/blscfg.c

+ @@ -37,7 +37,12 @@ GRUB_MOD_LICENSE ("GPLv3+");

+  #include "loadenv.h"

+  

+  #define GRUB_BLS_CONFIG_PATH "/loader/entries/"

+ +#ifdef GRUB_MACHINE_EMU

+ +#define GRUB_BOOT_DEVICE "/boot"

+ +#else

+  #define GRUB_BOOT_DEVICE "($root)"

+ +#endif

+ +

+  #ifdef GRUB_MACHINE_EFI

+  #define GRUB_LINUX_CMD "linuxefi"

+  #define GRUB_INITRD_CMD "initrdefi"

+ @@ -46,6 +51,13 @@ GRUB_MOD_LICENSE ("GPLv3+");

+  #define GRUB_INITRD_CMD "initrd"

+  #endif

+  

+ +enum

+ +  {

+ +    PLATFORM_EFI,

+ +    PLATFORM_EMU,

+ +    PLATFORM_BIOS,

+ +  };

+ +

+  #define grub_free(x) ({grub_dprintf("blscfg", "%s freeing %p\n", __func__, x); grub_free(x); })

+  

+  struct keyval

+ @@ -641,7 +653,7 @@ finish:

+  struct find_entry_info {

+  	grub_device_t dev;

+  	grub_fs_t fs;

+ -	int efi;

+ +	int platform;

+  };

+  

+  /*

+ @@ -668,13 +680,16 @@ static int find_entry (const char *filename,

+        !grub_strcmp (filename, ".."))

+      return 0;

+  

+ -  if (info->efi && !grub_strcasecmp (filename, "boot"))

+ +  if (info->platform == PLATFORM_EFI && !grub_strcasecmp (filename, "boot"))

+      return 0;

+  

+    saved_env_buf = grub_malloc (512);

+  

+    // set a default blsdir

+ -  if (info->efi)

+ +  if (info->platform == PLATFORM_EMU)

+ +    default_blsdir = grub_xasprintf ("%s%s", GRUB_BOOT_DEVICE,

+ +				     GRUB_BLS_CONFIG_PATH);

+ +  else if (info->platform == PLATFORM_EFI)

+      default_blsdir = grub_xasprintf ("/EFI/%s%s", filename,

+  				     GRUB_BLS_CONFIG_PATH);

+    else

+ @@ -686,7 +701,7 @@ static int find_entry (const char *filename,

+    /*

+     * try to load a grubenv from /EFI/wherever/grubenv

+     */

+ -  if (info->efi)

+ +  if (info->platform == PLATFORM_EFI)

+      grubenv_path = grub_xasprintf ("(%s)/EFI/%s/grubenv", devid, filename);

+    else

+      grubenv_path = grub_xasprintf ("(%s)/grub2/grubenv", devid);

+ @@ -740,7 +755,7 @@ static int find_entry (const char *filename,

+      goto finish;

+  

+    grub_dprintf ("blscfg", "blsdir: \"%s\"\n", blsdir);

+ -  if (blsdir[0] != '/' && info->efi)

+ +  if (blsdir[0] != '/' && info->platform == PLATFORM_EFI)

+      blsdir = grub_xasprintf ("/EFI/%s/%s/", filename, blsdir);

+    else

+      blsdir = grub_strdup (blsdir);

+ @@ -816,15 +831,21 @@ grub_cmd_blscfg (grub_extcmd_context_t ctxt UNUSED,

+      {

+        .dev = NULL,

+        .fs = NULL,

+ -      .efi = 0,

+ +      .platform = PLATFORM_BIOS,

+      };

+  

+  

+    grub_dprintf ("blscfg", "finding boot\n");

+ +

+ +#ifdef GRUB_MACHINE_EMU

+ +  devid = "host";

+ +  grub_env_set ("boot", devid);

+ +#else

+    devid = grub_env_get ("boot");

+    if (!devid)

+      return grub_error (GRUB_ERR_FILE_NOT_FOUND,

+  		       N_("variable `%s' isn't set"), "boot");

+ +#endif

+  

+    grub_dprintf ("blscfg", "opening %s\n", devid);

+    dev = grub_device_open (devid);

+ @@ -842,11 +863,16 @@ grub_cmd_blscfg (grub_extcmd_context_t ctxt UNUSED,

+    info.dev = dev;

+    info.fs = fs;

+  #ifdef GRUB_MACHINE_EFI

+ -  info.efi = 1;

+ +  info.platform = PLATFORM_EFI;

+    grub_dprintf ("blscfg", "scanning /EFI/\n");

+    r = fs->dir (dev, "/EFI/", find_entry, &info);

+ +#elif GRUB_MACHINE_EMU

+ +  info.platform = PLATFORM_EMU;

+ +  grub_dprintf ("blscfg", "scanning %s%s\n", GRUB_BOOT_DEVICE,

+ +		GRUB_BLS_CONFIG_PATH);

+ +  r = fs->dir (dev, "/boot/loader/",

+ +	       find_entry, &info);

+  #else

+ -  info.efi = 0;

+    grub_dprintf ("blscfg", "scanning %s\n", GRUB_BLS_CONFIG_PATH);

+    r = fs->dir (dev, "/", find_entry, &info);

+  #endif

+ @@ -860,7 +886,7 @@ finish:

+  

+  static grub_extcmd_t cmd;

+  

+ -GRUB_MOD_INIT(bls)

+ +GRUB_MOD_INIT(blscfg)

+  {

+    grub_dprintf("blscfg", "%s got here\n", __func__);

+    cmd = grub_register_extcmd ("blscfg",

+ @@ -871,7 +897,7 @@ GRUB_MOD_INIT(bls)

+  			      NULL);

+  }

+  

+ -GRUB_MOD_FINI(bls)

+ +GRUB_MOD_FINI(blscfg)

+  {

+    grub_unregister_extcmd (cmd);

+  }

+ -- 

+ 2.14.3

+ 

@@ -0,0 +1,360 @@ 

+ From cd75f7e421ed9ae72acc9850f44294564246f0d9 Mon Sep 17 00:00:00 2001

+ From: Javier Martinez Canillas <javierm@redhat.com>

+ Date: Tue, 6 Feb 2018 09:09:00 +0100

+ Subject: [PATCH 206/206] Add linux and initrd commands for grub-emu

+ 

+ When using grub-emu, the linux and initrd commands are used as arguments

+ to the kexec command line tool.

+ 

+ The patch was taken from:

+ 

+ https://build.opensuse.org/package/view_file/SUSE:SLE-15:GA/grub2/grub2-s390x-02-kexec-module-added-to-emu.patch

+ 

+ Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

+ ---

+  grub-core/Makefile.am        |   1 +

+  grub-core/Makefile.core.def  |   2 +-

+  grub-core/kern/emu/main.c    |   4 +

+  grub-core/kern/emu/misc.c    |  18 ++++-

+  grub-core/loader/emu/linux.c | 172 +++++++++++++++++++++++++++++++++++++++++++

+  include/grub/emu/exec.h      |   4 +-

+  include/grub/emu/hostfile.h  |   3 +-

+  include/grub/emu/misc.h      |   3 +

+  8 files changed, 203 insertions(+), 4 deletions(-)

+  create mode 100644 grub-core/loader/emu/linux.c

+ 

+ diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

+ index f7b4d29b0b30..75e8715e631f 100644

+ --- a/grub-core/Makefile.am

+ +++ b/grub-core/Makefile.am

+ @@ -275,6 +275,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h

+  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/hostdisk.h

+  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/hostfile.h

+  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h

+ +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/exec.h

+  if COND_GRUB_EMU_SDL

+  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h

+  endif

+ diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

+ index 420cbf0a0243..533e1408f745 100644

+ --- a/grub-core/Makefile.core.def

+ +++ b/grub-core/Makefile.core.def

+ @@ -1715,10 +1715,10 @@ module = {

+    arm = loader/arm/linux.c;

+    arm64 = loader/arm64/linux.c;

+    arm64 = loader/efi/linux.c;

+ +  emu = loader/emu/linux.c;

+    fdt = lib/fdt.c;

+    common = loader/linux.c;

+    common = lib/cmdline.c;

+ -  enable = noemu;

+  };

+  

+  module = {

+ diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c

+ index 55ea5a11ccd2..846fe9715ec2 100644

+ --- a/grub-core/kern/emu/main.c

+ +++ b/grub-core/kern/emu/main.c

+ @@ -107,6 +107,7 @@ static struct argp_option options[] = {

+     N_("use GRUB files in the directory DIR [default=%s]"), 0},

+    {"verbose",     'v', 0,      0, N_("print verbose messages."), 0},

+    {"hold",     'H', N_("SECS"),      OPTION_ARG_OPTIONAL, N_("wait until a debugger will attach"), 0},

+ +  {"kexec",       'X', 0,      0, N_("try the untryable."), 0},

+    { 0, 0, 0, 0, 0, 0 }

+  };

+  

+ @@ -164,6 +165,9 @@ argp_parser (int key, char *arg, struct argp_state *state)

+      case 'v':

+        verbosity++;

+        break;

+ +    case 'X':

+ +      grub_util_set_kexecute();

+ +      break;

+  

+      case ARGP_KEY_ARG:

+        {

+ diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c

+ index 82012a72fcb2..3d3a4a4a975a 100644

+ --- a/grub-core/kern/emu/misc.c

+ +++ b/grub-core/kern/emu/misc.c

+ @@ -37,6 +37,7 @@

+  #include <grub/emu/misc.h>

+  

+  int verbosity;

+ +int kexecute;

+  

+  void

+  grub_util_warn (const char *fmt, ...)

+ @@ -80,7 +81,7 @@ grub_util_error (const char *fmt, ...)

+    vfprintf (stderr, fmt, ap);

+    va_end (ap);

+    fprintf (stderr, ".\n");

+ -  exit (1);

+ +  grub_exit (1);

+  }

+  

+  void *

+ @@ -140,6 +141,9 @@ void

+  __attribute__ ((noreturn))

+  grub_exit (int rc)

+  {

+ +#if defined (GRUB_KERNEL)

+ +  grub_reboot();

+ +#endif

+    exit (rc < 0 ? 1 : rc);

+  }

+  #endif

+ @@ -201,3 +205,15 @@ grub_util_load_image (const char *path, char *buf)

+  

+    fclose (fp);

+  }

+ +

+ +void

+ +grub_util_set_kexecute(void)

+ +{

+ +  kexecute++;

+ +}

+ +

+ +int

+ +grub_util_get_kexecute(void)

+ +{

+ +  return kexecute;

+ +}

+ diff --git a/grub-core/loader/emu/linux.c b/grub-core/loader/emu/linux.c

+ new file mode 100644

+ index 000000000000..fda9e00d24c6

+ --- /dev/null

+ +++ b/grub-core/loader/emu/linux.c

+ @@ -0,0 +1,172 @@

+ +/*

+ + *  GRUB  --  GRand Unified Bootloader

+ + *  Copyright (C) 2006,2007,2008,2009,2010  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/>.

+ + */

+ +

+ +#include <grub/loader.h>

+ +#include <grub/dl.h>

+ +#include <grub/command.h>

+ +#include <grub/time.h>

+ +

+ +#include <grub/emu/exec.h>

+ +#include <grub/emu/hostfile.h>

+ +#include <grub/emu/misc.h>

+ +

+ +GRUB_MOD_LICENSE ("GPLv3+");

+ +

+ +static grub_dl_t my_mod;

+ +

+ +static char *kernel_path;

+ +static char *initrd_path;

+ +static char *boot_cmdline;

+ +

+ +static grub_err_t

+ +grub_linux_boot (void)

+ +{

+ +  grub_err_t rc = GRUB_ERR_NONE;

+ +  char *initrd_param;

+ +  const char *kexec[] = { "kexec", "-l", kernel_path, boot_cmdline, NULL, NULL };

+ +  const char *systemctl[] = { "systemctl", "kexec", NULL };

+ +  int kexecute = grub_util_get_kexecute();

+ +

+ +  if (initrd_path) {

+ +    initrd_param = grub_xasprintf("--initrd=%s", initrd_path);

+ +    kexec[3] = initrd_param;

+ +    kexec[4] = boot_cmdline;

+ +  } else {

+ +    initrd_param = grub_xasprintf("%s", "");

+ +  }

+ +

+ +  grub_printf("%serforming 'kexec -l %s %s %s'\n",

+ +	(kexecute) ? "P" : "Not p",

+ +	kernel_path, initrd_param, boot_cmdline);

+ +

+ +  if (kexecute)

+ +    rc = grub_util_exec(kexec);

+ +

+ +  grub_free(initrd_param);

+ +

+ +  if (rc != GRUB_ERR_NONE) {

+ +    grub_error (rc, N_("Error trying to perform kexec load operation."));

+ +    grub_sleep (3);

+ +    return rc;

+ +  }

+ +  if (kexecute < 1)

+ +    grub_fatal (N_("Use '"PACKAGE"-emu --kexec' to force a system restart."));

+ +

+ +  grub_printf("Performing 'systemctl kexec' (%s) ",

+ +		(kexecute==1) ? "do-or-die" : "just-in-case");

+ +  rc = grub_util_exec (systemctl);

+ +

+ +  if (kexecute == 1)

+ +    grub_fatal (N_("Error trying to perform 'systemctl kexec'"));

+ +

+ +  /* need to check read-only root before resetting hard!? */

+ +  grub_printf("Performing 'kexec -e'");

+ +  kexec[1] = "-e";

+ +  kexec[2] = NULL;

+ +  rc = grub_util_exec(kexec);

+ +  if ( rc != GRUB_ERR_NONE )

+ +    grub_fatal (N_("Error trying to directly perform 'kexec -e'."));

+ +

+ +  return rc;

+ +}

+ +

+ +static grub_err_t

+ +grub_linux_unload (void)

+ +{

+ +  grub_dl_unref (my_mod);

+ +  if ( boot_cmdline != NULL )

+ +    grub_free (boot_cmdline);

+ +  boot_cmdline = NULL;

+ +  return GRUB_ERR_NONE;

+ +}

+ +

+ +static grub_err_t

+ +grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[])

+ +{

+ +  int i;

+ +  char *tempstr;

+ +

+ +  grub_dl_ref (my_mod);

+ +

+ +  if (argc == 0)

+ +    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));

+ +

+ +  if ( !grub_util_is_regular(argv[0]) )

+ +    return grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("Cannot find kernel file %s"), argv[0]);

+ +

+ +  if ( kernel_path != NULL )

+ +    grub_free(kernel_path);

+ +

+ +  kernel_path = grub_xasprintf("%s", argv[0]);

+ +

+ +  if ( boot_cmdline != NULL ) {

+ +    grub_free(boot_cmdline);

+ +    boot_cmdline = NULL;

+ +  }

+ +

+ +  if ( argc > 1 )

+ +  {

+ +    boot_cmdline = grub_xasprintf("--command-line=%s", argv[1]);

+ +    for ( i = 2; i < argc; i++ ) {

+ +      tempstr = grub_xasprintf("%s %s", boot_cmdline, argv[i]);

+ +      grub_free(boot_cmdline);

+ +      boot_cmdline = tempstr;

+ +    }

+ +  }

+ +

+ +  grub_loader_set (grub_linux_boot, grub_linux_unload, 0);

+ +

+ +  return GRUB_ERR_NONE;

+ +}

+ +

+ +static grub_err_t

+ +grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), int argc, char *argv[])

+ +{

+ +  if (argc == 0)

+ +    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));

+ +

+ +  if ( !grub_util_is_regular(argv[0]) )

+ +    return grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("Cannot find initrd file %s"), argv[0]);

+ +

+ +  if ( initrd_path != NULL )

+ +    grub_free(initrd_path);

+ +

+ +  initrd_path = grub_xasprintf("%s", argv[0]);

+ +

+ +  grub_dl_unref (my_mod);

+ +

+ +  return GRUB_ERR_NONE;

+ +}

+ +

+ +static grub_command_t cmd_linux, cmd_initrd;

+ +

+ +GRUB_MOD_INIT(linux)

+ +{

+ +  cmd_linux = grub_register_command ("linux", grub_cmd_linux, 0, N_("Load Linux."));

+ +  cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd, 0, N_("Load initrd."));

+ +  my_mod = mod;

+ +  kernel_path = NULL;

+ +  initrd_path = NULL;

+ +  boot_cmdline = NULL;

+ +}

+ +

+ +GRUB_MOD_FINI(linux)

+ +{

+ +  grub_unregister_command (cmd_linux);

+ +  grub_unregister_command (cmd_initrd);

+ +}

+ diff --git a/include/grub/emu/exec.h b/include/grub/emu/exec.h

+ index d1073ef86af8..1b61b4a2e5dd 100644

+ --- a/include/grub/emu/exec.h

+ +++ b/include/grub/emu/exec.h

+ @@ -23,6 +23,8 @@

+  #include <stdarg.h>

+  

+  #include <sys/types.h>

+ +#include <grub/symbol.h>

+ +

+  pid_t

+  grub_util_exec_pipe (const char *const *argv, int *fd);

+  pid_t

+ @@ -32,7 +34,7 @@ int

+  grub_util_exec_redirect_all (const char *const *argv, const char *stdin_file,

+  			     const char *stdout_file, const char *stderr_file);

+  int

+ -grub_util_exec (const char *const *argv);

+ +EXPORT_FUNC(grub_util_exec) (const char *const *argv);

+  int

+  grub_util_exec_redirect (const char *const *argv, const char *stdin_file,

+  			 const char *stdout_file);

+ diff --git a/include/grub/emu/hostfile.h b/include/grub/emu/hostfile.h

+ index 8e37d5acb42b..12c937a1af9f 100644

+ --- a/include/grub/emu/hostfile.h

+ +++ b/include/grub/emu/hostfile.h

+ @@ -22,6 +22,7 @@

+  #include <grub/disk.h>

+  #include <grub/partition.h>

+  #include <sys/types.h>

+ +#include <grub/symbol.h>

+  #include <grub/osdep/hostfile.h>

+  

+  int

+ @@ -29,7 +30,7 @@ grub_util_is_directory (const char *path);

+  int

+  grub_util_is_special_file (const char *path);

+  int

+ -grub_util_is_regular (const char *path);

+ +EXPORT_FUNC(grub_util_is_regular) (const char *path);

+  

+  char *

+  grub_util_path_concat (size_t n, ...);

+ diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h

+ index df6085bcb7c2..a653132e36a0 100644

+ --- a/include/grub/emu/misc.h

+ +++ b/include/grub/emu/misc.h

+ @@ -60,6 +60,9 @@ void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (

+  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_set_kexecute) (void);

+ +int EXPORT_FUNC(grub_util_get_kexecute) (void) WARN_UNUSED_RESULT;

+ +

+  grub_uint64_t EXPORT_FUNC (grub_util_get_cpu_time_ms) (void);

+  

+  #ifdef HAVE_DEVICE_MAPPER

+ -- 

+ 2.14.3

+ 

file modified
+4 -4
@@ -338,10 +338,10 @@ 

  %endif

  

  %define do_efi_build_images()					\

- GRUB_MODULES="	all_video boot btrfs cat chain configfile echo	\\\

- 		efifwsetup efinet ext2 fat font gfxmenu gfxterm \\\

- 		gzio halt hfsplus iso9660 jpeg loadenv loopback \\\

- 		lvm lsefi mdraid09 mdraid1x minicmd		\\\

+ GRUB_MODULES="	all_video blscfg boot btrfs cat chain configfile\\\

+ 		echo efifwsetup efinet ext2 fat font gfxmenu	\\\

+ 		gfxterm gzio halt hfsplus iso9660 jpeg loadenv  \\\

+ 		loopback lvm lsefi mdraid09 mdraid1x minicmd	\\\

  		normal part_apple part_msdos part_gpt		\\\

  		password_pbkdf2 png reboot			\\\

  		search search_fs_uuid search_fs_file		\\\

file modified
+8
@@ -196,3 +196,11 @@ 

  Patch0196: 0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch

  Patch0197: 0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch

  Patch0198: 0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch

+ Patch0199: 0199-Trivial-fix-for-an-error-message-in-get_header_from_.patch

+ Patch0200: 0200-Add-quicksort-implementation.patch

+ Patch0201: 0201-Add-blscfg-command-support-to-parse-BootLoaderSpec-f.patch

+ Patch0202: 0202-Add-BLS-support-to-grub-mkconfig.patch

+ Patch0203: 0203-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch

+ Patch0204: 0204-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch

+ Patch0205: 0205-Enable-blscfg-command-for-the-emu-platform.patch

+ Patch0206: 0206-Add-linux-and-initrd-commands-for-grub-emu.patch 

\ No newline at end of file

file modified
+4 -1
@@ -7,7 +7,7 @@ 

  Name:		grub2

  Epoch:		1

  Version:	2.02

- Release:	25%{?dist}

+ Release:	26%{?dist}

  Summary:	Bootloader with support for Linux, Multiboot and more

  Group:		System Environment/Base

  License:	GPLv3+
@@ -451,6 +451,9 @@ 

  %endif

  

  %changelog

+ * Mon Feb 19 2018 Javier Martinez Canillas <javierm@redhat.com> - 2.02-26

+ - Add blscfg command and improve BootLoaderSpec support.

+ 

  * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org>

  - Escape macros in %%changelog

  

This pull request adds @pjones' patches that improve the BootLoaderSpec support. It also contains patches that allow the blscfg command to be used for the EMU platform and to boot from user-space using kexec.

Pull-Request has been closed by pjones

6 years ago
Metadata
Changes Summary 209
+3 -3
file changed
0001-Bump-version-to-2.03.patch
+12 -12
file changed
0002-Remove-bashisms-from-tests.patch
+2 -2
file changed
0003-fs-tester-make-sh-compatible.patch
+3 -3
file changed
0004-support-busybox-date.patch
+2 -2
file changed
0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch
+3 -3
file changed
0006-Support-lseek64.patch
+2 -2
file changed
0007-Use-SHELL-rather-than-bin-sh.patch
+2 -2
file changed
0008-po-Use-SHELL-rather-than-bin-sh.patch
+2 -2
file changed
0009-Add-termux-path-to-dict.patch
+61 -61
file changed
0010-Fix-shebang-for-termux.patch
+2 -2
file changed
0011-Add-strtoull-test.patch
+3 -3
file changed
0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch
+8 -8
file changed
0013-Add-Virtual-LAN-support.patch
+4 -4
file changed
0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch
+8 -8
file changed
0015-Refactor-arm-uboot-code-to-make-it-genereic.patch
+11 -11
file changed
0016-coreboot-Split-parts-that-are-platform-independent.patch
+2 -2
file changed
0017-Rename-uboot-halt.c-to-dummy-halt.c.patch
+3 -3
file changed
0018-Rename-uboot-datetime-to-dummy-datetime.patch
+18 -18
file changed
0019-arm-coreboot-Start-new-port.patch
+14 -14
file changed
0020-Add-support-for-device-tree-based-drivers.patch
+2 -2
file changed
0021-arm-coreboot-Support-for-vexpress-timer.patch
+2 -2
file changed
0022-arm-coreboot-Export-FDT-routines.patch
+6 -6
file changed
0023-at_keyboard-Split-protocol-from-controller-code.patch
+5 -5
file changed
0024-arm_coreboot-Support-keyboard-for-vexpress.patch
+4 -4
file changed
0025-arm_coreboot-Support-grub-mkstandalone.patch
+3 -3
file changed
0026-arm_coreboot-Support-loading-linux-images.patch
+9 -9
file changed
0027-arm_coreboot-Support-DMA.patch
+4 -4
file changed
0028-ehci-Split-core-code-from-PCI-part.patch
+6 -6
file changed
0029-arm_coreboot-Support-EHCI.patch
+2 -2
file changed
0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch
+3 -3
file changed
0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch
+5 -5
file changed
0032-rk3288_spi-Add-SPI-driver.patch
+4 -4
file changed
0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch
+3 -3
file changed
0034-Missing-parts-of-previous-commit.patch
+2 -2
file changed
0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch
+3 -3
file changed
0036-at_keyboard-Fix-falco-chromebook-case.patch
+2 -2
file changed
0037-sparc64-Close-cdboot-ihandle.patch
+2 -2
file changed
0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch
+2 -2
file changed
0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch
+2 -2
file changed
0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch
+2 -2
file changed
0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch
+2 -2
file changed
0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch
+4 -4
file changed
0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch
+2 -2
file changed
0044-ehci-Fix-compilation-for-amd64.patch
+2 -2
file changed
0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch
+2 -2
file changed
0046-ehci-Fix-compilation-on-i386.patch
+2 -2
file changed
0047-crypto-Fix-use-after-free.patch
+2 -2
file changed
0048-arm-efi-Fix-compilation.patch
+2 -2
file changed
0049-fdt-silence-clang-warning.patch
+2 -2
file changed
0050-Fix-a-segfault-in-lsefi.patch
+2 -2
file changed
0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch
+2 -2
file changed
0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch
+2 -2
file changed
0053-grub-core-fs-udf.c-Add-support-for-UUID.patch
+2 -2
file changed
0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch
+2 -2
file changed
0055-Fail-if-xorriso-failed.patch
+3 -3
file changed
0056-efi-refactor-grub_efi_allocate_pages.patch
+9 -9
file changed
0057-Remove-grub_efi_allocate_pages.patch
+5 -5
file changed
0058-efi-move-fdt-helper-library.patch
+4 -4
file changed
0059-efi-Add-GRUB_PE32_MAGIC-definition.patch
+3 -3
file changed
0060-arm64-linux-loader-improve-type-portability.patch
+2 -2
file changed
0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch
+14 -14
file changed
0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch
+2 -2
file changed
0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch
+2 -2
file changed
0064-info-in-builddir.patch
+10 -10
file changed
0065-re-write-.gitignore.patch
+5 -5
file changed
0066-IBM-client-architecture-CAS-reboot-support.patch
+2 -2
file changed
0067-for-ppc-reset-console-display-attr-when-clear-screen.patch
+4 -4
file changed
0068-Disable-GRUB-video-support-for-IBM-power-machines.patch
+2 -2
file changed
0069-Honor-a-symlink-when-generating-configuration-by-gru.patch
+3 -3
file changed
0070-Move-bash-completion-script-922997.patch
+5 -5
file changed
0071-Update-to-minilzo-2.08.patch
+2 -2
file changed
0072-Allow-fallback-to-include-entries-by-title-not-just-.patch
+4 -4
file changed
0073-Add-GRUB_DISABLE_UUID.patch
+15 -15
file changed
0074-Make-exit-take-a-return-code.patch
+2 -2
file changed
0075-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch
+3 -3
file changed
0076-Make-efi-machines-load-an-env-block-from-a-variable.patch
+3 -3
file changed
0077-DHCP-client-ID-and-UUID-options-added.patch
+2 -2
file changed
0078-trim-arp-packets-with-abnormal-size.patch
+2 -2
file changed
0079-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch
+2 -2
file changed
0080-Add-support-for-UEFI-operating-systems-returned-by-o.patch
+3 -3
file changed
0081-Migrate-PPC-from-Yaboot-to-Grub2.patch
+3 -3
file changed
0082-Add-fw_path-variable-revised.patch
+6 -6
file changed
0083-Add-support-for-linuxefi.patch
+2 -2
file changed
0084-Use-linuxefi-and-initrdefi-where-appropriate.patch
+4 -4
file changed
0085-Don-t-allow-insmod-when-secure-boot-is-enabled.patch
+4 -4
file changed
0086-Pass-x-hex-hex-straight-through-unmolested.patch
+2 -2
file changed
0087-Add-X-option-to-printf-functions.patch
+4 -4
file changed
0088-Search-for-specific-config-file-for-netboot.patch
+3 -3
file changed
0089-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch
+6 -6
file changed
0090-Don-t-write-messages-to-the-screen.patch
+2 -2
file changed
0091-Don-t-print-GNU-GRUB-header.patch
+2 -2
file changed
0092-Don-t-add-to-highlighted-row.patch
+2 -2
file changed
0093-Message-string-cleanups.patch
+2 -2
file changed
0094-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch
+2 -2
file changed
0095-Use-the-correct-indentation-for-the-term-help-text.patch
+2 -2
file changed
0096-Indent-menu-entries.patch
+2 -2
file changed
0097-Fix-margins.patch
+2 -2
file changed
0098-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch
+2 -2
file changed
0099-Use-linux16-when-appropriate-880840.patch
+2 -2
file changed
0100-Enable-pager-by-default.-985860.patch
+2 -2
file changed
0101-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch
+3 -3
file changed
0102-Don-t-say-GNU-Linux-in-generated-menus.patch
+2 -2
file changed
0103-Don-t-draw-a-border-around-the-menu.patch
+2 -2
file changed
0104-Use-the-standard-margin-for-the-timeout-string.patch
+2 -2
file changed
0105-Add-.eh_frame-to-list-of-relocations-stripped.patch
+2 -2
file changed
0106-Make-10_linux-work-with-our-changes-for-linux16-and-.patch
+2 -2
file changed
0107-Don-t-print-during-fdt-loading-method.patch
+2 -2
file changed
0108-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch
+2 -2
file changed
0109-Don-t-require-a-password-to-boot-entries-generated-b.patch
+3 -3
file changed
0110-Don-t-emit-Booting-.-message.patch
+60 -60
file changed
0111-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch
+2 -2
file changed
0112-use-fw_path-prefix-when-fallback-searching-for-grub-.patch
+2 -2
file changed
0113-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch
+2 -2
file changed
0114-Fix-convert-function-to-support-NVMe-devices.patch
+2 -2
file changed
0115-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch
+3 -3
file changed
0116-Use-the-default-device-tree-from-the-grub-default-fi.patch
+2 -2
file changed
0117-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+2 -2
file changed
0118-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+25 -25
file changed
0119-Add-grub_util_readlink.patch
+3 -3
file changed
0120-Make-editenv-chase-symlinks-including-those-across-d.patch
+2 -2
file changed
0121-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch
+2 -2
file changed
0122-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch
+13 -12
file changed
0123-Load-arm-with-SB-enabled.patch
+4 -4
file changed
0124-Try-prefix-if-fw_path-doesn-t-work.patch
+2 -2
file changed
0125-Update-info-with-grub.cfg-netboot-selection-order-11.patch
+7 -7
file changed
0126-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch
+2 -2
file changed
0127-Handle-rssd-storage-devices.patch
+2 -2
file changed
0128-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch
+2 -2
file changed
0129-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+8 -8
file changed
0130-Add-friendly-grub2-password-config-tool-985962.patch
+2 -2
file changed
0131-Make-grub2-mkconfig-construct-titles-that-look-like-.patch
+3 -3
file changed
0132-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch
+2 -2
file changed
0133-tcp-add-window-scaling-support.patch
+2 -2
file changed
0134-efinet-retransmit-if-our-device-is-busy.patch
+3 -3
file changed
0135-Be-more-aggro-about-actually-using-the-configured-ne.patch
+2 -2
file changed
0136-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch
+3 -3
file changed
0137-Fix-security-issue-when-reading-username-and-passwor.patch
+2 -2
file changed
0138-Warn-if-grub-password-will-not-be-read-1290803.patch
+3 -3
file changed
0139-Clean-up-grub-setpassword-documentation-1290799.patch
+2 -2
file changed
0140-Fix-locale-issue-in-grub-setpassword-1294243.patch
+2 -2
file changed
0141-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch
+2 -2
file changed
0142-efiemu-Fix-compilation-failure.patch
+2 -2
file changed
0143-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch
+6 -6
file changed
0144-Add-a-url-parser.patch
+7 -7
file changed
0145-efinet-and-bootp-add-support-for-dhcpv6.patch
+9 -9
file changed
0146-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch
+2 -2
file changed
0147-Normalize-slashes-in-tftp-paths.patch
+2 -2
file changed
0148-Fix-malformed-tftp-packets.patch
+2 -2
file changed
0149-Fix-race-in-EFI-validation.patch
+2 -2
file changed
0150-bz1374141-fix-incorrect-mask-for-ppc64.patch
+2 -2
file changed
0151-Use-device-part-of-chainloader-target-if-present.patch
+3 -3
file changed
0152-Add-secureboot-support-on-efi-chainloader.patch
+20 -20
file changed
0153-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch
+6 -6
file changed
0154-Make-grub_fatal-also-backtrace.patch
+2 -2
file changed
0155-Rework-linux-command.patch
+2 -2
file changed
0156-Rework-linux16-command.patch
+2 -2
file changed
0157-Make-grub-editenv-build-again.patch
+5 -5
file changed
0158-Fix-up-some-man-pages-rpmdiff-noticed.patch
+3 -3
file changed
0159-Re-work-some-intricacies-of-PE-loading.patch
+7 -7
file changed
0160-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch
+2 -2
file changed
0161-linuxefi-fix-double-free-on-verification-failure.patch
+2 -2
file changed
0162-fix-machine-type-test-in-30_os-prober.in.patch
+2 -2
file changed
0163-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch
+2 -2
file changed
0164-efi-chainloader-truncate-overlong-relocation-section.patch
+2 -2
file changed
0165-linuxefi-minor-cleanups.patch
+4 -4
file changed
0166-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch
+2 -2
file changed
0167-Fix-up-linux-params-usage.patch
+3 -3
file changed
0168-Make-exit-take-a-return-code.patch
+2 -2
file changed
0169-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch
+2 -2
file changed
0170-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch
+3 -3
file changed
0171-Make-our-info-pages-say-grub2-where-appropriate.patch
+2 -2
file changed
0172-print-more-debug-info-in-our-module-loader.patch
+2 -2
file changed
0173-macos-just-build-chainloader-entries-don-t-try-any-x.patch
+3 -3
file changed
0174-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch
+2 -2
file changed
0175-export-btrfs_subvol-and-btrfs_subvolid.patch
+2 -2
file changed
0176-grub2-btrfs-03-follow_default.patch
+7 -7
file changed
0177-grub2-btrfs-04-grub2-install.patch
+6 -6
file changed
0178-grub2-btrfs-05-grub2-mkconfig.patch
+5 -5
file changed
0179-grub2-btrfs-06-subvol-mount.patch
+2 -2
file changed
0180-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch
+2 -2
file changed
0181-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch
+2 -2
file changed
0182-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch
+2 -2
file changed
0183-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch
+2 -2
file changed
0184-Use-grub_efi_.-memory-helpers-where-reasonable.patch
+3 -3
file changed
0185-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch
+2 -2
file changed
0186-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch
+2 -2
file changed
0187-don-t-ignore-const.patch
+2 -2
file changed
0188-don-t-use-int-for-efi-status.patch
+2 -2
file changed
0189-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch
+2 -2
file changed
0190-Clean-up-some-errors-in-the-linuxefi-loader.patch
+2 -2
file changed
0191-editenv-handle-relative-symlinks.patch
+2 -2
file changed
0192-Make-libgrub.pp-depend-on-config-util.h.patch
+2 -2
file changed
0193-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch
+2 -2
file changed
0194-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch
+2 -2
file changed
0195-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch
+2 -2
file changed
0196-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch
+2 -2
file changed
0197-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch
+2 -2
file changed
0198-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch
+30
file added
0199-Trivial-fix-for-an-error-message-in-get_header_from_.patch
+325
file added
0200-Add-quicksort-implementation.patch
+1140
file added
0201-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch
+169
file added
0202-Add-BLS-support-to-grub-mkconfig.patch
+36
file added
0203-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch
+30
file added
0204-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch
+167
file added
0205-Enable-blscfg-command-for-the-emu-platform.patch
+360
file added
0206-Add-linux-and-initrd-commands-for-grub-emu.patch
+4 -4
file changed
grub.macros
+8 -0
file changed
grub.patches
+4 -1
file changed
grub2.spec