diff --git a/0001-Bump-version-to-2.03.patch b/0001-Bump-version-to-2.03.patch index 9d1bec84..a8ba8e85 100644 --- a/0001-Bump-version-to-2.03.patch +++ b/0001-Bump-version-to-2.03.patch @@ -1,7 +1,7 @@ From b0bad6fd9449d3333fe1ab58953c0e6c1ce12c0d Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 3 May 2017 11:55:52 +0200 -Subject: [PATCH 001/250] Bump version to 2.03 +Subject: [PATCH] Bump version to 2.03 --- configure.ac | 2 +- @@ -225,6 +225,3 @@ index 68d8ce7c775..921e57ff48d 100644 { "videotest", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x1368a483, 0x1368a483, 0x1368a483, 0x1368a483, 0x1368a483, }, 5 }, { "videotest", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0x7033079c, 0x7033079c, 0x7033079c, 0x7033079c, 0x7033079c, }, 5 }, { "videotest", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xff583fbf, 0xff583fbf, 0xff583fbf, 0xff583fbf, 0xff583fbf, }, 5 }, --- -2.14.3 - diff --git a/0002-Remove-bashisms-from-tests.patch b/0002-Remove-bashisms-from-tests.patch index 7443bd72..9509ae11 100644 --- a/0002-Remove-bashisms-from-tests.patch +++ b/0002-Remove-bashisms-from-tests.patch @@ -1,7 +1,7 @@ From 5a0c548ba388b343b0bb6d2a38888e7eac5bbb96 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 03:47:13 +0300 -Subject: [PATCH 002/250] Remove bashisms from tests. +Subject: [PATCH] Remove bashisms from tests. Those tests don't actually need bash. Just use common shebang. --- @@ -128,6 +128,3 @@ index d5ef7f9ea62..80ebdc59fd5 100644 # create a randome file file="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1 --- -2.14.3 - diff --git a/0003-fs-tester-make-sh-compatible.patch b/0003-fs-tester-make-sh-compatible.patch index 662b6c21..039fbd31 100644 --- a/0003-fs-tester-make-sh-compatible.patch +++ b/0003-fs-tester-make-sh-compatible.patch @@ -1,7 +1,7 @@ From 37865c2c4ad26cd5e947b08abf1fde8145699919 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 14:35:59 +0300 -Subject: [PATCH 003/250] fs-tester: make sh-compatible +Subject: [PATCH] fs-tester: make sh-compatible --- tests/util/grub-fs-tester.in | 306 ++++++++++++++++++++++++------------------- @@ -741,6 +741,3 @@ index 2337771a1b9..4515d165e6e 100644 done if [ x"$fs" = x"zfs" ]; then rmdir "$MNTPOINTRW"/"grub fs" || true --- -2.14.3 - diff --git a/0004-support-busybox-date.patch b/0004-support-busybox-date.patch index cc941010..4c460c84 100644 --- a/0004-support-busybox-date.patch +++ b/0004-support-busybox-date.patch @@ -1,7 +1,7 @@ From b43b8cacc813c2c15347de1e35cc88d9aa912d22 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 14:31:36 +0300 -Subject: [PATCH 004/250] support busybox date. +Subject: [PATCH] support busybox date. Busybox date doesn't understand weekdays in -d input, so strip them beforehand. @@ -38,6 +38,3 @@ index 05b8f6b73fa..ac51d42098e 100644 # Ignore QEMU bug if [ "${grub_modinfo_target_cpu}" = arm ] && [ $((dt2 - dt1)) -ge 15 ] && [ $((dt2 - dt1)) -le 17 ]; then --- -2.14.3 - diff --git a/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch b/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch index 4a936607..500d9626 100644 --- a/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch +++ b/0005-Don-t-retrieve-fstime-when-it-s-not-useful.patch @@ -1,7 +1,7 @@ From 6dec3a26b37e128ded5d912e08abc5cee1592499 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 21:24:05 +0300 -Subject: [PATCH 005/250] Don't retrieve fstime when it's not useful. +Subject: [PATCH] Don't retrieve fstime when it's not useful. --- tests/util/grub-fs-tester.in | 48 ++++++++++++++++++++++---------------------- @@ -67,6 +67,3 @@ index 4515d165e6e..bf47305f3e8 100644 fi if [ x$NOHARDLINK != xy ]; then --- -2.14.3 - diff --git a/0006-Support-lseek64.patch b/0006-Support-lseek64.patch index 51c42c75..19e0f129 100644 --- a/0006-Support-lseek64.patch +++ b/0006-Support-lseek64.patch @@ -1,7 +1,7 @@ From 608bec51128008afb81c9e3f297283e9f830a146 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 20:21:05 +0300 -Subject: [PATCH 006/250] Support lseek64. +Subject: [PATCH] Support lseek64. Android doesn't have 64-bit off_t, so use off64_t instead. --- @@ -49,6 +49,3 @@ index 2a8c5882e3d..5450cf4166e 100644 return 0; } --- -2.14.3 - diff --git a/0007-Use-SHELL-rather-than-bin-sh.patch b/0007-Use-SHELL-rather-than-bin-sh.patch index e657d470..a887972e 100644 --- a/0007-Use-SHELL-rather-than-bin-sh.patch +++ b/0007-Use-SHELL-rather-than-bin-sh.patch @@ -1,7 +1,7 @@ From c2ea443446b7feea868e54f94a87781f69820375 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 00:55:30 +0300 -Subject: [PATCH 007/250] Use $(SHELL) rather than /bin/sh. +Subject: [PATCH] Use $(SHELL) rather than /bin/sh. /bin/sh doesn't exist under termux. --- @@ -21,6 +21,3 @@ index 04e9395fd94..809a8aa26bf 100644 rm -f symlist.p CLEANFILES += symlist.c BUILT_SOURCES += symlist.c --- -2.14.3 - diff --git a/0008-po-Use-SHELL-rather-than-bin-sh.patch b/0008-po-Use-SHELL-rather-than-bin-sh.patch index ef7abc94..7bdb3d70 100644 --- a/0008-po-Use-SHELL-rather-than-bin-sh.patch +++ b/0008-po-Use-SHELL-rather-than-bin-sh.patch @@ -1,7 +1,7 @@ From 4341f82af0b61d3dfbe675670d4105dc759c0df3 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 14:54:03 +0300 -Subject: [PATCH 008/250] po: Use @SHELL@ rather than /bin/sh. +Subject: [PATCH] po: Use @SHELL@ rather than /bin/sh. /bin/sh might not exist. --- @@ -21,6 +21,3 @@ index 3619458e85f..e68e9da843d 100644 @SET_MAKE@ srcdir = @srcdir@ --- -2.14.3 - diff --git a/0009-Add-termux-path-to-dict.patch b/0009-Add-termux-path-to-dict.patch index 2ae96134..0f3ad6d9 100644 --- a/0009-Add-termux-path-to-dict.patch +++ b/0009-Add-termux-path-to-dict.patch @@ -1,7 +1,7 @@ From 1073ddb12078f3c8edbdb74bb8f5afc674983f40 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 23 Jan 2017 14:52:48 +0300 -Subject: [PATCH 009/250] Add termux path to dict. +Subject: [PATCH] Add termux path to dict. --- tests/util/grub-fs-tester.in | 2 +- @@ -20,6 +20,3 @@ index bf47305f3e8..468d9e7856d 100644 if test -f "$cand" ; then CFILESRC="$cand" break --- -2.14.3 - diff --git a/0010-Fix-shebang-for-termux.patch b/0010-Fix-shebang-for-termux.patch index 910d4718..9c75c276 100644 --- a/0010-Fix-shebang-for-termux.patch +++ b/0010-Fix-shebang-for-termux.patch @@ -1,7 +1,7 @@ From a827807a1330d5ad619faa103bc7f12d89fc8bee Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 22 Jan 2017 20:22:34 +0300 -Subject: [PATCH 010/250] Fix shebang for termux. +Subject: [PATCH] Fix shebang for termux. Termux doesn't have a /bin/sh. So we needto use $SHELL. Keep /bin/sh as much as possible. @@ -679,6 +679,3 @@ index 047120e47a0..eee62c10d70 100644 set -e --- -2.14.3 - diff --git a/0011-Add-strtoull-test.patch b/0011-Add-strtoull-test.patch index 9e1d419b..21b35863 100644 --- a/0011-Add-strtoull-test.patch +++ b/0011-Add-strtoull-test.patch @@ -1,7 +1,7 @@ From ede6c9689395499f98a4c14d76b97151b4de5f54 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 3 May 2017 12:58:15 +0200 -Subject: [PATCH 011/250] Add strtoull test. +Subject: [PATCH] Add strtoull test. --- grub-core/Makefile.core.def | 5 +++++ @@ -23,6 +23,3 @@ index 2dfa22a9271..8dcd0e5a998 100644 module = { name = setjmp_test; common = tests/setjmp_test.c; --- -2.14.3 - diff --git a/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch b/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch index 2f3c3aa4..261535d5 100644 --- a/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch +++ b/0012-strtoull-Fix-behaviour-on-chars-between-9-and-a.patch @@ -1,7 +1,7 @@ From dc6e1b5af83eb1c4290baf97c2d221c0865127be Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 10 Aug 2016 17:49:42 +0200 -Subject: [PATCH 012/250] strtoull: Fix behaviour on chars between '9' and 'a'. +Subject: [PATCH] strtoull: Fix behaviour on chars between '9' and 'a'. Reported by: Aaron Miller --- @@ -63,6 +63,3 @@ index d4822a12456..96781fb39b5 100644 grub_errno = 0; ok = ok && !grub_test_run (test); grub_errno = 0; --- -2.14.3 - diff --git a/0013-Add-Virtual-LAN-support.patch b/0013-Add-Virtual-LAN-support.patch index cce0a377..d29032a5 100644 --- a/0013-Add-Virtual-LAN-support.patch +++ b/0013-Add-Virtual-LAN-support.patch @@ -1,7 +1,7 @@ From d9f7de0ae3c0c09cff7257c55418450261f3e082 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Mon, 23 Dec 2013 12:32:02 -0200 -Subject: [PATCH 013/250] Add Virtual LAN support. +Subject: [PATCH] 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 @@ -344,6 +344,3 @@ index dcceaa56894..ab9d68f9825 100644 grub_err_t grub_net_send_ip_packet (struct grub_net_network_level_interface *inf, --- -2.14.3 - diff --git a/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch b/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch index c589e5e3..5f1c0d89 100644 --- a/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch +++ b/0014-mkimage-Pass-layout-to-mkimage_generate_elfXX-rather.patch @@ -1,8 +1,8 @@ From a35ac854308b0af7c86c2c7b199f6abdfa2110b0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 17:32:15 +0200 -Subject: [PATCH 014/250] mkimage: Pass layout to mkimage_generate_elfXX rather - than some fields. +Subject: [PATCH] mkimage: Pass layout to mkimage_generate_elfXX rather than + some fields. This allows easier extension of this function without having too long of arguments list. @@ -163,6 +163,3 @@ index 1a18708a89c..b3a5ca132bc 100644 struct grub_install_image_target_desc { --- -2.14.3 - diff --git a/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch b/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch index 17fd0008..b9f55d56 100644 --- a/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch +++ b/0015-Refactor-arm-uboot-code-to-make-it-genereic.patch @@ -1,7 +1,7 @@ From d08c9685149e7788001ac9a209baa1d84c3628e0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 17:47:57 +0200 -Subject: [PATCH 015/250] Refactor arm-uboot code to make it genereic. +Subject: [PATCH] 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. @@ -400,6 +400,3 @@ index 00000000000..d128775f19e + .long 0 @ + + END --- -2.14.3 - diff --git a/0016-coreboot-Split-parts-that-are-platform-independent.patch b/0016-coreboot-Split-parts-that-are-platform-independent.patch index 2aca1207..782af52f 100644 --- a/0016-coreboot-Split-parts-that-are-platform-independent.patch +++ b/0016-coreboot-Split-parts-that-are-platform-independent.patch @@ -1,7 +1,7 @@ From 461bfab7b7e47fd0a76bf6076a438af1b7e2184a Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 19:06:22 +0200 -Subject: [PATCH 016/250] coreboot: Split parts that are platform-independent. +Subject: [PATCH] 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. @@ -339,6 +339,3 @@ index 809a8aa26bf..781d0ffbf75 100644 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h --- -2.14.3 - diff --git a/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch b/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch index 90b37e13..2c531206 100644 --- a/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch +++ b/0017-Rename-uboot-halt.c-to-dummy-halt.c.patch @@ -1,7 +1,7 @@ From 1daa716c7017f1858de117a20a31da66815435c5 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 19:31:55 +0200 -Subject: [PATCH 017/250] Rename uboot/halt.c to dummy/halt.c. +Subject: [PATCH] Rename uboot/halt.c to dummy/halt.c. It's not U-Boot specific and it's a stub. --- @@ -27,6 +27,3 @@ diff --git a/grub-core/lib/uboot/halt.c b/grub-core/lib/dummy/halt.c similarity index 100% rename from grub-core/lib/uboot/halt.c rename to grub-core/lib/dummy/halt.c --- -2.14.3 - diff --git a/0018-Rename-uboot-datetime-to-dummy-datetime.patch b/0018-Rename-uboot-datetime-to-dummy-datetime.patch index e7384434..61b00b58 100644 --- a/0018-Rename-uboot-datetime-to-dummy-datetime.patch +++ b/0018-Rename-uboot-datetime-to-dummy-datetime.patch @@ -1,7 +1,7 @@ From 9808c3ef956c6472a96790b60cf74f4eaa742010 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 19:37:29 +0200 -Subject: [PATCH 018/250] Rename uboot/datetime to dummy/datetime. +Subject: [PATCH] Rename uboot/datetime to dummy/datetime. It's just a stub and is not UBoot-specific. --- @@ -53,6 +53,3 @@ index 4be716928a5..cf693fc6b62 100644 - "can\'t set datetime using U-Boot"); + "can\'t set datetime on this machine"); } --- -2.14.3 - diff --git a/0019-arm-coreboot-Start-new-port.patch b/0019-arm-coreboot-Start-new-port.patch index f467e912..a3929135 100644 --- a/0019-arm-coreboot-Start-new-port.patch +++ b/0019-arm-coreboot-Start-new-port.patch @@ -1,7 +1,7 @@ From 24e37a885269bdec9b27babf1da0bba3692d55c0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 20:53:28 +0200 -Subject: [PATCH 019/250] arm-coreboot: Start new port. +Subject: [PATCH] arm-coreboot: Start new port. --- configure.ac | 2 + @@ -822,6 +822,3 @@ index 781d0ffbf75..bec0585549a 100644 if COND_arm_efi KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/efi/loader.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h --- -2.14.3 - diff --git a/0020-Add-support-for-device-tree-based-drivers.patch b/0020-Add-support-for-device-tree-based-drivers.patch index 9d75d63c..145b1a6a 100644 --- a/0020-Add-support-for-device-tree-based-drivers.patch +++ b/0020-Add-support-for-device-tree-based-drivers.patch @@ -1,7 +1,7 @@ From fcbb723d4b1f7ad4687191562621dd0eb25f4d9e Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:19:59 +0200 -Subject: [PATCH 020/250] Add support for device-tree-based drivers. +Subject: [PATCH] Add support for device-tree-based drivers. --- grub-core/Makefile.core.def | 2 + @@ -851,6 +851,3 @@ index bec0585549a..fc6ca305147 100644 parttool.lst: $(MARKER_FILES) (for pp in $^; do \ b=`basename $$pp .marker`; \ --- -2.14.3 - diff --git a/0021-arm-coreboot-Support-for-vexpress-timer.patch b/0021-arm-coreboot-Support-for-vexpress-timer.patch index 8716273b..4653775c 100644 --- a/0021-arm-coreboot-Support-for-vexpress-timer.patch +++ b/0021-arm-coreboot-Support-for-vexpress-timer.patch @@ -1,7 +1,7 @@ From 5a865b37866ee8cd64c080bc6fb1e537f8e2b3c6 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:26:36 +0200 -Subject: [PATCH 021/250] arm-coreboot: Support for vexpress timer. +Subject: [PATCH] arm-coreboot: Support for vexpress timer. --- grub-core/kern/arm/coreboot/timer.c | 36 ++++++++++++++++++++++++++++++++++++ @@ -68,6 +68,3 @@ index ebefb99d58f..d97b844f848 100644 if (!have_timer) try_generic_timer (); if (!have_timer) --- -2.14.3 - diff --git a/0022-arm-coreboot-Export-FDT-routines.patch b/0022-arm-coreboot-Export-FDT-routines.patch index 6a498823..b7196377 100644 --- a/0022-arm-coreboot-Export-FDT-routines.patch +++ b/0022-arm-coreboot-Export-FDT-routines.patch @@ -1,7 +1,7 @@ From ac6b41b89fbb82a3ba843a7ed19115d81432b604 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:29:48 +0200 -Subject: [PATCH 022/250] arm-coreboot: Export FDT routines. +Subject: [PATCH] arm-coreboot: Export FDT routines. We need to use them from modules as well. --- @@ -22,6 +22,3 @@ index fc6ca305147..147e6959c97 100644 endif if COND_arm_efi --- -2.14.3 - diff --git a/0023-at_keyboard-Split-protocol-from-controller-code.patch b/0023-at_keyboard-Split-protocol-from-controller-code.patch index 3895cf20..b680ba9c 100644 --- a/0023-at_keyboard-Split-protocol-from-controller-code.patch +++ b/0023-at_keyboard-Split-protocol-from-controller-code.patch @@ -1,7 +1,7 @@ From 216950a4eea1a1ead1c28eaca94e34ea2ef2ad19 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:41:22 +0200 -Subject: [PATCH 023/250] at_keyboard: Split protocol from controller code. +Subject: [PATCH] at_keyboard: Split protocol from controller code. On vexpress controller is different but protocol is the same, so reuse the code. @@ -1023,6 +1023,3 @@ index 00000000000..4f2e527e497 + grub_uint8_t data); + +#endif --- -2.14.3 - diff --git a/0024-arm_coreboot-Support-keyboard-for-vexpress.patch b/0024-arm_coreboot-Support-keyboard-for-vexpress.patch index d1dcc177..9f15319d 100644 --- a/0024-arm_coreboot-Support-keyboard-for-vexpress.patch +++ b/0024-arm_coreboot-Support-keyboard-for-vexpress.patch @@ -1,7 +1,7 @@ From 848bed9d92cf20e9f25db4c69a20efad23996ca0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:42:37 +0200 -Subject: [PATCH 024/250] arm_coreboot: Support keyboard for vexpress. +Subject: [PATCH] arm_coreboot: Support keyboard for vexpress. --- grub-core/Makefile.core.def | 3 + @@ -244,6 +244,3 @@ index 147e6959c97..a2aaf9f54b0 100644 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h --- -2.14.3 - diff --git a/0025-arm_coreboot-Support-grub-mkstandalone.patch b/0025-arm_coreboot-Support-grub-mkstandalone.patch index eb345d68..89b57447 100644 --- a/0025-arm_coreboot-Support-grub-mkstandalone.patch +++ b/0025-arm_coreboot-Support-grub-mkstandalone.patch @@ -1,7 +1,7 @@ From 3edabad8fefb112cc4b2d43be6e97d43c909ceee Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 21:59:48 +0200 -Subject: [PATCH 025/250] arm_coreboot: Support grub-mkstandalone. +Subject: [PATCH] arm_coreboot: Support grub-mkstandalone. --- util/grub-install-common.c | 12 ++++++++++-- @@ -153,6 +153,3 @@ index 6abd288c313..5910b0c09bc 100644 }; extern char *grub_install_source_directory; --- -2.14.3 - diff --git a/0026-arm_coreboot-Support-loading-linux-images.patch b/0026-arm_coreboot-Support-loading-linux-images.patch index aed74fff..1198dafe 100644 --- a/0026-arm_coreboot-Support-loading-linux-images.patch +++ b/0026-arm_coreboot-Support-loading-linux-images.patch @@ -1,7 +1,7 @@ From 656c3b0d7fbe23f0e1ab561c8faa4ac4a37364d1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 22:00:06 +0200 -Subject: [PATCH 026/250] arm_coreboot: Support loading linux images. +Subject: [PATCH] arm_coreboot: Support loading linux images. --- grub-core/loader/arm/linux.c | 132 ++++++++++++++++++++++--------------------- @@ -297,6 +297,3 @@ index a66caad13db..f217f8281ad 100644 #endif #define FDT_ADDITIONAL_ENTRIES_SIZE 0x300 --- -2.14.3 - diff --git a/0027-arm_coreboot-Support-DMA.patch b/0027-arm_coreboot-Support-DMA.patch index d2af6b89..414370d7 100644 --- a/0027-arm_coreboot-Support-DMA.patch +++ b/0027-arm_coreboot-Support-DMA.patch @@ -1,7 +1,7 @@ From 265292f2b0da0eb414c409871ba0f94a99ec33c1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 22:06:04 +0200 -Subject: [PATCH 027/250] arm_coreboot: Support DMA. +Subject: [PATCH] arm_coreboot: Support DMA. This is needed to support USB and some other busses. --- @@ -287,6 +287,3 @@ index a2aaf9f54b0..10451384720 100644 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/coreboot/kernel.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fdtbus.h endif --- -2.14.3 - diff --git a/0028-ehci-Split-core-code-from-PCI-part.patch b/0028-ehci-Split-core-code-from-PCI-part.patch index 8860c1f3..b64bf2b2 100644 --- a/0028-ehci-Split-core-code-from-PCI-part.patch +++ b/0028-ehci-Split-core-code-from-PCI-part.patch @@ -1,7 +1,7 @@ From 058df7b5a9cc7aaa9872eaa916b715544a8f9840 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 22:10:26 +0200 -Subject: [PATCH 028/250] ehci: Split core code from PCI part. +Subject: [PATCH] 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. @@ -566,6 +566,3 @@ index 5f4297bb21e..c772e76546e 100644 grub_boot_time ("Registering EHCI driver"); grub_usb_controller_dev_register (&usb_controller); grub_boot_time ("EHCI driver registered"); --- -2.14.3 - diff --git a/0029-arm_coreboot-Support-EHCI.patch b/0029-arm_coreboot-Support-EHCI.patch index e2c07ca6..e654a1d5 100644 --- a/0029-arm_coreboot-Support-EHCI.patch +++ b/0029-arm_coreboot-Support-EHCI.patch @@ -1,7 +1,7 @@ From d11ced1e1fb93676942e51618eb53c140f541890 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 8 May 2017 22:14:28 +0200 -Subject: [PATCH 029/250] arm_coreboot: Support EHCI. +Subject: [PATCH] arm_coreboot: Support EHCI. --- grub-core/Makefile.core.def | 2 ++ @@ -118,6 +118,3 @@ index ed268178b4d..da67965a41a 100644 # If gfxterm is main output console integrate it into kernel GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot", "arm_coreboot" ] --- -2.14.3 - diff --git a/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch b/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch index 9347b21d..b756d2bc 100644 --- a/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch +++ b/0030-Fix-bug-on-FDT-nodes-with-compatible-property.patch @@ -1,7 +1,7 @@ From 4f8471532d454b2db96434c28bf7105ed69e0f4d Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 08:39:40 +0200 -Subject: [PATCH 030/250] Fix bug on FDT nodes with compatible property +Subject: [PATCH] Fix bug on FDT nodes with compatible property --- grub-core/bus/fdt.c | 2 ++ @@ -20,6 +20,3 @@ index 6fb077000a5..34d53545732 100644 const char *compatible_end = compatible + compatible_size; while (compatible < compatible_end) { --- -2.14.3 - diff --git a/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch b/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch index ef62f2c5..a4171bd4 100644 --- a/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch +++ b/0031-fdtbus-Add-ability-to-send-receive-messages-on-paren.patch @@ -1,8 +1,8 @@ From c4313c812dc14e82a774b580b5e34d40e7f3fae6 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 08:40:29 +0200 -Subject: [PATCH 031/250] fdtbus: Add ability to send/receive messages on - parent busses. +Subject: [PATCH] fdtbus: Add ability to send/receive messages on parent + busses. --- grub-core/bus/fdt.c | 35 +++++++++++++++++------------------ @@ -129,6 +129,3 @@ index 985837e55f6..f519c40ec35 100644 /* Must be called before any register(). */ /* dtb is assumed to be unfreeable and must remain valid for lifetime of GRUB. --- -2.14.3 - diff --git a/0032-rk3288_spi-Add-SPI-driver.patch b/0032-rk3288_spi-Add-SPI-driver.patch index e97cda64..ea989323 100644 --- a/0032-rk3288_spi-Add-SPI-driver.patch +++ b/0032-rk3288_spi-Add-SPI-driver.patch @@ -1,7 +1,7 @@ From b0b1b81a11f8bae8ab9e8edd87ac3f4f7949d03b Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 08:42:14 +0200 -Subject: [PATCH 032/250] rk3288_spi: Add SPI driver +Subject: [PATCH] rk3288_spi: Add SPI driver --- grub-core/Makefile.core.def | 1 + @@ -160,6 +160,3 @@ index 09cd7fe328c..26950534270 100644 extern grub_addr_t EXPORT_VAR (start_of_ram); #endif /* ! ASM_FILE */ --- -2.14.3 - diff --git a/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch b/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch index 452fb64f..580ed9f9 100644 --- a/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch +++ b/0033-arm_coreboot-Add-Chromebook-keyboard-driver.patch @@ -1,7 +1,7 @@ From 5c3fd1b135bd73c8e3467b9b635b25ca4d360a19 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 08:47:34 +0200 -Subject: [PATCH 033/250] arm_coreboot: Add Chromebook keyboard driver. +Subject: [PATCH] arm_coreboot: Add Chromebook keyboard driver. --- grub-core/term/arm/cros.c | 125 +++++++++++++++++++++++ @@ -414,6 +414,3 @@ index 00000000000..45a372572a5 +grub_cros_ec_validate (const struct grub_fdtbus_dev *dev); + +#endif --- -2.14.3 - diff --git a/0034-Missing-parts-of-previous-commit.patch b/0034-Missing-parts-of-previous-commit.patch index 69020a0a..d473dd0e 100644 --- a/0034-Missing-parts-of-previous-commit.patch +++ b/0034-Missing-parts-of-previous-commit.patch @@ -1,7 +1,7 @@ From c6eaa982d12e3cfc5465dda5ea372774188b6b81 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 09:02:15 +0200 -Subject: [PATCH 034/250] Missing parts of previous commit +Subject: [PATCH] Missing parts of previous commit --- grub-core/Makefile.core.def | 2 ++ @@ -33,6 +33,3 @@ index 0126ff6381a..8d8c5b8291e 100644 grub_pl050_init (); } --- -2.14.3 - diff --git a/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch b/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch index 7380fa40..f613a6e0 100644 --- a/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch +++ b/0035-coreboot-Changed-cbmemc-to-support-updated-console-f.patch @@ -1,8 +1,8 @@ From 70b555a52a065b2beb91e6fc97a6b358c931b303 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 9 May 2017 09:03:02 +0200 -Subject: [PATCH 035/250] coreboot: Changed cbmemc to support updated console - format from coreboot. +Subject: [PATCH] coreboot: Changed cbmemc to support updated console format + from coreboot. --- grub-core/term/i386/coreboot/cbmemc.c | 50 ++++++++++++++++++++++++----------- @@ -93,6 +93,3 @@ index 129248c7f47..cea9b84315b 100644 return 0; } --- -2.14.3 - diff --git a/0036-at_keyboard-Fix-falco-chromebook-case.patch b/0036-at_keyboard-Fix-falco-chromebook-case.patch index f3f37de4..681ba27e 100644 --- a/0036-at_keyboard-Fix-falco-chromebook-case.patch +++ b/0036-at_keyboard-Fix-falco-chromebook-case.patch @@ -1,7 +1,7 @@ From c4b8bec5fee4e30a165fd14a188cf3ab8eccd095 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 9 May 2017 14:27:52 +0200 -Subject: [PATCH 036/250] at_keyboard: Fix falco chromebook case. +Subject: [PATCH] at_keyboard: Fix falco chromebook case. EC is slow, so we need few delays for it to toggle the bits correctly. @@ -84,6 +84,3 @@ index b031523eb7d..bcb4d9ba78f 100644 #define KEYBOARD_ISMAKE(x) !((x) & 0x80) #define KEYBOARD_ISREADY(x) ((x) & 0x01) --- -2.14.3 - diff --git a/0037-sparc64-Close-cdboot-ihandle.patch b/0037-sparc64-Close-cdboot-ihandle.patch index 6cd29db6..f9a01b05 100644 --- a/0037-sparc64-Close-cdboot-ihandle.patch +++ b/0037-sparc64-Close-cdboot-ihandle.patch @@ -1,7 +1,7 @@ From bd4e40aadded7093908d786d03b4acf60b7b1707 Mon Sep 17 00:00:00 2001 From: Eric Snowberg Date: Thu, 11 May 2017 18:42:23 -0700 -Subject: [PATCH 037/250] sparc64: Close cdboot ihandle +Subject: [PATCH] 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 @@ -43,6 +43,3 @@ index 586efb4014e..9ea9b4e0662 100644 #else mov 512, %o3 #endif --- -2.14.3 - diff --git a/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch b/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch index 97bf380c..e1fdda71 100644 --- a/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch +++ b/0038-arm64-xen_boot-Fix-Xen-boot-using-GRUB2-on-AARCH64.patch @@ -1,7 +1,7 @@ From ae5817f1dcbf0b99f7a849f56afe442165317840 Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Fri, 19 Feb 2016 16:28:52 +0000 -Subject: [PATCH 038/250] arm64/xen_boot: Fix Xen boot using GRUB2 on AARCH64 +Subject: [PATCH] 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 @@ -27,6 +27,3 @@ index a914eb8e2df..8ae43d7e894 100644 if (retval) return grub_error (GRUB_ERR_IO, "failed to update FDT"); --- -2.14.3 - diff --git a/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch b/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch index b1aff5a2..052776e9 100644 --- a/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch +++ b/0039-arm64-Add-nounzip-option-support-in-xen_module-comma.patch @@ -1,8 +1,7 @@ From 8eed7be8a61c295df700e918744a984162378ca9 Mon Sep 17 00:00:00 2001 From: Fu Wei Date: Sun, 14 May 2017 15:43:45 +0800 -Subject: [PATCH 039/250] arm64: Add "--nounzip" option support in xen_module - command +Subject: [PATCH] arm64: Add "--nounzip" option support in xen_module command This patch adds "--nounzip" option support in order to be compatible with the module command of multiboot on other architecture, @@ -51,6 +50,3 @@ index 8ae43d7e894..27ede46cac5 100644 file = grub_file_open (argv[0]); if (!file) goto fail; --- -2.14.3 - diff --git a/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch b/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch index a3263db7..6f3daf23 100644 --- a/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch +++ b/0040-util-grub.d-20_linux_xen.in-Add-xen_boot-command-sup.patch @@ -1,8 +1,8 @@ From d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe Mon Sep 17 00:00:00 2001 From: Fu Wei Date: Sun, 14 May 2017 15:43:46 +0800 -Subject: [PATCH 040/250] util/grub.d/20_linux_xen.in: Add xen_boot command - support for aarch64 +Subject: [PATCH] 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: xen_hypervisor @@ -58,6 +58,3 @@ index c48af948d6e..c002fc9f946 100644 while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` gettext_printf "Found linux image: %s\n" "$linux" >&2 --- -2.14.3 - diff --git a/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch b/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch index ba04db1a..69021790 100644 --- a/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch +++ b/0041-arm64-Update-the-introduction-of-Xen-boot-commands-i.patch @@ -1,8 +1,8 @@ From 26c2f306fd425d2c0348023b8dcb7eb40a01851a Mon Sep 17 00:00:00 2001 From: Fu Wei Date: Sun, 14 May 2017 15:43:47 +0800 -Subject: [PATCH 041/250] arm64: Update the introduction of Xen boot commands - in docs/grub.texi +Subject: [PATCH] arm64: Update the introduction of Xen boot commands in + docs/grub.texi delete: xen_linux, xen_initrd, xen_xsm add: xen_module @@ -88,6 +88,3 @@ index e935af33ea5..a0c4b9e4e8e 100644 @node Networking commands @section The list of networking commands --- -2.14.3 - diff --git a/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch b/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch index a73dab9c..62c58601 100644 --- a/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch +++ b/0042-sparc64-Don-t-use-devspec-to-determine-the-OBP-path.patch @@ -1,7 +1,7 @@ From f8679cedff703b437171f4708d46adbfcff80a65 Mon Sep 17 00:00:00 2001 From: Eric Snowberg Date: Thu, 18 May 2017 17:10:22 -0600 -Subject: [PATCH 042/250] sparc64: Don't use devspec to determine the OBP path +Subject: [PATCH] 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: @@ -48,6 +48,3 @@ index a79682a5e31..dce4e59d081 100644 if (fd < 0 || fstat (fd, &st) < 0) { --- -2.14.3 - diff --git a/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch b/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch index 4f8be9b9..23ea96c0 100644 --- a/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch +++ b/0043-Allow-GRUB-to-mount-ext2-3-4-filesystems-that-have-t.patch @@ -1,8 +1,8 @@ From 734668238fcc0ef691a080839e04f33854fa133a Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Thu, 29 Jun 2017 13:27:49 +0000 -Subject: [PATCH 043/250] Allow GRUB to mount ext2/3/4 filesystems that have - the encryption feature. +Subject: [PATCH] Allow GRUB to mount ext2/3/4 filesystems that have the + encryption feature. On such a filesystem, inodes may have EXT4_ENCRYPT_FLAG set. For a regular file, this means its contents are encrypted; for a @@ -135,6 +135,3 @@ index 88cbe7365e9..fd7e0f14b68 100644 xext*) MKE2FS_DEVICE_SECTSIZE=$SECSIZE "mkfs.$fs" -b $BLKSIZE -L "$FSLABEL" -q "${MOUNTDEVICE}" ;; xxfs) --- -2.14.3 - diff --git a/0044-ehci-Fix-compilation-for-amd64.patch b/0044-ehci-Fix-compilation-for-amd64.patch index 3f99f1d9..251d3a6e 100644 --- a/0044-ehci-Fix-compilation-for-amd64.patch +++ b/0044-ehci-Fix-compilation-for-amd64.patch @@ -1,7 +1,7 @@ From edb37fb30bbc8a3b6bec67911c7200e4eb071127 Mon Sep 17 00:00:00 2001 From: phcoder Date: Sun, 9 Jul 2017 20:58:31 +0200 -Subject: [PATCH 044/250] ehci: Fix compilation for amd64 +Subject: [PATCH] ehci: Fix compilation for amd64 --- grub-core/bus/usb/ehci.c | 8 ++++---- @@ -33,6 +33,3 @@ index c772e76546e..7b7061f5335 100644 grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n", grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND)); grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n", --- -2.14.3 - diff --git a/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch b/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch index 95e056bf..a7b7a2ae 100644 --- a/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch +++ b/0045-cache-Fix-compilation-for-ppc-sparc-and-arm64.patch @@ -1,7 +1,7 @@ From d8901e3ba115d705c9c08ecedd201aca8b4867b8 Mon Sep 17 00:00:00 2001 From: phcoder Date: Sun, 9 Jul 2017 20:59:15 +0200 -Subject: [PATCH 045/250] cache: Fix compilation for ppc, sparc and arm64 +Subject: [PATCH] cache: Fix compilation for ppc, sparc and arm64 --- include/grub/cache.h | 4 +++- @@ -22,6 +22,3 @@ index 1c98ce270b6..ccfa717e669 100644 static inline void grub_arch_sync_dma_caches (volatile void *address __attribute__ ((unused)), grub_size_t len __attribute__ ((unused))) --- -2.14.3 - diff --git a/0046-ehci-Fix-compilation-on-i386.patch b/0046-ehci-Fix-compilation-on-i386.patch index c67e8128..e1cd372f 100644 --- a/0046-ehci-Fix-compilation-on-i386.patch +++ b/0046-ehci-Fix-compilation-on-i386.patch @@ -1,7 +1,7 @@ From 284afab081ef7ed7db2c59151853aa3c92d988f2 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 9 Jul 2017 21:31:19 +0200 -Subject: [PATCH 046/250] ehci: Fix compilation on i386 +Subject: [PATCH] ehci: Fix compilation on i386 --- grub-core/bus/usb/ehci.c | 4 ++-- @@ -29,6 +29,3 @@ index 7b7061f5335..d966fc21002 100644 grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: COMMAND: %08x\n", grub_ehci_oper_read32 (e, GRUB_EHCI_COMMAND)); grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: STATUS: %08x\n", --- -2.14.3 - diff --git a/0047-crypto-Fix-use-after-free.patch b/0047-crypto-Fix-use-after-free.patch index 8903e29b..a4b94fef 100644 --- a/0047-crypto-Fix-use-after-free.patch +++ b/0047-crypto-Fix-use-after-free.patch @@ -1,7 +1,7 @@ From a0fe0c26aa8a1c0ad66d9527611bd726b849c623 Mon Sep 17 00:00:00 2001 From: AppChecker Date: Sun, 9 Jul 2017 21:57:35 +0200 -Subject: [PATCH 047/250] crypto: Fix use after free. +Subject: [PATCH] crypto: Fix use after free. Reported by: AppChecker Transformed to patch by: Satish Govindarajan @@ -23,6 +23,3 @@ index 2bfd67c8ef3..e6d345f3345 100644 continue; } cur->next = crypto_specs; --- -2.14.3 - diff --git a/0048-arm-efi-Fix-compilation.patch b/0048-arm-efi-Fix-compilation.patch index dcf9e0a6..05286688 100644 --- a/0048-arm-efi-Fix-compilation.patch +++ b/0048-arm-efi-Fix-compilation.patch @@ -1,7 +1,7 @@ From cb8b7e4e36bf32dccbbba8252aa44ad3ada4fbc1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 9 Jul 2017 21:48:37 +0000 -Subject: [PATCH 048/250] arm-efi: Fix compilation +Subject: [PATCH] arm-efi: Fix compilation --- grub-core/loader/arm/linux.c | 8 ++++---- @@ -36,6 +36,3 @@ index 260cbf06861..e64c79a9577 100644 machine_type = grub_arm_firmware_get_machine_type (); } --- -2.14.3 - diff --git a/0049-fdt-silence-clang-warning.patch b/0049-fdt-silence-clang-warning.patch index ad39c24c..a276806e 100644 --- a/0049-fdt-silence-clang-warning.patch +++ b/0049-fdt-silence-clang-warning.patch @@ -1,7 +1,7 @@ From 68d54b55f49249c5e0517bf189f0f3df7ee6a36f Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 10 Jul 2017 01:34:22 +0000 -Subject: [PATCH 049/250] fdt: silence clang warning. +Subject: [PATCH] fdt: silence clang warning. --- grub-core/lib/fdt.c | 3 ++- @@ -21,6 +21,3 @@ index bdc6302448d..2705f2629b9 100644 if (ptr >= (char *) end) return 0; return token; --- -2.14.3 - diff --git a/0050-Fix-a-segfault-in-lsefi.patch b/0050-Fix-a-segfault-in-lsefi.patch index ae69ebe9..676fa6a6 100644 --- a/0050-Fix-a-segfault-in-lsefi.patch +++ b/0050-Fix-a-segfault-in-lsefi.patch @@ -1,7 +1,7 @@ From e8ab5a1a9e2889eb59d1fa494ba441a53698dcd2 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 19 Jul 2017 15:47:41 -0400 -Subject: [PATCH 050/250] Fix a segfault in lsefi +Subject: [PATCH] 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. @@ -28,6 +28,3 @@ index d901c389263..d1ce99af438 100644 for (j = 0; j < num_protocols; j++) { for (k = 0; k < ARRAY_SIZE (known_protocols); k++) --- -2.14.3 - diff --git a/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch b/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch index 7386444b..5afa6269 100644 --- a/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch +++ b/0051-zfs-remove-size_t-typedef-and-use-grub_size_t-instea.patch @@ -1,8 +1,7 @@ From fa42786264cef98c56e972b3bb6b8448000e1c70 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 3 Aug 2017 15:46:15 +0100 -Subject: [PATCH 051/250] zfs: remove size_t typedef and use grub_size_t - instead +Subject: [PATCH] zfs: remove size_t typedef and use grub_size_t instead * Prevents some toolchains from issuing a warning on size_t redef. --- @@ -54,6 +53,3 @@ index 2f73449f0d4..5453822d025 100644 #else const int dec2 = 0; #endif --- -2.14.3 - diff --git a/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch b/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch index a9ffcc11..2634b5a4 100644 --- a/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch +++ b/0052-udf-Fix-reading-label-lvd.ident-is-dstring.patch @@ -1,7 +1,7 @@ From 76188809d5ca40c5285b0ab202b5edea7be3f04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Thu, 22 Jun 2017 14:33:17 +0200 -Subject: [PATCH 052/250] udf: Fix reading label, lvd.ident is dstring +Subject: [PATCH] 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 @@ -49,6 +49,3 @@ index 839bff88963..2587456336e 100644 grub_free (data); } else --- -2.14.3 - diff --git a/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch b/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch index 1825e849..126227d8 100644 --- a/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch +++ b/0053-grub-core-fs-udf.c-Add-support-for-UUID.patch @@ -1,7 +1,7 @@ From 435fa75e01ef40917239c7f775e505e86f70d202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Thu, 22 Jun 2017 14:42:16 +0200 -Subject: [PATCH 053/250] * grub-core/fs/udf.c: Add support for UUID +Subject: [PATCH] * grub-core/fs/udf.c: Add support for UUID Use same algorithm as in libblkid from util-linux v2.30. @@ -186,6 +186,3 @@ index 2587456336e..00a16098b47 100644 #ifdef GRUB_UTIL .reserved_first_sector = 1, .blocklist_install = 1, --- -2.14.3 - diff --git a/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch b/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch index e089c8e7..b43ad2b2 100644 --- a/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch +++ b/0054-mkrescue-Check-xorriso-presence-before-doing-anythin.patch @@ -1,8 +1,7 @@ From 9e962fd3c42081e2eef1f99a0eaab38fd04d2620 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 7 Aug 2017 18:05:17 +0200 -Subject: [PATCH 054/250] mkrescue: Check xorriso presence before doing - anything else. +Subject: [PATCH] mkrescue: Check xorriso presence before doing anything else. mkrescue can't do anything useful without xorriso, so abort early if it's not available. @@ -45,6 +44,3 @@ index 238d4840e2f..38f1543974e 100644 grub_init_all (); grub_hostfs_init (); grub_host_init (); --- -2.14.3 - diff --git a/0055-Fail-if-xorriso-failed.patch b/0055-Fail-if-xorriso-failed.patch index 2109ce97..0da5c882 100644 --- a/0055-Fail-if-xorriso-failed.patch +++ b/0055-Fail-if-xorriso-failed.patch @@ -1,7 +1,7 @@ From e66dc5d71ebfc9763420a76c274e6980d54641c3 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 7 Aug 2017 18:08:39 +0200 -Subject: [PATCH 055/250] Fail if xorriso failed. +Subject: [PATCH] Fail if xorriso failed. If xorriso failed most likely we didn't generate a meaningful image. --- @@ -39,6 +39,3 @@ index 38f1543974e..9545945d8f3 100644 grub_util_unlink_recursive (iso9660_dir); --- -2.14.3 - diff --git a/0056-efi-refactor-grub_efi_allocate_pages.patch b/0056-efi-refactor-grub_efi_allocate_pages.patch index dafcf7d9..2e13c599 100644 --- a/0056-efi-refactor-grub_efi_allocate_pages.patch +++ b/0056-efi-refactor-grub_efi_allocate_pages.patch @@ -1,7 +1,7 @@ From dd5fde2df83c5c03b7ba04d2cc5b7be96de8da7b Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 3 Aug 2017 11:04:23 +0100 -Subject: [PATCH 056/250] efi: refactor grub_efi_allocate_pages +Subject: [PATCH] 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 @@ -115,6 +115,3 @@ index e9c601f3410..b4cbebf3828 100644 EXPORT_FUNC(grub_efi_allocate_pages) (grub_efi_physical_address_t address, grub_efi_uintn_t pages); void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address, --- -2.14.3 - diff --git a/0057-Remove-grub_efi_allocate_pages.patch b/0057-Remove-grub_efi_allocate_pages.patch index d0a9cc59..3cfdef1d 100644 --- a/0057-Remove-grub_efi_allocate_pages.patch +++ b/0057-Remove-grub_efi_allocate_pages.patch @@ -1,7 +1,7 @@ From 4bc909bf89f5b4ff86c9e4e609d4fe0c11a66b0c Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 7 Aug 2017 18:33:29 +0200 -Subject: [PATCH 057/250] Remove grub_efi_allocate_pages. +Subject: [PATCH] Remove grub_efi_allocate_pages. grub_efi_allocate_pages Essentially does 2 unrelated things: * Allocate at fixed address. @@ -247,6 +247,3 @@ index b4cbebf3828..3fa082816ca 100644 void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address, grub_efi_uintn_t pages); int --- -2.14.3 - diff --git a/0058-efi-move-fdt-helper-library.patch b/0058-efi-move-fdt-helper-library.patch index 19ab095e..5fe9f298 100644 --- a/0058-efi-move-fdt-helper-library.patch +++ b/0058-efi-move-fdt-helper-library.patch @@ -1,7 +1,7 @@ From 8c9465fac901caac6802d6872a1374518b001517 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 3 Aug 2017 11:04:24 +0100 -Subject: [PATCH 058/250] efi: move fdt helper library +Subject: [PATCH] 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 @@ -88,6 +88,3 @@ diff --git a/include/grub/arm64/fdtload.h b/include/grub/efi/fdtload.h similarity index 100% rename from include/grub/arm64/fdtload.h rename to include/grub/efi/fdtload.h --- -2.14.3 - diff --git a/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch b/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch index e955466a..4cab655f 100644 --- a/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch +++ b/0059-efi-Add-GRUB_PE32_MAGIC-definition.patch @@ -1,7 +1,7 @@ From c5841ba7f0d14c193f20854e7e55b4f7ce9207d5 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 3 Aug 2017 11:04:25 +0100 -Subject: [PATCH 059/250] efi: Add GRUB_PE32_MAGIC definition +Subject: [PATCH] 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. @@ -54,6 +54,3 @@ index f79c36c026e..7d44732d2c3 100644 /* According to the spec, the minimal alignment is 512 bytes... But some examples (such as EFI drivers in the Intel Sample Implementation) use 32 bytes (0x20) instead, and it seems --- -2.14.3 - diff --git a/0060-arm64-linux-loader-improve-type-portability.patch b/0060-arm64-linux-loader-improve-type-portability.patch index 600a9d96..1edcf7ee 100644 --- a/0060-arm64-linux-loader-improve-type-portability.patch +++ b/0060-arm64-linux-loader-improve-type-portability.patch @@ -1,7 +1,7 @@ From 91212e0aa07e704a61e4540c18a27f149f5e51c3 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 3 Aug 2017 11:04:26 +0100 -Subject: [PATCH 060/250] arm64 linux loader: improve type portability +Subject: [PATCH] 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. @@ -110,6 +110,3 @@ index 091e9ddf43d..17212c38d0b 100644 GRUB_EFI_BYTES_TO_PAGES (grub_fdt_get_totalsize (fdt))); fdt = NULL; } --- -2.14.3 - diff --git a/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch b/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch index e1fac89a..d068450e 100644 --- a/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch +++ b/0061-efi-change-heap-allocation-type-to-GRUB_EFI_LOADER_C.patch @@ -1,8 +1,7 @@ From f826330683675f0deb55b58fd229afd7d65fb053 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Thu, 3 Aug 2017 11:04:32 +0100 -Subject: [PATCH 061/250] efi: change heap allocation type to - GRUB_EFI_LOADER_CODE +Subject: [PATCH] efi: change heap allocation type to GRUB_EFI_LOADER_CODE With upcoming changes to EDK2, allocations of type EFI_LOADER_DATA may not return regions with execute ability. Since modules are loaded onto @@ -31,6 +30,3 @@ index b97b05fe825..ac2a4c556b8 100644 if (! addr) grub_fatal ("cannot allocate conventional memory %p with %u pages", (void *) ((grub_addr_t) start), --- -2.14.3 - diff --git a/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch b/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch index 0eff148f..f05c3e65 100644 --- a/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch +++ b/0062-core-use-GRUB_TERM_-definitions-when-handling-term-c.patch @@ -1,7 +1,7 @@ From bdd89d239cd9b4089630bfb5ec862aab8086dca2 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 7 Aug 2017 16:20:30 +0100 -Subject: [PATCH 062/250] core: use GRUB_TERM_ definitions when handling term +Subject: [PATCH] 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 @@ -260,6 +260,3 @@ index 5ffb38f69aa..8117e2a24da 100644 #define GRUB_TERM_TAB '\t' #define GRUB_TERM_BACKSPACE '\b' --- -2.14.3 - diff --git a/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch b/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch index 1777cb69..f6450dec 100644 --- a/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch +++ b/0063-io-add-a-GRUB_GZ-prefix-to-gzio-specific-defines.patch @@ -1,7 +1,7 @@ From 1deebd85ef87cc581e995ce0a51dc0802ac9c367 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 7 Aug 2017 16:23:12 +0100 -Subject: [PATCH 063/250] io: add a GRUB_GZ prefix to gzio specific defines +Subject: [PATCH] io: add a GRUB_GZ prefix to gzio specific defines * This is done to avoid a conflict with a PACKED define in the EDK2 --- @@ -80,6 +80,3 @@ index 0f2ea6bd845..a8e33033bf8 100644 { /* TRANSLATORS: It's about given file having some strange format, not complete lack of gzip support. */ --- -2.14.3 - diff --git a/0064-re-write-.gitignore.patch b/0064-re-write-.gitignore.patch index 720f0f16..6ec159ca 100644 --- a/0064-re-write-.gitignore.patch +++ b/0064-re-write-.gitignore.patch @@ -1,7 +1,7 @@ From 38bfcd3054c28aa40234840c12d900f1d18a217d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 8 Aug 2017 12:48:04 -0400 -Subject: [PATCH 064/250] re-write .gitignore +Subject: [PATCH] re-write .gitignore --- .gitignore | 352 ++++++++++++-------------------------- @@ -495,6 +495,3 @@ index 00000000000..b7e1eb12428 +++ b/util/bash-completion.d/.gitignore @@ -0,0 +1 @@ +grub --- -2.14.3 - diff --git a/0065-IBM-client-architecture-CAS-reboot-support.patch b/0065-IBM-client-architecture-CAS-reboot-support.patch index d231eda9..0979a52c 100644 --- a/0065-IBM-client-architecture-CAS-reboot-support.patch +++ b/0065-IBM-client-architecture-CAS-reboot-support.patch @@ -1,7 +1,7 @@ From bf1fd830091fff49e26f39027e0db8fd4b688624 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Thu, 20 Sep 2012 18:07:39 -0300 -Subject: [PATCH 065/250] IBM client architecture (CAS) reboot support +Subject: [PATCH] IBM client architecture (CAS) reboot support This is an implementation of IBM client architecture (CAS) reboot for GRUB. @@ -169,6 +169,3 @@ index 8e425130327..9f26c69a2df 100644 #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));) --- -2.14.3 - diff --git a/0066-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0066-for-ppc-reset-console-display-attr-when-clear-screen.patch index 331b54c0..07ab3e3f 100644 --- a/0066-for-ppc-reset-console-display-attr-when-clear-screen.patch +++ b/0066-for-ppc-reset-console-display-attr-when-clear-screen.patch @@ -1,7 +1,7 @@ From 8b30fab3c07a9fc8549e404c411b747b960c57b2 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 24 Apr 2013 10:51:48 -0300 -Subject: [PATCH 066/250] for ppc, reset console display attr when clear screen +Subject: [PATCH] for ppc, reset console display attr when clear screen v2: Also use \x0c instead of a literal ^L to make future patches less awkward. @@ -27,6 +27,3 @@ index d317efa368d..29df35e6d20 100644 data->reverse_video_on = grub_strdup ("\e[7m"); data->reverse_video_off = grub_strdup ("\e[m"); if (grub_strcmp ("ieee1275", str) == 0) --- -2.14.3 - diff --git a/0067-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0067-Disable-GRUB-video-support-for-IBM-power-machines.patch index bba60e4b..fc928e09 100644 --- a/0067-Disable-GRUB-video-support-for-IBM-power-machines.patch +++ b/0067-Disable-GRUB-video-support-for-IBM-power-machines.patch @@ -1,7 +1,7 @@ From 45322cbc9402639a431fc0f33bd76e387e6f02bf Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 11 Jun 2013 15:14:05 -0300 -Subject: [PATCH 067/250] Disable GRUB video support for IBM power machines +Subject: [PATCH] Disable GRUB video support for IBM power machines Should fix the problem in bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=973205 @@ -60,6 +60,3 @@ index 9f26c69a2df..ab4f284c341 100644 }; extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag); --- -2.14.3 - diff --git a/0068-Honor-a-symlink-when-generating-configuration-by-gru.patch b/0068-Honor-a-symlink-when-generating-configuration-by-gru.patch index d62fed64..a0f3402f 100644 --- a/0068-Honor-a-symlink-when-generating-configuration-by-gru.patch +++ b/0068-Honor-a-symlink-when-generating-configuration-by-gru.patch @@ -1,7 +1,7 @@ From c29e260c9f41f4f802fa852b6c46fb2e5d912cb6 Mon Sep 17 00:00:00 2001 From: Marcel Kolaja Date: Tue, 21 Jan 2014 10:57:08 -0500 -Subject: [PATCH 068/250] Honor a symlink when generating configuration by +Subject: [PATCH] Honor a symlink when generating configuration by grub2-mkconfig Honor a symlink when generating configuration by grub2-mkconfig, so that @@ -24,6 +24,3 @@ index f8496d28bdf..3b070fd7632 100644 fi fi --- -2.14.3 - diff --git a/0069-Move-bash-completion-script-922997.patch b/0069-Move-bash-completion-script-922997.patch index 60a1d46f..cb2f9e1a 100644 --- a/0069-Move-bash-completion-script-922997.patch +++ b/0069-Move-bash-completion-script-922997.patch @@ -1,7 +1,7 @@ From 8eaf2f497a6bcffc5554509533940ac2b764b981 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Apr 2013 14:35:34 -0400 -Subject: [PATCH 069/250] Move bash completion script (#922997) +Subject: [PATCH] Move bash completion script (#922997) Apparently these go in a new place now. --- @@ -50,6 +50,3 @@ index 136287cf1bf..61108f05429 100644 bashcompletion_DATA = $(bash_completion_script) $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status --- -2.14.3 - diff --git a/0070-Update-to-minilzo-2.08.patch b/0070-Update-to-minilzo-2.08.patch index 3f4692fb..6e000cf3 100644 --- a/0070-Update-to-minilzo-2.08.patch +++ b/0070-Update-to-minilzo-2.08.patch @@ -1,7 +1,7 @@ From 9a1e99c5628bafa9e3970a5317b721da704bec6a Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Dec 2014 15:36:09 -0500 -Subject: [PATCH 070/250] Update to minilzo-2.08 +Subject: [PATCH] Update to minilzo-2.08 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow @@ -8507,6 +8507,3 @@ index 74fefa9fe20..79374546748 100644 #define LZO1X_MEM_DECOMPRESS (0) --- -2.14.3 - diff --git a/0071-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0071-Allow-fallback-to-include-entries-by-title-not-just-.patch index 38689013..2a7585fc 100644 --- a/0071-Allow-fallback-to-include-entries-by-title-not-just-.patch +++ b/0071-Allow-fallback-to-include-entries-by-title-not-just-.patch @@ -1,7 +1,7 @@ From 27845fb323de35e9dcaad8c738eb1a2a2bc316f8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 5 Sep 2014 10:07:04 -0400 -Subject: [PATCH 071/250] Allow "fallback" to include entries by title, not +Subject: [PATCH] Allow "fallback" to include entries by title, not just number. Resolves: rhbz#1026084 @@ -139,6 +139,3 @@ index e7a83c2d6e2..d2f64b05e0a 100644 /* Get the entry number from the variable NAME. */ static int get_entry_number (grub_menu_t menu, const char *name) --- -2.14.3 - diff --git a/0072-Add-GRUB_DISABLE_UUID.patch b/0072-Add-GRUB_DISABLE_UUID.patch index 81f5cacf..884ae637 100644 --- a/0072-Add-GRUB_DISABLE_UUID.patch +++ b/0072-Add-GRUB_DISABLE_UUID.patch @@ -1,7 +1,7 @@ From 7f7429e93fa791ac2c002beaafab9b9d9bd86b89 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 16:49:25 -0400 -Subject: [PATCH 072/250] Add GRUB_DISABLE_UUID. +Subject: [PATCH] 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 @@ -94,6 +94,3 @@ index 60b31caddeb..cf35e417470 100644 echo "$fs_uuid"; else echo $device |sed 's, ,_,g' --- -2.14.3 - diff --git a/0073-Make-exit-take-a-return-code.patch b/0073-Make-exit-take-a-return-code.patch index 7abd7a56..1fa61668 100644 --- a/0073-Make-exit-take-a-return-code.patch +++ b/0073-Make-exit-take-a-return-code.patch @@ -1,7 +1,7 @@ From 384ccb1b44fc23514a59529f58f984dcc4a75cc9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 26 Feb 2014 21:49:12 -0500 -Subject: [PATCH 073/250] Make "exit" take a return code. +Subject: [PATCH] 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 @@ -254,6 +254,3 @@ index 2a9f87cc255..06208143779 100644 grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r); --- -2.14.3 - diff --git a/0074-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch b/0074-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch index 5260850b..9e3fae16 100644 --- a/0074-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch +++ b/0074-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch @@ -1,7 +1,7 @@ From 939f3dfcfacde13bd7ebfe411c0dceee9e5ed0ae Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 22 Jul 2015 11:21:01 -0400 -Subject: [PATCH 074/250] Mark po/exclude.pot as binary so git won't try to +Subject: [PATCH] Mark po/exclude.pot as binary so git won't try to diff nonprintables. Signed-off-by: Peter Jones @@ -17,6 +17,3 @@ index 00000000000..33ffaa40460 +++ b/.gitattributes @@ -0,0 +1 @@ +po/exclude.pot binary --- -2.14.3 - diff --git a/0075-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0075-Make-efi-machines-load-an-env-block-from-a-variable.patch index 3b93e0f1..20969b85 100644 --- a/0075-Make-efi-machines-load-an-env-block-from-a-variable.patch +++ b/0075-Make-efi-machines-load-an-env-block-from-a-variable.patch @@ -1,7 +1,7 @@ From 805220eb48a8cabcc83628d90aa40f3204b21a71 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 7 Dec 2015 14:20:49 -0500 -Subject: [PATCH 075/250] Make efi machines load an env block from a variable +Subject: [PATCH] Make efi machines load an env block from a variable Signed-off-by: Peter Jones --- @@ -79,6 +79,3 @@ index 2c31847bf6d..f7782b6e114 100644 char **device, char **path); --- -2.14.3 - diff --git a/0076-DHCP-client-ID-and-UUID-options-added.patch b/0076-DHCP-client-ID-and-UUID-options-added.patch index ab7ef0f2..95c29669 100644 --- a/0076-DHCP-client-ID-and-UUID-options-added.patch +++ b/0076-DHCP-client-ID-and-UUID-options-added.patch @@ -1,7 +1,7 @@ From cefc164d655fb7709efbc37a317952ff3ec4aeb3 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:18:53 -0200 -Subject: [PATCH 076/250] DHCP client ID and UUID options added. +Subject: [PATCH] DHCP client ID and UUID options added. --- grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++----- @@ -140,6 +140,3 @@ index 1096b24322e..e266bae23f4 100644 GRUB_NET_BOOTP_END = 0xff }; --- -2.14.3 - diff --git a/0077-trim-arp-packets-with-abnormal-size.patch b/0077-trim-arp-packets-with-abnormal-size.patch index 1e67baec..07ad01d9 100644 --- a/0077-trim-arp-packets-with-abnormal-size.patch +++ b/0077-trim-arp-packets-with-abnormal-size.patch @@ -1,7 +1,7 @@ From 571a6cce3b0d4c8abf11efc320e2de6ff9188d60 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 5 Feb 2014 09:42:42 -0200 -Subject: [PATCH 077/250] trim arp packets with abnormal size +Subject: [PATCH] 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. @@ -26,6 +26,3 @@ index 54306e3b16d..d1c69ed2b55 100644 grub_net_link_level_address_t target; struct grub_net_buff nb_reply; struct arppkt *arp_reply; --- -2.14.3 - diff --git a/0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch index c04fa99c..14eeebf7 100644 --- a/0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch +++ b/0078-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch @@ -1,7 +1,7 @@ From 6cd959a64f588e256f0ba17e31bf2720b9cdec88 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Wed, 12 Mar 2014 10:58:16 -0400 -Subject: [PATCH 078/250] Fix bad test on GRUB_DISABLE_SUBMENU. +Subject: [PATCH] Fix bad test on GRUB_DISABLE_SUBMENU. The file /etc/grub.d/10_linux does @@ -36,6 +36,3 @@ index de9044c7f28..cf6331f2a51 100644 linux_entry "${OS}" "${version}" simple \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" --- -2.14.3 - diff --git a/0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch index 4b63408c..78c955ec 100644 --- a/0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch +++ b/0079-Add-support-for-UEFI-operating-systems-returned-by-o.patch @@ -1,7 +1,7 @@ From 0254265409f80b369c35fb474c7371feb6f9ae1d Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 12 Jun 2013 11:51:49 -0400 -Subject: [PATCH 079/250] Add support for UEFI operating systems returned by +Subject: [PATCH] Add support for UEFI operating systems returned by os-prober os-prober returns UEFI operating systems in the form: @@ -45,6 +45,3 @@ index 515a68c7aa0..9b8f5968e2d 100644 + esac esac done --- -2.14.3 - diff --git a/0080-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0080-Migrate-PPC-from-Yaboot-to-Grub2.patch index ac1cbba6..d811c2c4 100644 --- a/0080-Migrate-PPC-from-Yaboot-to-Grub2.patch +++ b/0080-Migrate-PPC-from-Yaboot-to-Grub2.patch @@ -1,7 +1,7 @@ From f2b4c105e3657cc32ed0f7aefa713f161cdf64f1 Mon Sep 17 00:00:00 2001 From: Mark Hamzy Date: Wed, 28 Mar 2012 14:46:41 -0500 -Subject: [PATCH 080/250] Migrate PPC from Yaboot to Grub2 +Subject: [PATCH] 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. @@ -149,6 +149,3 @@ index 00000000000..10d66586820 +cat << EOF + terminfo -g ${X}x${Y} ${TERMINAL} +EOF --- -2.14.3 - diff --git a/0081-Add-fw_path-variable-revised.patch b/0081-Add-fw_path-variable-revised.patch index 3f499102..c130f500 100644 --- a/0081-Add-fw_path-variable-revised.patch +++ b/0081-Add-fw_path-variable-revised.patch @@ -1,7 +1,7 @@ From 7f021a05a5ed7c97432abbc1762f40e36a4915e3 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 19 Sep 2012 21:22:55 -0300 -Subject: [PATCH 081/250] Add fw_path variable (revised) +Subject: [PATCH] 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 @@ -76,6 +76,3 @@ index 249e19bc788..759c475c4d9 100644 prefix = grub_env_get ("prefix"); if (prefix) --- -2.14.3 - diff --git a/0082-Add-support-for-linuxefi.patch b/0082-Add-support-for-linuxefi.patch index f797e04e..6a55b6ef 100644 --- a/0082-Add-support-for-linuxefi.patch +++ b/0082-Add-support-for-linuxefi.patch @@ -1,7 +1,7 @@ From 778385965798ac2711f0d07d5cf521a6e999ca8b Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 10 Jul 2012 11:58:52 -0400 -Subject: [PATCH 082/250] Add support for linuxefi +Subject: [PATCH] Add support for linuxefi --- grub-core/Makefile.core.def | 8 + @@ -477,6 +477,3 @@ index da0ca3b83cd..fc36bdaf367 100644 } GRUB_PACKED; /* Boot parameters for Linux based on 2.6.12. This is used by the setup --- -2.14.3 - diff --git a/0083-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0083-Use-linuxefi-and-initrdefi-where-appropriate.patch index 5e6dcab6..25f80331 100644 --- a/0083-Use-linuxefi-and-initrdefi-where-appropriate.patch +++ b/0083-Use-linuxefi-and-initrdefi-where-appropriate.patch @@ -1,7 +1,7 @@ From 793d4270384ef3373bc0b3c956cab8a8cdb75bcf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 16 Jul 2012 18:57:11 -0400 -Subject: [PATCH 083/250] Use "linuxefi" and "initrdefi" where appropriate. +Subject: [PATCH] Use "linuxefi" and "initrdefi" where appropriate. --- util/grub.d/10_linux.in | 18 ++++++++++++++++-- @@ -45,6 +45,3 @@ index cf6331f2a51..8ccf012f747 100644 fi sed "s/^/$submenu_indentation/" << EOF } --- -2.14.3 - diff --git a/0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch b/0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch index ecfc5ae2..28b21dc6 100644 --- a/0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch +++ b/0084-Don-t-allow-insmod-when-secure-boot-is-enabled.patch @@ -1,7 +1,7 @@ From eb8fd62e887e624f5c6e7c2ee8512981e8b5be97 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 23 Oct 2012 10:40:49 -0400 -Subject: [PATCH 084/250] Don't allow insmod when secure boot is enabled. +Subject: [PATCH] Don't allow insmod when secure boot is enabled. Hi, @@ -119,6 +119,3 @@ index 91e29ce66f1..bb3ab7dfdeb 100644 int EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1, const grub_efi_device_path_t *dp2); --- -2.14.3 - diff --git a/0085-Pass-x-hex-hex-straight-through-unmolested.patch b/0085-Pass-x-hex-hex-straight-through-unmolested.patch index 3c196dac..bb7845aa 100644 --- a/0085-Pass-x-hex-hex-straight-through-unmolested.patch +++ b/0085-Pass-x-hex-hex-straight-through-unmolested.patch @@ -1,7 +1,7 @@ From 0d54ed89090fc1bdcb75de474024b2b81dbf644f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 Oct 2012 13:24:37 -0400 -Subject: [PATCH 085/250] Pass "\x[[:hex:]][[:hex:]]" straight through +Subject: [PATCH] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested. --- @@ -178,6 +178,3 @@ index ab78ca87f90..cf6cd6601d6 100644 break; case '$': if (escaped) --- -2.14.3 - diff --git a/0086-Add-X-option-to-printf-functions.patch b/0086-Add-X-option-to-printf-functions.patch index 93468f58..fa0405b6 100644 --- a/0086-Add-X-option-to-printf-functions.patch +++ b/0086-Add-X-option-to-printf-functions.patch @@ -1,7 +1,7 @@ From 6237b1688124d6a72250b296e758ef2d59fde26f Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 16:58:39 -0200 -Subject: [PATCH 086/250] Add %X option to printf functions. +Subject: [PATCH] Add %X option to printf functions. --- grub-core/kern/misc.c | 7 +++++-- @@ -53,6 +53,3 @@ index 952411d5dc6..8344526be7f 100644 case 'u': case 'd': { --- -2.14.3 - diff --git a/0087-Search-for-specific-config-file-for-netboot.patch b/0087-Search-for-specific-config-file-for-netboot.patch index 17688293..9cee6e6b 100644 --- a/0087-Search-for-specific-config-file-for-netboot.patch +++ b/0087-Search-for-specific-config-file-for-netboot.patch @@ -1,7 +1,7 @@ From 9491cbfdab951e38f096bd9705a76b382f54c9be Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:22:07 -0200 -Subject: [PATCH 087/250] Search for specific config file for netboot +Subject: [PATCH] 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: @@ -198,6 +198,3 @@ index e266bae23f4..50d62ab0c8c 100644 +grub_net_search_configfile (char *config); + #endif /* ! GRUB_NET_HEADER */ --- -2.14.3 - diff --git a/0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch index 80f0267d..0b039c8b 100644 --- a/0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +++ b/0088-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch @@ -1,7 +1,7 @@ From 5fcdebdc36cc84c772754b7f5bdb87aed2b42853 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Tue, 22 Jan 2013 06:31:38 +0100 -Subject: [PATCH 088/250] blscfg: add blscfg module to parse Boot Loader +Subject: [PATCH] blscfg: add blscfg module to parse Boot Loader Specification snippets http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec @@ -246,6 +246,3 @@ index 00000000000..4274aca5a9d +{ + grub_unregister_extcmd (cmd); +} --- -2.14.3 - diff --git a/0089-Don-t-write-messages-to-the-screen.patch b/0089-Don-t-write-messages-to-the-screen.patch index 5fcc8fa0..d9eb35b2 100644 --- a/0089-Don-t-write-messages-to-the-screen.patch +++ b/0089-Don-t-write-messages-to-the-screen.patch @@ -1,7 +1,7 @@ From fc390be631e93744c6a3a2f42849c9edf2614a36 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:30:20 -0400 -Subject: [PATCH 089/250] Don't write messages to the screen +Subject: [PATCH] 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 @@ -176,6 +176,3 @@ index 8ccf012f747..a3d9711d607 100644 initrd ${rel_dirname}/${initrd} EOF fi --- -2.14.3 - diff --git a/0090-Don-t-print-GNU-GRUB-header.patch b/0090-Don-t-print-GNU-GRUB-header.patch index 8521093a..e55c3d92 100644 --- a/0090-Don-t-print-GNU-GRUB-header.patch +++ b/0090-Don-t-print-GNU-GRUB-header.patch @@ -1,7 +1,7 @@ From 806c26ae73bc86e305c39c955d86480fad8985df Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:53:48 -0400 -Subject: [PATCH 090/250] Don't print GNU GRUB header +Subject: [PATCH] Don't print GNU GRUB header No one cares. --- @@ -40,6 +40,3 @@ index b2654ef62e8..f57b7508a76 100644 } static void --- -2.14.3 - diff --git a/0091-Don-t-add-to-highlighted-row.patch b/0091-Don-t-add-to-highlighted-row.patch index 5b18552f..70a2666f 100644 --- a/0091-Don-t-add-to-highlighted-row.patch +++ b/0091-Don-t-add-to-highlighted-row.patch @@ -1,7 +1,7 @@ From 5ae2484f263365351a2891be6c056eeb96b3924b Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 17:49:45 -0400 -Subject: [PATCH 091/250] Don't add '*' to highlighted row +Subject: [PATCH] Don't add '*' to highlighted row It is already highlighted. --- @@ -21,6 +21,3 @@ index e22bb91f6e8..a3d1f23f68f 100644 grub_print_ucs4_menu (unicode_title, unicode_title + len, --- -2.14.3 - diff --git a/0092-Message-string-cleanups.patch b/0092-Message-string-cleanups.patch index 66b70b23..09f2a835 100644 --- a/0092-Message-string-cleanups.patch +++ b/0092-Message-string-cleanups.patch @@ -1,7 +1,7 @@ From 622b238ecb927d331dc38083584a7323013b5f21 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 11:09:04 -0400 -Subject: [PATCH 092/250] Message string cleanups +Subject: [PATCH] Message string cleanups Make use of terminology consistent. Remove jargon. --- @@ -66,6 +66,3 @@ index a3d1f23f68f..64a83862f66 100644 if (!msg_translated) { grub_print_error (); --- -2.14.3 - diff --git a/0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch index 15efb904..a04fb3ed 100644 --- a/0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch +++ b/0093-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch @@ -1,7 +1,7 @@ From c7dac08ab344638afabf579e03bedfac729e1944 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:23 -0400 -Subject: [PATCH 093/250] Fix border spacing now that we aren't displaying it +Subject: [PATCH] Fix border spacing now that we aren't displaying it --- grub-core/normal/menu_text.c | 6 +++--- @@ -27,6 +27,3 @@ index 64a83862f66..1062d64ee29 100644 geo->timeout_lines = 2; --- -2.14.3 - diff --git a/0094-Use-the-correct-indentation-for-the-term-help-text.patch b/0094-Use-the-correct-indentation-for-the-term-help-text.patch index 956553b9..7b22a92e 100644 --- a/0094-Use-the-correct-indentation-for-the-term-help-text.patch +++ b/0094-Use-the-correct-indentation-for-the-term-help-text.patch @@ -1,7 +1,7 @@ From 8a59d6c44d946eac70ecbb7a9418c5d6801add8b Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:49 -0400 -Subject: [PATCH 094/250] Use the correct indentation for the term help text +Subject: [PATCH] Use the correct indentation for the term help text That is consistent with the menu help text --- @@ -23,6 +23,3 @@ index f57b7508a76..0ce59fdc3f0 100644 else grub_print_message_indented (msg_formatted, 0, 0, term); grub_putcode ('\n', term); --- -2.14.3 - diff --git a/0095-Indent-menu-entries.patch b/0095-Indent-menu-entries.patch index 2542d04c..2e089049 100644 --- a/0095-Indent-menu-entries.patch +++ b/0095-Indent-menu-entries.patch @@ -1,7 +1,7 @@ From 018439ecfda2bc5049ccbfb0d6ab7fa047411a3b Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:30:55 -0400 -Subject: [PATCH 095/250] Indent menu entries +Subject: [PATCH] Indent menu entries --- grub-core/normal/menu_text.c | 3 ++- @@ -21,6 +21,3 @@ index 1062d64ee29..ecc60f99fc3 100644 grub_print_ucs4_menu (unicode_title, unicode_title + len, --- -2.14.3 - diff --git a/0096-Fix-margins.patch b/0096-Fix-margins.patch index ca9b45dd..8a4f6fc5 100644 --- a/0096-Fix-margins.patch +++ b/0096-Fix-margins.patch @@ -1,7 +1,7 @@ From 33481aa0e7897465ffd386101d6f3eda6e3bbac0 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:59:36 -0400 -Subject: [PATCH 096/250] Fix margins +Subject: [PATCH] Fix margins --- grub-core/normal/menu_text.c | 8 +++----- @@ -32,6 +32,3 @@ index ecc60f99fc3..0e43f2c10cc 100644 - 1 /* empty line before info message*/ - geo->timeout_lines /* timeout */ - 1 /* empty final line */; --- -2.14.3 - diff --git a/0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch index a35b9471..718e6ad2 100644 --- a/0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch +++ b/0097-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch @@ -1,7 +1,7 @@ From ea032bd4a6cb66929da61477b1759e136c975189 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 21 Jun 2013 14:44:08 -0400 -Subject: [PATCH 097/250] Use -2 instead of -1 for our right-hand margin, so +Subject: [PATCH] Use -2 instead of -1 for our right-hand margin, so linewrapping works (#976643). Signed-off-by: Peter Jones @@ -22,6 +22,3 @@ index 0e43f2c10cc..537d4bf86ff 100644 geo->first_entry_y = 3; /* three empty lines*/ --- -2.14.3 - diff --git a/0098-Use-linux16-when-appropriate-880840.patch b/0098-Use-linux16-when-appropriate-880840.patch index d562a39f..327717bc 100644 --- a/0098-Use-linux16-when-appropriate-880840.patch +++ b/0098-Use-linux16-when-appropriate-880840.patch @@ -1,7 +1,7 @@ From 8e1957d59e7e72850cbac7e779ddf22ca23c250d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:05:07 -0400 -Subject: [PATCH 098/250] Use linux16 when appropriate (#880840) +Subject: [PATCH] Use linux16 when appropriate (#880840) The kernel group really would prefer that we use the 16 bit entry point on x86 bios machines. @@ -47,6 +47,3 @@ index a3d9711d607..f3bf6acd856 100644 EOF fi fi --- -2.14.3 - diff --git a/0099-Enable-pager-by-default.-985860.patch b/0099-Enable-pager-by-default.-985860.patch index d52f5fa0..02e87091 100644 --- a/0099-Enable-pager-by-default.-985860.patch +++ b/0099-Enable-pager-by-default.-985860.patch @@ -1,7 +1,7 @@ From 7466f51a0012ebdd8be07cfc0e63d50e0e79560d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:09:27 -0400 -Subject: [PATCH 099/250] Enable pager by default. (#985860) +Subject: [PATCH] Enable pager by default. (#985860) Signed-off-by: Peter Jones --- @@ -21,6 +21,3 @@ index 93a90233ead..858b526c925 100644 if [ -s \$prefix/grubenv ]; then load_env fi --- -2.14.3 - diff --git a/0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch index 604af313..a3f7d05a 100644 --- a/0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch +++ b/0100-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch @@ -1,7 +1,7 @@ From 7a97d9621a145cbd04111970fea04c34433f900c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:13:27 -0400 -Subject: [PATCH 100/250] F10 doesn't work on serial, so don't tell the user to +Subject: [PATCH] F10 doesn't work on serial, so don't tell the user to hit it (#987443) Signed-off-by: Peter Jones @@ -22,6 +22,3 @@ index 537d4bf86ff..452d55bf9ff 100644 command prompt or Escape to discard edits and return to the menu. Pressing Tab lists possible completions."), STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run); --- -2.14.3 - diff --git a/0101-Don-t-say-GNU-Linux-in-generated-menus.patch b/0101-Don-t-say-GNU-Linux-in-generated-menus.patch index 608c8b83..7f637136 100644 --- a/0101-Don-t-say-GNU-Linux-in-generated-menus.patch +++ b/0101-Don-t-say-GNU-Linux-in-generated-menus.patch @@ -1,7 +1,7 @@ From 45877a77f50eecd0b7fd3ba1aec0d4398a3b6a20 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 14 Mar 2011 14:27:42 -0400 -Subject: [PATCH 101/250] Don't say "GNU/Linux" in generated menus. +Subject: [PATCH] Don't say "GNU/Linux" in generated menus. --- util/grub.d/10_linux.in | 4 ++-- @@ -40,6 +40,3 @@ index c002fc9f946..54f1ec8a2fd 100644 CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" fi --- -2.14.3 - diff --git a/0102-Don-t-draw-a-border-around-the-menu.patch b/0102-Don-t-draw-a-border-around-the-menu.patch index fd4db408..3f0b39ff 100644 --- a/0102-Don-t-draw-a-border-around-the-menu.patch +++ b/0102-Don-t-draw-a-border-around-the-menu.patch @@ -1,7 +1,7 @@ From c28a3053e96859000df5ff1d48c9a560d47c0470 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 16:47:33 -0400 -Subject: [PATCH 102/250] Don't draw a border around the menu +Subject: [PATCH] Don't draw a border around the menu It looks cleaner without it. --- @@ -69,6 +69,3 @@ index 452d55bf9ff..1ed2bd92cf8 100644 grub_term_normal_color = old_color_normal; grub_term_highlight_color = old_color_highlight; geo->timeout_y = geo->first_entry_y + geo->num_entries --- -2.14.3 - diff --git a/0103-Use-the-standard-margin-for-the-timeout-string.patch b/0103-Use-the-standard-margin-for-the-timeout-string.patch index ac54bbb0..e442ef06 100644 --- a/0103-Use-the-standard-margin-for-the-timeout-string.patch +++ b/0103-Use-the-standard-margin-for-the-timeout-string.patch @@ -1,7 +1,7 @@ From 93018f5d1727eb58dead129f150a36080c22530a Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 10:52:32 -0400 -Subject: [PATCH 103/250] Use the standard margin for the timeout string +Subject: [PATCH] Use the standard margin for the timeout string So that it aligns with the other messages --- @@ -38,6 +38,3 @@ index 1ed2bd92cf8..7681f7d2893 100644 } } --- -2.14.3 - diff --git a/0104-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0104-Add-.eh_frame-to-list-of-relocations-stripped.patch index 757b028c..62faad2c 100644 --- a/0104-Add-.eh_frame-to-list-of-relocations-stripped.patch +++ b/0104-Add-.eh_frame-to-list-of-relocations-stripped.patch @@ -1,7 +1,7 @@ From c626121f38adf6fcd39a5f69249c650b4b52c10d Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 13 Jan 2014 21:50:59 -0500 -Subject: [PATCH 104/250] Add .eh_frame to list of relocations stripped +Subject: [PATCH] Add .eh_frame to list of relocations stripped --- conf/Makefile.common | 2 +- @@ -20,6 +20,3 @@ index 311da61c6c5..044ab3abe88 100644 CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d --- -2.14.3 - diff --git a/0105-Make-10_linux-work-with-our-changes-for-linux16-and-.patch b/0105-Make-10_linux-work-with-our-changes-for-linux16-and-.patch index 83993b98..ba7295d1 100644 --- a/0105-Make-10_linux-work-with-our-changes-for-linux16-and-.patch +++ b/0105-Make-10_linux-work-with-our-changes-for-linux16-and-.patch @@ -1,7 +1,7 @@ From 59275c83e7a303c63379d37ba21aa39a3c3b7203 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 13:12:23 -0500 -Subject: [PATCH 105/250] Make 10_linux work with our changes for linux16 and +Subject: [PATCH] Make 10_linux work with our changes for linux16 and linuxefi on aarch64 Signed-off-by: Peter Jones @@ -80,6 +80,3 @@ index ef52cf3dbbb..191aebe80bb 100644 config= for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do if test -e "${i}" ; then --- -2.14.3 - diff --git a/0106-Don-t-print-during-fdt-loading-method.patch b/0106-Don-t-print-during-fdt-loading-method.patch index 16d5fc17..923c9d75 100644 --- a/0106-Don-t-print-during-fdt-loading-method.patch +++ b/0106-Don-t-print-during-fdt-loading-method.patch @@ -1,7 +1,7 @@ From aedf2aceb354ab7bf28bbf70d0a4b505c0adcfdf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 16:15:46 -0500 -Subject: [PATCH 106/250] Don't print during fdt loading method. +Subject: [PATCH] Don't print during fdt loading method. Signed-off-by: Peter Jones --- @@ -22,6 +22,3 @@ index 191aebe80bb..452a9f69d28 100644 devicetree ${rel_dirname}/${fdt} EOF fi --- -2.14.3 - diff --git a/0107-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch b/0107-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch index 827881e6..8cc75f90 100644 --- a/0107-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch +++ b/0107-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch @@ -1,7 +1,7 @@ From f2790b1f7c8efcd5589c8fcdaca51b548ab9825c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 30 Jun 2014 14:16:46 -0400 -Subject: [PATCH 107/250] Don't munge raw spaces when we're doing our cmdline +Subject: [PATCH] Don't munge raw spaces when we're doing our cmdline escaping (#923374) Signed-off-by: Peter Jones @@ -31,6 +31,3 @@ index 0a5b2afb94b..970ea868c14 100644 is_hex(*(c+2)) && is_hex(*(c+3))) { *buf++ = *c++; --- -2.14.3 - diff --git a/0108-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0108-Don-t-require-a-password-to-boot-entries-generated-b.patch index 2907ff20..119b96d0 100644 --- a/0108-Don-t-require-a-password-to-boot-entries-generated-b.patch +++ b/0108-Don-t-require-a-password-to-boot-entries-generated-b.patch @@ -1,7 +1,7 @@ From 205a7844bea4d849dc24f24b5fc96f6040d5e2b9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 11 Feb 2014 11:14:50 -0500 -Subject: [PATCH 108/250] Don't require a password to boot entries generated by +Subject: [PATCH] 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. @@ -26,6 +26,3 @@ index 452a9f69d28..79a747ebd4d 100644 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS="$(sed 's, release .*$,,g' /etc/system-release)" --- -2.14.3 - diff --git a/0109-Don-t-emit-Booting-.-message.patch b/0109-Don-t-emit-Booting-.-message.patch index 162d2ea0..9cff2e4c 100644 --- a/0109-Don-t-emit-Booting-.-message.patch +++ b/0109-Don-t-emit-Booting-.-message.patch @@ -1,7 +1,7 @@ From c986c38f790881be0b9c5b0acd8d3b106412a5f1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 09:37:49 -0500 -Subject: [PATCH 109/250] Don't emit "Booting ..." message. +Subject: [PATCH] Don't emit "Booting ..." message. UI team still hates this stuff, so we're disabling it for RHEL 7. @@ -47,6 +47,3 @@ index cdf3590a364..5785f67ee1c 100644 errs_before = grub_err_printed_errors; --- -2.14.3 - diff --git a/0110-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/0110-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch index 14583819..89ecc94b 100644 --- a/0110-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch +++ b/0110-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch @@ -1,7 +1,7 @@ From dcf3b9c590f00e33f773de68ac4ebd55ca4f6e90 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 4 Mar 2014 11:00:23 -0500 -Subject: [PATCH 110/250] Replace a lot of man pages with slightly nicer ones. +Subject: [PATCH] Replace a lot of man pages with slightly nicer ones. Replace a bunch of machine generated ones with ones that look nicer. --- @@ -1958,6 +1958,3 @@ index 00000000000..37ea2dd5eaa + +.SH SEE ALSO +.BR "info grub" --- -2.14.3 - diff --git a/0111-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0111-use-fw_path-prefix-when-fallback-searching-for-grub-.patch index 0c606d9a..318cb2e1 100644 --- a/0111-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +++ b/0111-use-fw_path-prefix-when-fallback-searching-for-grub-.patch @@ -1,7 +1,7 @@ From 24865a88781aef2a6a54433b5b383219108f54fa Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 19 Feb 2014 15:58:43 -0500 -Subject: [PATCH 111/250] use fw_path prefix when fallback searching for grub +Subject: [PATCH] use fw_path prefix when fallback searching for grub config When PXE booting via UEFI firmware, grub was searching for grub.cfg @@ -40,6 +40,3 @@ index 0ce59fdc3f0..a3713efcd90 100644 if (prefix) { grub_size_t config_len; --- -2.14.3 - diff --git a/0112-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0112-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch index 467e537c..51926338 100644 --- a/0112-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +++ b/0112-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch @@ -1,7 +1,7 @@ From d4cd9aa8695ab9448da41f756553beb75bffee46 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 6 Mar 2014 11:51:33 -0500 -Subject: [PATCH 112/250] Try mac/guid/etc before grub.cfg on tftp config +Subject: [PATCH] Try mac/guid/etc before grub.cfg on tftp config files. Signed-off-by: Peter Jones @@ -110,6 +110,3 @@ index a3713efcd90..7d9c4f09b9b 100644 } else grub_enter_normal_mode (argv[0]); --- -2.14.3 - diff --git a/0113-Fix-convert-function-to-support-NVMe-devices.patch b/0113-Fix-convert-function-to-support-NVMe-devices.patch index d9b30395..4c2f9602 100644 --- a/0113-Fix-convert-function-to-support-NVMe-devices.patch +++ b/0113-Fix-convert-function-to-support-NVMe-devices.patch @@ -1,7 +1,7 @@ From 397f179c26aeddf3fe452c62aa404459889835fc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 11:34:00 -0500 -Subject: [PATCH 113/250] Fix convert function to support NVMe devices +Subject: [PATCH] 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 @@ -54,6 +54,3 @@ index 847406fbab0..fa3460d6cd8 100644 if (grub_util_device_is_mapped_stat (&st)) return grub_util_devmapper_part_to_disk (&st, is_part, os_dev); --- -2.14.3 - diff --git a/0114-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch b/0114-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch index fec76735..231c994f 100644 --- a/0114-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch +++ b/0114-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch @@ -1,7 +1,7 @@ From 4291f418c3304f0f379467e87ce5892853cc16c7 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 10 Feb 2014 16:13:10 -0500 -Subject: [PATCH 114/250] Switch to use APM Mustang device tree, for hardware +Subject: [PATCH] Switch to use APM Mustang device tree, for hardware testing. Signed-off-by: David A. Marlin @@ -24,6 +24,3 @@ index 79a747ebd4d..462b461ff49 100644 break fi done --- -2.14.3 - diff --git a/0115-Use-the-default-device-tree-from-the-grub-default-fi.patch b/0115-Use-the-default-device-tree-from-the-grub-default-fi.patch index 5cea59b8..d8bad033 100644 --- a/0115-Use-the-default-device-tree-from-the-grub-default-fi.patch +++ b/0115-Use-the-default-device-tree-from-the-grub-default-fi.patch @@ -1,7 +1,7 @@ From 5111bdda0d0a21ab02f6c9aa441a32cd02c6bc3f Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 12 Feb 2014 14:54:04 -0500 -Subject: [PATCH 115/250] Use the default device tree from the grub default +Subject: [PATCH] Use the default device tree from the grub default file instead of hardcoding a value. @@ -41,6 +41,3 @@ index 462b461ff49..a9692a0c2a2 100644 break fi done --- -2.14.3 - diff --git a/0116-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0116-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 04cfc578..42f406e5 100644 --- a/0116-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0116-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ From 0ff5bf3deefdb17dbadb51a11acc50b96e2ed797 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Sat, 15 Feb 2014 15:10:22 -0500 -Subject: [PATCH 116/250] reopen SNP protocol for exclusive use by grub +Subject: [PATCH] reopen SNP protocol for exclusive use by grub --- grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++ @@ -41,6 +41,3 @@ index 5388f952ba9..ea0e0ca360e 100644 return; } } --- -2.14.3 - diff --git a/0117-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0117-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 4dca0add..5d1ce100 100644 --- a/0117-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0117-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ From 58fba65b7e339d4c7279e4ca88937d9501275169 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 15:13:59 -0500 -Subject: [PATCH 117/250] Revert "reopen SNP protocol for exclusive use by +Subject: [PATCH] Revert "reopen SNP protocol for exclusive use by grub" This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is @@ -50,6 +50,3 @@ index ea0e0ca360e..5388f952ba9 100644 return; } } --- -2.14.3 - diff --git a/0118-Add-grub_util_readlink.patch b/0118-Add-grub_util_readlink.patch index f2068b9a..89fd4261 100644 --- a/0118-Add-grub_util_readlink.patch +++ b/0118-Add-grub_util_readlink.patch @@ -1,7 +1,7 @@ From 76baa996f73eea47f7bdc41461efeee204626e2d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:01:03 -0400 -Subject: [PATCH 118/250] Add grub_util_readlink() +Subject: [PATCH] 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 @@ -3729,6 +3729,3 @@ index 00000000000..9852778f9a5 + REPLACE_GMTIME=0; AC_SUBST([REPLACE_GMTIME]) + REPLACE_LOCALTIME=0; AC_SUBST([REPLACE_LOCALTIME]) +]) --- -2.14.3 - diff --git a/0119-Make-editenv-chase-symlinks-including-those-across-d.patch b/0119-Make-editenv-chase-symlinks-including-those-across-d.patch index 3feb8a96..a3784ef2 100644 --- a/0119-Make-editenv-chase-symlinks-including-those-across-d.patch +++ b/0119-Make-editenv-chase-symlinks-including-those-across-d.patch @@ -1,7 +1,7 @@ From fd1a89c8bef603ec33937f122ae25013a724601a Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:38:00 -0400 -Subject: [PATCH 119/250] Make editenv chase symlinks including those across +Subject: [PATCH] Make editenv chase symlinks including those across devices. This lets us make /boot/grub2/grubenv a symlink to @@ -101,6 +101,3 @@ index c6f8d2298c3..d8d1dad6ab9 100644 free (namenew); + free (rename_target); } --- -2.14.3 - diff --git a/0120-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0120-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch index 7715d550..ec8c12b7 100644 --- a/0120-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +++ b/0120-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch @@ -1,7 +1,7 @@ From c8d93b9e27e9cbf51e91f6cc99abbcb7b68189ce Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 14:23:23 -0400 -Subject: [PATCH 120/250] Generate OS and CLASS in 10_linux from +Subject: [PATCH] Generate OS and CLASS in 10_linux from /etc/os-release This makes us use pretty names in the titles we generate in @@ -28,6 +28,3 @@ index a9692a0c2a2..c6627268cca 100644 else OS="${GRUB_DISTRIBUTOR}" CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" --- -2.14.3 - diff --git a/0121-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0121-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch index 470193aa..612b3360 100644 --- a/0121-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +++ b/0121-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch @@ -1,7 +1,7 @@ From 974241c42b03f3ccb6a5d0eb453283e370da9848 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 15:52:08 -0400 -Subject: [PATCH 121/250] Minimize the sort ordering for .debug and -rescue- +Subject: [PATCH] Minimize the sort ordering for .debug and -rescue- kernels. Resolves: rhbz#1065360 @@ -29,6 +29,3 @@ index cf35e417470..10fabee5e14 100644 esac version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b" return "$?" --- -2.14.3 - diff --git a/0122-Load-arm-with-SB-enabled.patch b/0122-Load-arm-with-SB-enabled.patch index bc6b903a..0c94cbcf 100644 --- a/0122-Load-arm-with-SB-enabled.patch +++ b/0122-Load-arm-with-SB-enabled.patch @@ -1,7 +1,7 @@ From edfc2b0952b1eacf95188e53167cc038e5ea0129 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 18 Sep 2014 11:26:14 -0400 -Subject: [PATCH 122/250] Load arm with SB enabled. +Subject: [PATCH] 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.) @@ -424,6 +424,3 @@ index 00000000000..d9ede36773b + void *kernel_param); + +#endif /* ! GRUB_EFI_LINUX_HEADER */ --- -2.14.3 - diff --git a/0123-Try-prefix-if-fw_path-doesn-t-work.patch b/0123-Try-prefix-if-fw_path-doesn-t-work.patch index 890b3d26..1a00158d 100644 --- a/0123-Try-prefix-if-fw_path-doesn-t-work.patch +++ b/0123-Try-prefix-if-fw_path-doesn-t-work.patch @@ -1,7 +1,7 @@ From 3846b040f1050f246e1e975ee88f22c687ae04bf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 3 Oct 2014 11:08:03 -0400 -Subject: [PATCH 123/250] Try $prefix if $fw_path doesn't work. +Subject: [PATCH] Try $prefix if $fw_path doesn't work. Related: rhbz#1148652 @@ -206,6 +206,3 @@ index 7d9c4f09b9b..b69f9e738fa 100644 return 0; } --- -2.14.3 - diff --git a/0124-Update-info-with-grub.cfg-netboot-selection-order-11.patch b/0124-Update-info-with-grub.cfg-netboot-selection-order-11.patch index 3d383d33..501243ae 100644 --- a/0124-Update-info-with-grub.cfg-netboot-selection-order-11.patch +++ b/0124-Update-info-with-grub.cfg-netboot-selection-order-11.patch @@ -1,7 +1,7 @@ From d4b4184078610a3639fa1e0e463679c424496c3b Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 16:34:51 -0400 -Subject: [PATCH 124/250] Update info with grub.cfg netboot selection order +Subject: [PATCH] Update info with grub.cfg netboot selection order (#1148650) Added documentation to the grub info page that specifies the order @@ -65,6 +65,3 @@ index 6fdd2a041f7..15a90b26e4d 100644 After GRUB has started, files on the TFTP server will be accessible via the @samp{(tftp)} device. --- -2.14.3 - diff --git a/0125-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/0125-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch index 7735a49d..c107e6c4 100644 --- a/0125-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch +++ b/0125-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch @@ -1,7 +1,7 @@ From ce125cafc1e94bf70f2a3dbb545960bd8dd23a2f Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 14:14:19 -0400 -Subject: [PATCH 125/250] Use Distribution Package Sort for grub2-mkconfig +Subject: [PATCH] Use Distribution Package Sort for grub2-mkconfig (#1124074) Users reported that newly installed kernels on their systems installed @@ -446,6 +446,3 @@ index 00000000000..8ce21488448 + +.SH SEE ALSO +.BR "info grub" --- -2.14.3 - diff --git a/0126-Handle-rssd-storage-devices.patch b/0126-Handle-rssd-storage-devices.patch index 34f7da24..ed4eaad1 100644 --- a/0126-Handle-rssd-storage-devices.patch +++ b/0126-Handle-rssd-storage-devices.patch @@ -1,7 +1,7 @@ From 1956a2192ac0a8421ee83bf77fdf223f2be0bdfb Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 Jun 2015 15:50:41 -0400 -Subject: [PATCH 126/250] Handle rssd storage devices. +Subject: [PATCH] Handle rssd storage devices. Resolves: rhbz#1087962 @@ -34,6 +34,3 @@ index 90d92d3ad5c..6d9f4e5faa2 100644 /* If this is a loop device */ if ((strncmp ("loop", p, 4) == 0) && p[4] >= '0' && p[4] <= '9') { --- -2.14.3 - diff --git a/0127-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch b/0127-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch index b0eafb82..0306a93b 100644 --- a/0127-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch +++ b/0127-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch @@ -1,7 +1,7 @@ From 5f89c77c7cff17c931f1ea52af0c39df8ab28ac9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 27 Oct 2014 09:22:55 -0400 -Subject: [PATCH 127/250] Try to emit linux16/initrd16 and linuxefi/initrdefi +Subject: [PATCH] Try to emit linux16/initrd16 and linuxefi/initrdefi in 30-os_prober. Resolves: rhbz#1108296 @@ -72,6 +72,3 @@ index 9b8f5968e2d..dc98eace934 100644 EOF fi cat << EOF --- -2.14.3 - diff --git a/0128-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0128-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index de75077c..50059310 100644 --- a/0128-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0128-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,7 +1,7 @@ From c7ae420d095ccec20481c25b14773ab2fce658b5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 -Subject: [PATCH 128/250] Make grub2-mkconfig construct titles that look like +Subject: [PATCH] Make grub2-mkconfig construct titles that look like the ones we want elsewhere. Resolves: rhbz#1215839 @@ -49,6 +49,3 @@ index c6627268cca..1215241859b 100644 fi echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/" else --- -2.14.3 - diff --git a/0129-Add-friendly-grub2-password-config-tool-985962.patch b/0129-Add-friendly-grub2-password-config-tool-985962.patch index 725011ca..fa1b9bbb 100644 --- a/0129-Add-friendly-grub2-password-config-tool-985962.patch +++ b/0129-Add-friendly-grub2-password-config-tool-985962.patch @@ -1,7 +1,7 @@ From 68f21f5ebebc23a6d8512631f2a1d474afcccd43 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Thu, 25 Jun 2015 11:13:11 -0400 -Subject: [PATCH 129/250] Add friendly grub2 password config tool (#985962) +Subject: [PATCH] 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 @@ -270,6 +270,3 @@ index 00000000000..db2f44bfb78 + fi +fi +EOF --- -2.14.3 - diff --git a/0130-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0130-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 80670fe8..c1e2bbcc 100644 --- a/0130-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0130-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,7 +1,7 @@ From 7a7644507e4d953ea8f8d1d7133622a72a2168f5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 -Subject: [PATCH 130/250] Make grub2-mkconfig construct titles that look like +Subject: [PATCH] Make grub2-mkconfig construct titles that look like the ones we want elsewhere. Resolves: rhbz#1215839 @@ -62,6 +62,3 @@ index 1215241859b..584ad1f4639 100644 if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" --- -2.14.3 - diff --git a/0131-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch b/0131-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch index 66100ece..854db64e 100644 --- a/0131-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch +++ b/0131-Try-to-make-sure-configure.ac-and-grub-rpm-sort-play.patch @@ -1,7 +1,7 @@ From 6f892038567f1706fdde819f5f226ec4cacbea47 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 3 Aug 2015 11:46:42 -0400 -Subject: [PATCH 131/250] Try to make sure configure.ac and grub-rpm-sort play +Subject: [PATCH] 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 @@ -56,6 +56,3 @@ index 954844d2d95..9c410eae493 100644 fi version_test_numeric () --- -2.14.3 - diff --git a/0132-tcp-add-window-scaling-support.patch b/0132-tcp-add-window-scaling-support.patch index c76bc02a..f451a67f 100644 --- a/0132-tcp-add-window-scaling-support.patch +++ b/0132-tcp-add-window-scaling-support.patch @@ -1,7 +1,7 @@ From 71e31c279c07f9f51f2a482b70b40b7deed69a69 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Wed, 12 Aug 2015 08:57:55 -0700 -Subject: [PATCH 132/250] tcp: add window scaling support +Subject: [PATCH] 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 @@ -85,6 +85,3 @@ index e8ad34b84d4..7d4b822626d 100644 tcp_socket_register (socket); --- -2.14.3 - diff --git a/0133-efinet-retransmit-if-our-device-is-busy.patch b/0133-efinet-retransmit-if-our-device-is-busy.patch index 4abd2861..da3b336a 100644 --- a/0133-efinet-retransmit-if-our-device-is-busy.patch +++ b/0133-efinet-retransmit-if-our-device-is-busy.patch @@ -1,7 +1,7 @@ From d09f32622f6fc247dd88f731c34be10395785d8d Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 31 Aug 2015 13:34:35 -0400 -Subject: [PATCH 133/250] efinet: retransmit if our device is busy +Subject: [PATCH] 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 @@ -43,6 +43,3 @@ index 5388f952ba9..3f112438a93 100644 if (limit_time < grub_get_time_ms ()) return grub_error (GRUB_ERR_TIMEOUT, N_("couldn't send network packet")); --- -2.14.3 - diff --git a/0134-Be-more-aggro-about-actually-using-the-configured-ne.patch b/0134-Be-more-aggro-about-actually-using-the-configured-ne.patch index d2ecca3e..497fef7c 100644 --- a/0134-Be-more-aggro-about-actually-using-the-configured-ne.patch +++ b/0134-Be-more-aggro-about-actually-using-the-configured-ne.patch @@ -1,7 +1,7 @@ From 8ece44c2c8f88f531ac9a679f65a263e7b6d2dba Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 11 Sep 2015 17:30:49 -0400 -Subject: [PATCH 134/250] Be more aggro about actually using the *configured* +Subject: [PATCH] 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 @@ -219,6 +219,3 @@ index c7c9f0e1db1..97b9aa7a4d7 100644 #define GRUB_EFI_DEVICE_PATH_TYPE(dp) ((dp)->type & 0x7f) #define GRUB_EFI_DEVICE_PATH_SUBTYPE(dp) ((dp)->subtype) #define GRUB_EFI_DEVICE_PATH_LENGTH(dp) ((dp)->length) --- -2.14.3 - diff --git a/0135-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch b/0135-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch index a11df9ed..2880a6a4 100644 --- a/0135-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch +++ b/0135-efinet-add-filter-for-the-first-exclusive-reopen-of-.patch @@ -1,7 +1,7 @@ From 82b9fdcbbc339c36842c625203fc2b1f22a86c9e Mon Sep 17 00:00:00 2001 From: RHEL Ninjas Date: Fri, 25 Sep 2015 16:24:23 +0900 -Subject: [PATCH 135/250] efinet: add filter for the first exclusive reopen of +Subject: [PATCH] efinet: add filter for the first exclusive reopen of SNP --- @@ -58,6 +58,3 @@ index a3ce4c67cce..b870d3f1938 100644 return; } } --- -2.14.3 - diff --git a/0136-Fix-security-issue-when-reading-username-and-passwor.patch b/0136-Fix-security-issue-when-reading-username-and-passwor.patch index 706f242c..f66528e5 100644 --- a/0136-Fix-security-issue-when-reading-username-and-passwor.patch +++ b/0136-Fix-security-issue-when-reading-username-and-passwor.patch @@ -1,7 +1,7 @@ From 9961e63642244617b697d93bbc49379e23b6839d Mon Sep 17 00:00:00 2001 From: Hector Marco-Gisbert Date: Fri, 13 Nov 2015 16:21:09 +0100 -Subject: [PATCH 136/250] Fix security issue when reading username and password +Subject: [PATCH] Fix security issue when reading username and password This patch fixes two integer underflows at: * grub-core/lib/crypto.c @@ -42,6 +42,3 @@ index 6be678c0de1..c35ce972473 100644 { if (cur_len) { --- -2.14.3 - diff --git a/0137-Warn-if-grub-password-will-not-be-read-1290803.patch b/0137-Warn-if-grub-password-will-not-be-read-1290803.patch index 0a4b0016..6c0a3f12 100644 --- a/0137-Warn-if-grub-password-will-not-be-read-1290803.patch +++ b/0137-Warn-if-grub-password-will-not-be-read-1290803.patch @@ -1,7 +1,7 @@ From 056a956aea898f9d3ee34ecad9660addc3f3108c Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 22 Feb 2016 15:30:05 -0500 -Subject: [PATCH 137/250] Warn if grub password will not be read (#1290803) +Subject: [PATCH] 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 @@ -26,6 +26,3 @@ index dd76f00fc0e..fb9d3a3b6f9 100644 + echo "WARNING: The current configuration lacks password support!" + echo "Update your configuration with @grub_mkconfig@ to support this feature." +fi --- -2.14.3 - diff --git a/0138-Clean-up-grub-setpassword-documentation-1290799.patch b/0138-Clean-up-grub-setpassword-documentation-1290799.patch index d16c9487..7d2b8504 100644 --- a/0138-Clean-up-grub-setpassword-documentation-1290799.patch +++ b/0138-Clean-up-grub-setpassword-documentation-1290799.patch @@ -1,7 +1,7 @@ From 92af2b24adb7371d8234c0b32ae716adf0b80d42 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Tue, 26 Jan 2016 10:28:35 -0500 -Subject: [PATCH 138/250] Clean up grub-setpassword documentation (#1290799) +Subject: [PATCH] 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 @@ -53,6 +53,3 @@ index fb9d3a3b6f9..c8c0fa4199d 100644 Report bugs at https://bugzilla.redhat.com. EOF --- -2.14.3 - diff --git a/0139-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0139-Fix-locale-issue-in-grub-setpassword-1294243.patch index 899b0053..1630d5c7 100644 --- a/0139-Fix-locale-issue-in-grub-setpassword-1294243.patch +++ b/0139-Fix-locale-issue-in-grub-setpassword-1294243.patch @@ -1,7 +1,7 @@ From 373adc50cf9f09015e40ffd1bf79ab9f291f4fc2 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Fri, 29 Jan 2016 16:56:11 -0500 -Subject: [PATCH 139/250] Fix locale issue in grub-setpassword (#1294243) +Subject: [PATCH] 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 @@ -25,6 +25,3 @@ index c8c0fa4199d..d7924af5192 100644 grep -v '[eE]nter password:' | \ sed -e "s/PBKDF2 hash of your password is //" } --- -2.14.3 - diff --git a/0140-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch b/0140-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch index 7d9563f3..c3c876ac 100644 --- a/0140-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch +++ b/0140-efiemu-Handle-persistent-RAM-and-unknown-possible-fu.patch @@ -1,7 +1,7 @@ From eab0520310030376f6295e0338e874bce10b0d5f Mon Sep 17 00:00:00 2001 From: Robert Elliott Date: Fri, 22 Jan 2016 13:32:30 +0100 -Subject: [PATCH 140/250] efiemu: Handle persistent RAM and unknown possible +Subject: [PATCH] efiemu: Handle persistent RAM and unknown possible future additions. (cherry picked from commit ae3b83a4d4df75a01198a2fed7542391e7c449e0) @@ -26,6 +26,3 @@ index 52a032f7b2e..92e7df7e501 100644 return grub_efiemu_add_to_mmap (addr, size, GRUB_EFI_PERSISTENT_MEMORY); default: --- -2.14.3 - diff --git a/0141-efiemu-Fix-compilation-failure.patch b/0141-efiemu-Fix-compilation-failure.patch index 8d65436f..1e084410 100644 --- a/0141-efiemu-Fix-compilation-failure.patch +++ b/0141-efiemu-Fix-compilation-failure.patch @@ -1,7 +1,7 @@ From 68bdf29eb6e376a3b4a817bbe7481efd12b8f9de Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 22 Jan 2016 14:10:30 +0100 -Subject: [PATCH 141/250] efiemu: Fix compilation failure +Subject: [PATCH] efiemu: Fix compilation failure (cherry picked from commit b6a03dfd327489d53ee07c6d7d593b99c7b7cb62) @@ -25,6 +25,3 @@ index 92e7df7e501..52a032f7b2e 100644 return grub_efiemu_add_to_mmap (addr, size, GRUB_EFI_PERSISTENT_MEMORY); default: --- -2.14.3 - diff --git a/0142-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0142-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 2d28835f..c376bd67 100644 --- a/0142-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0142-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ From df19c5ff9c9e716df0383e39992466304053c99d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 7 Apr 2016 10:58:06 -0400 -Subject: [PATCH 142/250] Revert "reopen SNP protocol for exclusive use by +Subject: [PATCH] Revert "reopen SNP protocol for exclusive use by grub" I *think* this should have been replaced by upstream's @@ -64,6 +64,3 @@ index b870d3f1938..a3ce4c67cce 100644 return; } } --- -2.14.3 - diff --git a/0143-Add-a-url-parser.patch b/0143-Add-a-url-parser.patch index e5358eee..56cae880 100644 --- a/0143-Add-a-url-parser.patch +++ b/0143-Add-a-url-parser.patch @@ -1,7 +1,7 @@ From 2f84b2e097ad9f6f7f06013f749251743eb32c2e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 16:18:44 -0400 -Subject: [PATCH 143/250] Add a url parser. +Subject: [PATCH] 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. @@ -1019,6 +1019,3 @@ index 00000000000..a215fa27d0a + char **host, int *port, char **file); + +#endif /* GRUB_URL_HEADER */ --- -2.14.3 - diff --git a/0144-efinet-and-bootp-add-support-for-dhcpv6.patch b/0144-efinet-and-bootp-add-support-for-dhcpv6.patch index 83ec89ed..bc4eda5e 100644 --- a/0144-efinet-and-bootp-add-support-for-dhcpv6.patch +++ b/0144-efinet-and-bootp-add-support-for-dhcpv6.patch @@ -1,7 +1,7 @@ From 48768b0295ad4d908cefd8e8fbee96a4dc2765f5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 8 Jun 2016 21:03:37 -0400 -Subject: [PATCH 144/250] efinet and bootp: add support for dhcpv6 +Subject: [PATCH] efinet and bootp: add support for dhcpv6 Signed-off-by: Peter Jones --- @@ -662,6 +662,3 @@ index 50d62ab0c8c..f8f3ec13acc 100644 grub_err_t grub_net_add_ipv4_local (struct grub_net_network_level_interface *inf, int mask); --- -2.14.3 - diff --git a/0145-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0145-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch index de903a7d..e0f479bd 100644 --- a/0145-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +++ b/0145-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch @@ -1,7 +1,7 @@ From 764506b89942103c3a511d7933edef351fb594b8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 23 Jun 2016 11:01:39 -0400 -Subject: [PATCH 145/250] Add grub-get-kernel-settings and use it in 10_linux +Subject: [PATCH] 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 @@ -298,6 +298,3 @@ index 584ad1f4639..c9bf223f273 100644 "single ${GRUB_CMDLINE_LINUX}" fi --- -2.14.3 - diff --git a/0146-Normalize-slashes-in-tftp-paths.patch b/0146-Normalize-slashes-in-tftp-paths.patch index 447805b0..1e3261b4 100644 --- a/0146-Normalize-slashes-in-tftp-paths.patch +++ b/0146-Normalize-slashes-in-tftp-paths.patch @@ -1,7 +1,7 @@ From 406402dfaecc62ede346793c9c7a0568dc71c131 Mon Sep 17 00:00:00 2001 From: Lenny Szubowicz Date: Mon, 29 Aug 2016 11:04:48 -0400 -Subject: [PATCH 146/250] Normalize slashes in tftp paths. +Subject: [PATCH] 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. @@ -53,6 +53,3 @@ index 1157524fc50..5ca0a96a6f6 100644 rrqlen += grub_strlen (filename) + 1; rrq += grub_strlen (filename) + 1; --- -2.14.3 - diff --git a/0147-Fix-malformed-tftp-packets.patch b/0147-Fix-malformed-tftp-packets.patch index 86dc7e1b..e676a352 100644 --- a/0147-Fix-malformed-tftp-packets.patch +++ b/0147-Fix-malformed-tftp-packets.patch @@ -1,7 +1,7 @@ From 7d05a8298e6a54bfae0038841462443f21da3535 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Tue, 7 Mar 2017 18:26:17 -0500 -Subject: [PATCH 147/250] Fix malformed tftp packets +Subject: [PATCH] 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. @@ -30,6 +30,3 @@ index 5ca0a96a6f6..dcd82494309 100644 grub_strcpy (rrq, "octet"); rrqlen += grub_strlen ("octet") + 1; --- -2.14.3 - diff --git a/0148-Fix-race-in-EFI-validation.patch b/0148-Fix-race-in-EFI-validation.patch index 0f97f282..a7f5bdce 100644 --- a/0148-Fix-race-in-EFI-validation.patch +++ b/0148-Fix-race-in-EFI-validation.patch @@ -1,7 +1,7 @@ From bf59d76ca82eb4eaa20a747f5890d09632ba93d0 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 16:58:51 -0700 -Subject: [PATCH 148/250] Fix race in EFI validation +Subject: [PATCH] Fix race in EFI validation --- grub-core/loader/i386/efi/linux.c | 44 ++++++++++----------------------------- @@ -92,6 +92,3 @@ index e5b778577f9..7ccf32d9d45 100644 if (grub_errno != GRUB_ERR_NONE) { grub_dl_unref (my_mod); --- -2.14.3 - diff --git a/0149-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0149-bz1374141-fix-incorrect-mask-for-ppc64.patch index 6b661861..742d9472 100644 --- a/0149-bz1374141-fix-incorrect-mask-for-ppc64.patch +++ b/0149-bz1374141-fix-incorrect-mask-for-ppc64.patch @@ -1,7 +1,7 @@ From 84a5f535949f590a8976c64c3d1fde08fe0f7464 Mon Sep 17 00:00:00 2001 From: Masahiro Matsuya Date: Sat, 29 Oct 2016 08:35:26 +0900 -Subject: [PATCH 149/250] bz1374141 fix incorrect mask for ppc64 +Subject: [PATCH] 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(). @@ -43,6 +43,3 @@ index 002446be1c3..3df75357a70 100644 } if (gateway_addr.ipv4 != 0) --- -2.14.3 - diff --git a/0150-Use-device-part-of-chainloader-target-if-present.patch b/0150-Use-device-part-of-chainloader-target-if-present.patch index 49bc16df..17cd3a46 100644 --- a/0150-Use-device-part-of-chainloader-target-if-present.patch +++ b/0150-Use-device-part-of-chainloader-target-if-present.patch @@ -1,7 +1,7 @@ From d426e20f8b41ebf114075dc4ffbcaf438ceb4b95 Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Fri, 10 Apr 2015 01:45:02 -0400 -Subject: [PATCH 150/250] Use device part of chainloader target, if present. +Subject: [PATCH] Use device part of chainloader target, if present. Otherwise chainloading is restricted to '$root', which might not even be readable by EFI! @@ -32,6 +32,3 @@ index adc85636633..14ce6ddd7ad 100644 if (! dev) goto fail; --- -2.14.3 - diff --git a/0151-Add-secureboot-support-on-efi-chainloader.patch b/0151-Add-secureboot-support-on-efi-chainloader.patch index 0f54ab85..99d70201 100644 --- a/0151-Add-secureboot-support-on-efi-chainloader.patch +++ b/0151-Add-secureboot-support-on-efi-chainloader.patch @@ -1,7 +1,7 @@ From bbf98517303e438cea398bb74306b6553c880ac3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 13:04:37 -0400 -Subject: [PATCH 151/250] Add secureboot support on efi chainloader +Subject: [PATCH] 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 @@ -795,6 +795,3 @@ index 7d44732d2c3..6e24dae2cb6 100644 struct grub_pe32_fixup_block { grub_uint32_t page_rva; --- -2.14.3 - diff --git a/0152-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0152-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index a1b65328..05c5db43 100644 --- a/0152-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0152-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -1,7 +1,7 @@ From 25ea5be888dcc92cd0b3cb7d34b381f5005f1e30 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 16:09:25 -0400 -Subject: [PATCH 152/250] Make any of the loaders that link in efi mode honor +Subject: [PATCH] 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 @@ -489,6 +489,3 @@ index 10451384720..f7b4d29b0b3 100644 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h --- -2.14.3 - diff --git a/0153-Make-grub_fatal-also-backtrace.patch b/0153-Make-grub_fatal-also-backtrace.patch index b72e6a15..cc29cab6 100644 --- a/0153-Make-grub_fatal-also-backtrace.patch +++ b/0153-Make-grub_fatal-also-backtrace.patch @@ -1,7 +1,7 @@ From eb1a27144476324a22561383a0a2e61aa327d2f5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 27 Jan 2016 09:22:42 -0500 -Subject: [PATCH 153/250] Make grub_fatal() also backtrace. +Subject: [PATCH] Make grub_fatal() also backtrace. --- grub-core/Makefile.core.def | 3 ++ @@ -170,6 +170,3 @@ index c3e03c7275c..c67273db3ae 100644 #include #include #include --- -2.14.3 - diff --git a/0154-Rework-linux-command.patch b/0154-Rework-linux-command.patch index 34995ed8..35f5e071 100644 --- a/0154-Rework-linux-command.patch +++ b/0154-Rework-linux-command.patch @@ -1,7 +1,7 @@ From 12312bfe1727a2992042436cb0f8c8ba1c69ee2f Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:12:39 -0700 -Subject: [PATCH 154/250] Rework linux command +Subject: [PATCH] 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 @@ -102,6 +102,3 @@ index b2438547dd0..e4b8342f5d0 100644 if (file) grub_file_close (file); --- -2.14.3 - diff --git a/0155-Rework-linux16-command.patch b/0155-Rework-linux16-command.patch index 67c4857f..74d3312e 100644 --- a/0155-Rework-linux16-command.patch +++ b/0155-Rework-linux16-command.patch @@ -1,7 +1,7 @@ From 24250bbb84f8817462426c46b255d875de627bf1 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:20:58 -0700 -Subject: [PATCH 155/250] Rework linux16 command +Subject: [PATCH] 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 @@ -96,6 +96,3 @@ index 91283157e30..b864e540333 100644 if (file) grub_file_close (file); --- -2.14.3 - diff --git a/0156-Make-grub-editenv-build-again.patch b/0156-Make-grub-editenv-build-again.patch index bd10ba07..cdb8322f 100644 --- a/0156-Make-grub-editenv-build-again.patch +++ b/0156-Make-grub-editenv-build-again.patch @@ -1,7 +1,7 @@ From ebe69b2682b5b3029d8ea503f12134ee81c4b2ce Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 16:29:13 -0500 -Subject: [PATCH 156/250] Make grub-editenv build again. +Subject: [PATCH] Make grub-editenv build again. 36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage utility functions are defined, and they wind up being linked into @@ -25,6 +25,3 @@ index ed27351eb47..38cdf4ccc09 100644 common = grub-core/osdep/config.c; common = util/config.c; common = util/resolve.c; --- -2.14.3 - diff --git a/0157-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0157-Fix-up-some-man-pages-rpmdiff-noticed.patch index 929f3612..5297f3ea 100644 --- a/0157-Fix-up-some-man-pages-rpmdiff-noticed.patch +++ b/0157-Fix-up-some-man-pages-rpmdiff-noticed.patch @@ -1,7 +1,7 @@ From c71e6152ea8e4e525a853441bb5f08808bae3afd Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 23 Sep 2014 09:58:49 -0400 -Subject: [PATCH 157/250] Fix up some man pages rpmdiff noticed. +Subject: [PATCH] Fix up some man pages rpmdiff noticed. --- configure.ac | 2 ++ @@ -148,6 +148,3 @@ index 00000000000..85309482718 + +.SH SEE ALSO +.BR "info grub" --- -2.14.3 - diff --git a/0158-Re-work-some-intricacies-of-PE-loading.patch b/0158-Re-work-some-intricacies-of-PE-loading.patch index 0b26acea..96d8b35b 100644 --- a/0158-Re-work-some-intricacies-of-PE-loading.patch +++ b/0158-Re-work-some-intricacies-of-PE-loading.patch @@ -1,7 +1,7 @@ From 145214ee7c411c7d600016f011dc11b213bce0b2 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 9 Jun 2016 12:22:29 -0400 -Subject: [PATCH 158/250] Re-work some intricacies of PE loading. +Subject: [PATCH] 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 @@ -348,6 +348,3 @@ index 6e24dae2cb6..c03cc599f63 100644 #define GRUB_PE32_SIGNATURE_SIZE 4 struct grub_pe32_header --- -2.14.3 - diff --git a/0159-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch b/0159-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch index 145a43d7..26b55ee8 100644 --- a/0159-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +++ b/0159-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch @@ -1,7 +1,7 @@ From ef24bc601e11b96eefe06f477b5da1199d761b3d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 10 Jun 2016 14:06:15 -0400 -Subject: [PATCH 159/250] Rework even more of efi chainload so non-sb cases +Subject: [PATCH] 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 @@ -411,6 +411,3 @@ index d9ede36773b..0033d9305a9 100644 EXPORT_FUNC(grub_linuxefi_secure_validate) (void *data, grub_uint32_t size); grub_err_t EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset, --- -2.14.3 - diff --git a/0160-linuxefi-fix-double-free-on-verification-failure.patch b/0160-linuxefi-fix-double-free-on-verification-failure.patch index b8bf0a11..f81ac00c 100644 --- a/0160-linuxefi-fix-double-free-on-verification-failure.patch +++ b/0160-linuxefi-fix-double-free-on-verification-failure.patch @@ -1,7 +1,7 @@ From 5ef3f00e6be3033092453a66f456b8dac8cd4f7c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 09:50:25 -0400 -Subject: [PATCH 160/250] linuxefi: fix double free on verification failure. +Subject: [PATCH] linuxefi: fix double free on verification failure. Signed-off-by: Peter Jones --- @@ -20,6 +20,3 @@ index 82f75b7f3ab..010bf982d80 100644 goto fail; } --- -2.14.3 - diff --git a/0161-fix-machine-type-test-in-30_os-prober.in.patch b/0161-fix-machine-type-test-in-30_os-prober.in.patch index c341acb8..7bd4d4ec 100644 --- a/0161-fix-machine-type-test-in-30_os-prober.in.patch +++ b/0161-fix-machine-type-test-in-30_os-prober.in.patch @@ -1,7 +1,7 @@ From 4139fdfdb64fd248a0d5f200b27c583159dbb190 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 11 Jul 2016 13:36:45 -0400 -Subject: [PATCH 161/250] fix machine type test in 30_os-prober.in +Subject: [PATCH] fix machine type test in 30_os-prober.in Signed-off-by: Peter Jones --- @@ -20,6 +20,3 @@ index dc98eace934..e40274fc0f4 100644 case "$machine" in i?86|x86_64) sixteenbit="16" --- -2.14.3 - diff --git a/0162-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch b/0162-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch index 9aa93827..2e56d974 100644 --- a/0162-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +++ b/0162-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch @@ -1,7 +1,7 @@ From 671699a76fa6510a62c3a94acd698a31686cb8fa Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 21 Nov 2016 15:34:00 +0100 -Subject: [PATCH 162/250] efi/chainloader: fix wrong sanity check in +Subject: [PATCH] efi/chainloader: fix wrong sanity check in relocate_coff() In relocate_coff(), the relocation entries are parsed from the original @@ -34,6 +34,3 @@ index b977c7b5573..d5ab21d09c3 100644 { grub_error (GRUB_ERR_BAD_ARGUMENT, "Reloc entry %d overflows binary", n); --- -2.14.3 - diff --git a/0163-efi-chainloader-truncate-overlong-relocation-section.patch b/0163-efi-chainloader-truncate-overlong-relocation-section.patch index cea43ce6..8daedc6d 100644 --- a/0163-efi-chainloader-truncate-overlong-relocation-section.patch +++ b/0163-efi-chainloader-truncate-overlong-relocation-section.patch @@ -1,7 +1,7 @@ From d081bd5f47235e3bfd256fd262a6f98fe8b0d0ff Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 23 Nov 2016 06:27:09 +0100 -Subject: [PATCH 163/250] efi/chainloader: truncate overlong relocation section +Subject: [PATCH] efi/chainloader: truncate overlong relocation section The UEFI Windows 7 boot loader ("EFI/Microsoft/Boot/bootmgfw.efi", SHA1 31b410e029bba87d2068c65a80b88882f9f8ea25) has inconsistent headers. @@ -108,6 +108,3 @@ index d5ab21d09c3..7826e794ad9 100644 { grub_dprintf ("chain", " section is not reloc section?\n"); grub_dprintf ("chain", " rds: 0x%08x, vs: %08x\n", --- -2.14.3 - diff --git a/0164-linuxefi-minor-cleanups.patch b/0164-linuxefi-minor-cleanups.patch index f53f9433..4f583dc3 100644 --- a/0164-linuxefi-minor-cleanups.patch +++ b/0164-linuxefi-minor-cleanups.patch @@ -1,7 +1,7 @@ From 8dc21ff37f62f3d10fb3d708ffd33b7d723a23cf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:31:52 -0500 -Subject: [PATCH 164/250] linuxefi: minor cleanups +Subject: [PATCH] linuxefi: minor cleanups Signed-off-by: Peter Jones --- @@ -84,6 +84,3 @@ index 010bf982d80..8b5a817b9d1 100644 return grub_errno; } --- -2.14.3 - diff --git a/0165-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0165-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch index 9a372cdd..283ce124 100644 --- a/0165-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +++ b/0165-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch @@ -1,7 +1,7 @@ From 10d6d333de0aa7e390a22ebc4b308f7ad937d5bc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:18:54 -0500 -Subject: [PATCH 165/250] Handle multi-arch (64-on-32) boot in linuxefi loader. +Subject: [PATCH] Handle multi-arch (64-on-32) boot in linuxefi loader. Allow booting 64-bit kernels on 32-bit EFI on x86. @@ -271,6 +271,3 @@ index fc36bdaf367..110ecf806fb 100644 grub_uint32_t cmdline_size; grub_uint32_t hardware_subarch; grub_uint64_t hardware_subarch_data; --- -2.14.3 - diff --git a/0166-Fix-up-linux-params-usage.patch b/0166-Fix-up-linux-params-usage.patch index c5901ba2..229445d7 100644 --- a/0166-Fix-up-linux-params-usage.patch +++ b/0166-Fix-up-linux-params-usage.patch @@ -1,7 +1,7 @@ From 93be95c27b0ddb63c2e3a287a3ed92c0a5de93e5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 May 2017 14:16:07 -0400 -Subject: [PATCH 166/250] Fix up linux params usage... +Subject: [PATCH] Fix up linux params usage... Signed-off-by: Peter Jones --- @@ -38,6 +38,3 @@ index e4b8342f5d0..c9e89310bdd 100644 kernel_offset += len; linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE; --- -2.14.3 - diff --git a/0167-Make-exit-take-a-return-code.patch b/0167-Make-exit-take-a-return-code.patch index 3046012e..51687cad 100644 --- a/0167-Make-exit-take-a-return-code.patch +++ b/0167-Make-exit-take-a-return-code.patch @@ -1,7 +1,7 @@ From 6b67d46c1764c86611939dc01267f9c70f413184 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 26 Feb 2014 21:49:12 -0500 -Subject: [PATCH 167/250] Make "exit" take a return code. +Subject: [PATCH] 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 @@ -51,6 +51,3 @@ index 5ce89a40c68..04371ac49f2 100644 void grub_fatal (const char *fmt, ...) { --- -2.14.3 - diff --git a/0168-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/0168-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch index 738c762f..fb729661 100644 --- a/0168-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +++ b/0168-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch @@ -1,7 +1,7 @@ From e48a4c0b9e475b16366ff6c375de5186432eb1f7 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 17 Apr 2017 08:44:29 -0400 -Subject: [PATCH 168/250] arm64: make sure fdt has #address-cells and +Subject: [PATCH] arm64: make sure fdt has #address-cells and #size-cells properties Recent upstream changes to kexec-tools relies on #address-cells @@ -40,6 +40,3 @@ index ad39a301527..59ff9cc05b4 100644 if (node < 1) goto failure; --- -2.14.3 - diff --git a/0169-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch b/0169-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch index b961aac9..d91b7e48 100644 --- a/0169-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch +++ b/0169-Add-some-grub_dprintf-in-the-secure-boot-verify-code.patch @@ -1,7 +1,7 @@ From 755fa5ccf0834abdb7e50a1cb06fad618f6c9af6 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 9 May 2016 14:15:17 -0400 -Subject: [PATCH 169/250] Add some grub_dprintf() in the secure boot verify +Subject: [PATCH] Add some grub_dprintf() in the secure boot verify code. Signed-off-by: Peter Jones @@ -39,6 +39,3 @@ index 2a7024134da..7fe7201a388 100644 return -1; } --- -2.14.3 - diff --git a/0170-Make-our-info-pages-say-grub2-where-appropriate.patch b/0170-Make-our-info-pages-say-grub2-where-appropriate.patch index 7124a137..a1dc75db 100644 --- a/0170-Make-our-info-pages-say-grub2-where-appropriate.patch +++ b/0170-Make-our-info-pages-say-grub2-where-appropriate.patch @@ -1,7 +1,7 @@ From 15c340acd845056ba259b9fffd6c7d083874cb82 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 6 May 2016 18:43:08 -0400 -Subject: [PATCH 170/250] Make our info pages say "grub2" where appropriate. +Subject: [PATCH] Make our info pages say "grub2" where appropriate. This needs to be hooked up to --program-transform=, but I haven't had time. @@ -1011,6 +1011,3 @@ index 15a90b26e4d..f28c4cd5247 100644 @table @option @item --help --- -2.14.3 - diff --git a/0171-print-more-debug-info-in-our-module-loader.patch b/0171-print-more-debug-info-in-our-module-loader.patch index 0cd05868..16c10348 100644 --- a/0171-print-more-debug-info-in-our-module-loader.patch +++ b/0171-print-more-debug-info-in-our-module-loader.patch @@ -1,7 +1,7 @@ From 0d0a7ebbed42b97fca63cbcaf85a469b77c76fda Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 May 2017 11:19:40 -0400 -Subject: [PATCH 171/250] print more debug info in our module loader. +Subject: [PATCH] print more debug info in our module loader. Signed-off-by: Peter Jones --- @@ -39,6 +39,3 @@ index 684ca93f8f4..866fc20e162 100644 return (grub_addr_t) info; } --- -2.14.3 - diff --git a/0172-macos-just-build-chainloader-entries-don-t-try-any-x.patch b/0172-macos-just-build-chainloader-entries-don-t-try-any-x.patch index 37de0bf6..f93c9c93 100644 --- a/0172-macos-just-build-chainloader-entries-don-t-try-any-x.patch +++ b/0172-macos-just-build-chainloader-entries-don-t-try-any-x.patch @@ -1,7 +1,7 @@ From 4cb6b65d74966dfbe6e8463ee1e88d99ca7de5b1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 12:42:32 -0400 -Subject: [PATCH 172/250] macos: just build chainloader entries, don't try any +Subject: [PATCH] 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 @@ -123,6 +123,3 @@ index e40274fc0f4..d979de1982a 100644 ;; hurd) onstr="$(gettext_printf "(on %s)" "${DEVICE}")" --- -2.14.3 - diff --git a/0173-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch b/0173-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch index 3ee77bad..2087c219 100644 --- a/0173-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch +++ b/0173-grub2-btrfs-Add-ability-to-boot-from-subvolumes.patch @@ -1,7 +1,7 @@ From 396001716b7f8c7a6aee17f33fdb9e5d47424cbc Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Wed, 18 Dec 2013 09:57:04 +0000 -Subject: [PATCH 173/250] grub2/btrfs: Add ability to boot from subvolumes +Subject: [PATCH] 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. @@ -701,6 +701,3 @@ index 9d93fb6c182..234ad976771 100644 GRUB_BTRFS_ITEM_TYPE_CHUNK = 0xe4 }; --- -2.14.3 - diff --git a/0174-export-btrfs_subvol-and-btrfs_subvolid.patch b/0174-export-btrfs_subvol-and-btrfs_subvolid.patch index aba1c5f6..65983122 100644 --- a/0174-export-btrfs_subvol-and-btrfs_subvolid.patch +++ b/0174-export-btrfs_subvol-and-btrfs_subvolid.patch @@ -1,7 +1,7 @@ From 35c1015fc1a4313be34757eebb195547336e0edf Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 18 Dec 2013 09:57:04 +0000 -Subject: [PATCH 174/250] export btrfs_subvol and btrfs_subvolid +Subject: [PATCH] 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. @@ -24,6 +24,3 @@ index 38facf3cb8b..3962961666e 100644 } GRUB_MOD_FINI (btrfs) --- -2.14.3 - diff --git a/0175-grub2-btrfs-03-follow_default.patch b/0175-grub2-btrfs-03-follow_default.patch index fd884746..a5f7e14e 100644 --- a/0175-grub2-btrfs-03-follow_default.patch +++ b/0175-grub2-btrfs-03-follow_default.patch @@ -1,7 +1,7 @@ From 476a0251e8ca2850da7c383baf7fdbd810bc789f Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 -Subject: [PATCH 175/250] grub2-btrfs-03-follow_default +Subject: [PATCH] grub2-btrfs-03-follow_default --- grub-core/fs/btrfs.c | 107 ++++++++++++++++++++++++++++++++++++--------------- @@ -194,6 +194,3 @@ index 3962961666e..2c462584e91 100644 } GRUB_MOD_FINI (btrfs) --- -2.14.3 - diff --git a/0176-grub2-btrfs-04-grub2-install.patch b/0176-grub2-btrfs-04-grub2-install.patch index ac0b82b7..9f5507ad 100644 --- a/0176-grub2-btrfs-04-grub2-install.patch +++ b/0176-grub2-btrfs-04-grub2-install.patch @@ -1,7 +1,7 @@ From e03dd83cc804d70af0716d0a429715afbcdc7eae Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 -Subject: [PATCH 176/250] grub2-btrfs-04-grub2-install +Subject: [PATCH] grub2-btrfs-04-grub2-install --- grub-core/osdep/linux/getroot.c | 7 +++++++ @@ -172,6 +172,3 @@ index 875d5896ce1..c9a7e5f4ade 100644 }; void --- -2.14.3 - diff --git a/0177-grub2-btrfs-05-grub2-mkconfig.patch b/0177-grub2-btrfs-05-grub2-mkconfig.patch index 05f8939e..502f5b08 100644 --- a/0177-grub2-btrfs-05-grub2-mkconfig.patch +++ b/0177-grub2-btrfs-05-grub2-mkconfig.patch @@ -1,7 +1,7 @@ From cb43e7a6c96127e72d6787c6063de8911284fe18 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 21 Aug 2014 03:39:11 +0000 -Subject: [PATCH 177/250] grub2-btrfs-05-grub2-mkconfig +Subject: [PATCH] grub2-btrfs-05-grub2-mkconfig --- util/grub-mkconfig.in | 3 ++- @@ -125,6 +125,3 @@ index 54f1ec8a2fd..462f8e1f819 100644 fi;; xzfs) rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` --- -2.14.3 - diff --git a/0178-grub2-btrfs-06-subvol-mount.patch b/0178-grub2-btrfs-06-subvol-mount.patch index fdd7008d..0c37866f 100644 --- a/0178-grub2-btrfs-06-subvol-mount.patch +++ b/0178-grub2-btrfs-06-subvol-mount.patch @@ -1,7 +1,7 @@ From 84d6a482c2c8d0677141bb888512a6a89daf9d8b Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 22 May 2015 11:45:25 +0000 -Subject: [PATCH 178/250] grub2-btrfs-06-subvol-mount +Subject: [PATCH] grub2-btrfs-06-subvol-mount --- grub-core/fs/btrfs.c | 195 +++++++++++++++++++++++++++++++++++++++- @@ -535,6 +535,3 @@ index 73fa2d34abb..9c642ae3fe3 100644 /* Devmapper functions provided by getroot_devmapper.c. */ void grub_util_pull_devmapper (const char *os_dev); --- -2.14.3 - diff --git a/0179-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch b/0179-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch index e68794b2..2dfb6210 100644 --- a/0179-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch +++ b/0179-No-more-Bootable-Snapshot-submenu-in-grub.cfg.patch @@ -1,7 +1,7 @@ From 741c0651cd54970c08e9c19a82f5805aafbfda23 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Sat, 18 Jul 2015 15:38:08 +0000 -Subject: [PATCH 179/250] No more "Bootable Snapshot" submenu in grub.cfg. +Subject: [PATCH] No more "Bootable Snapshot" submenu in grub.cfg. This breaks grubby (run on kernel upgrades) because grubby just does a search for "menuentry". @@ -29,6 +29,3 @@ index e2a53300126..8a16fea347e 100644 -fi -EOF -fi --- -2.14.3 - diff --git a/0180-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch b/0180-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch index dd53e25b..6d3a7f9c 100644 --- a/0180-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch +++ b/0180-Fallback-to-old-subvol-name-scheme-to-support-old-sn.patch @@ -1,7 +1,7 @@ From ab8e0d4bf544b708f5afa4cc56e6bd16789f2f1e Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Tue, 21 Jun 2016 16:44:17 +0000 -Subject: [PATCH 180/250] Fallback to old subvol name scheme to support old +Subject: [PATCH] Fallback to old subvol name scheme to support old snapshot config Ref: bsc#953538 @@ -56,6 +56,3 @@ index d111147e836..a5c000805a7 100644 if (btrfs_default_subvolid) return lookup_root_by_id(data, btrfs_default_subvolid); --- -2.14.3 - diff --git a/0181-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch b/0181-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch index 1acaf3bd..c68d6272 100644 --- a/0181-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch +++ b/0181-Grub-not-working-correctly-with-btrfs-snapshots-bsc-.patch @@ -1,7 +1,7 @@ From eb8535428a42c7099666ddb58ac900bb8ee745ba Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 11 May 2017 08:56:57 +0000 -Subject: [PATCH 181/250] Grub not working correctly with btrfs snapshots +Subject: [PATCH] Grub not working correctly with btrfs snapshots (bsc#1026511) --- @@ -271,6 +271,3 @@ index a5c000805a7..3cd9472197c 100644 grub_register_variable_hook ("btrfs_subvol", subvol_get_env, subvol_set_env); grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env, --- -2.14.3 - diff --git a/0182-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch b/0182-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch index 7e394257..35496c08 100644 --- a/0182-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch +++ b/0182-Add-grub_efi_allocate_pool-and-grub_efi_free_pool-wr.patch @@ -1,7 +1,7 @@ From 2a6e1d2491b7334985ad25315faa22d26354d8b7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 09:59:56 -0400 -Subject: [PATCH 182/250] Add grub_efi_allocate_pool() and grub_efi_free_pool() +Subject: [PATCH] Add grub_efi_allocate_pool() and grub_efi_free_pool() wrappers. Signed-off-by: Peter Jones @@ -70,6 +70,3 @@ index 91e29ce66f1..68326d96f5a 100644 extern int EXPORT_VAR(grub_efi_is_finished); struct grub_net_card; --- -2.14.3 - diff --git a/0183-Use-grub_efi_.-memory-helpers-where-reasonable.patch b/0183-Use-grub_efi_.-memory-helpers-where-reasonable.patch index 1a977bf5..fe13ef77 100644 --- a/0183-Use-grub_efi_.-memory-helpers-where-reasonable.patch +++ b/0183-Use-grub_efi_.-memory-helpers-where-reasonable.patch @@ -1,7 +1,7 @@ From 6ea13cdb3f33da45d7a8042d85ad87e2a18fc946 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 10:06:38 -0400 -Subject: [PATCH 183/250] Use grub_efi_...() memory helpers where reasonable. +Subject: [PATCH] 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 @@ -104,6 +104,3 @@ index 7826e794ad9..d2557b38dce 100644 if (cmdline) grub_free (cmdline); --- -2.14.3 - diff --git a/0184-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch b/0184-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch index c07ef176..f64aa82c 100644 --- a/0184-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch +++ b/0184-Add-PRIxGRUB_EFI_STATUS-and-use-it.patch @@ -1,7 +1,7 @@ From eae94a16a8ae350cdeab8b7742f9227d92001272 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 1 Jun 2017 10:07:50 -0400 -Subject: [PATCH 184/250] Add PRIxGRUB_EFI_STATUS and use it. +Subject: [PATCH] Add PRIxGRUB_EFI_STATUS and use it. This avoids syntax checkers getting confused about if it's llx or lx. @@ -44,6 +44,3 @@ index 02488ec35ae..ddc5ecfb03d 100644 #define GRUB_EFI_ERROR_CODE(value) \ ((((grub_efi_status_t) 1) << (sizeof (grub_efi_status_t) * 8 - 1)) | (value)) --- -2.14.3 - diff --git a/0185-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/0185-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch index af819227..cdeb9412 100644 --- a/0185-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +++ b/0185-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch @@ -1,7 +1,7 @@ From 41a50aa2c275076caa2f9fe7a747eeb054abed16 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:42:57 -0400 -Subject: [PATCH 185/250] Don't use dynamic sized arrays since we don't build +Subject: [PATCH] Don't use dynamic sized arrays since we don't build with -std=c99 --- @@ -41,6 +41,3 @@ index 4be228d9576..fa3e2912643 100644 if (client_uuid) { grub_strcpy (suffix, client_uuid); --- -2.14.3 - diff --git a/0186-don-t-ignore-const.patch b/0186-don-t-ignore-const.patch index b1d2a0db..138100a0 100644 --- a/0186-don-t-ignore-const.patch +++ b/0186-don-t-ignore-const.patch @@ -1,7 +1,7 @@ From d06e2578107f217d2bc8beee7fd0dc7f2645873d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:43:22 -0400 -Subject: [PATCH 186/250] don't ignore const +Subject: [PATCH] don't ignore const --- grub-core/net/tftp.c | 2 +- @@ -20,6 +20,3 @@ index dcd82494309..f90071353ad 100644 while (*src != '\0') { --- -2.14.3 - diff --git a/0187-don-t-use-int-for-efi-status.patch b/0187-don-t-use-int-for-efi-status.patch index b5345d5a..ce63f58d 100644 --- a/0187-don-t-use-int-for-efi-status.patch +++ b/0187-don-t-use-int-for-efi-status.patch @@ -1,7 +1,7 @@ From 6d86c59c24e12c8e8471cdd2affca574fdee160d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:44:59 -0400 -Subject: [PATCH 187/250] don't use int for efi status +Subject: [PATCH] don't use int for efi status --- grub-core/kern/efi/efi.c | 2 +- @@ -20,6 +20,3 @@ index 866fc20e162..91f75fdb89a 100644 if (retval == 0) rc = GRUB_EFI_SUCCESS; --- -2.14.3 - diff --git a/0188-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0188-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch index 69d7c360..0c873ea9 100644 --- a/0188-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +++ b/0188-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch @@ -1,7 +1,7 @@ From ba6828d073bbda85eba59a9ce9220eada51a540b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:46:23 -0400 -Subject: [PATCH 188/250] make GRUB_MOD_INIT() declare its function prototypes. +Subject: [PATCH] make GRUB_MOD_INIT() declare its function prototypes. --- include/grub/dl.h | 2 ++ @@ -27,6 +27,3 @@ index 2bca56ce0e8..b1ed3c33317 100644 void \ grub_##name##_fini (void) { grub_mod_fini (); } \ static void \ --- -2.14.3 - diff --git a/0189-Clean-up-some-errors-in-the-linuxefi-loader.patch b/0189-Clean-up-some-errors-in-the-linuxefi-loader.patch index 6cb714e4..06cecba9 100644 --- a/0189-Clean-up-some-errors-in-the-linuxefi-loader.patch +++ b/0189-Clean-up-some-errors-in-the-linuxefi-loader.patch @@ -1,7 +1,7 @@ From 8bdc0c77919ddb9bd588ac45e96c96497683f76c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 15:58:18 -0400 -Subject: [PATCH 189/250] Clean up some errors in the linuxefi loader +Subject: [PATCH] Clean up some errors in the linuxefi loader Signed-off-by: Peter Jones --- @@ -64,6 +64,3 @@ index bed5919cab3..6db5d0bf3a0 100644 grub_efi_free_pages ((grub_efi_physical_address_t)(grub_addr_t) linux_cmdline, BYTES_TO_PAGES(lh->cmdline_size + 1)); --- -2.14.3 - diff --git a/0190-editenv-handle-relative-symlinks.patch b/0190-editenv-handle-relative-symlinks.patch index 49c538f8..7a772617 100644 --- a/0190-editenv-handle-relative-symlinks.patch +++ b/0190-editenv-handle-relative-symlinks.patch @@ -1,7 +1,7 @@ From 098987b7b5fcc15a5ba3600fa132fcec36095c5a Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 14 Aug 2017 14:37:20 -0400 -Subject: [PATCH 190/250] editenv: handle relative symlinks +Subject: [PATCH] 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. @@ -48,6 +48,3 @@ index d8d1dad6ab9..41bc7cb1c9a 100644 } int rc = grub_util_rename (namenew, rename_target); --- -2.14.3 - diff --git a/0191-Make-libgrub.pp-depend-on-config-util.h.patch b/0191-Make-libgrub.pp-depend-on-config-util.h.patch index 74339b8f..7df011ad 100644 --- a/0191-Make-libgrub.pp-depend-on-config-util.h.patch +++ b/0191-Make-libgrub.pp-depend-on-config-util.h.patch @@ -1,7 +1,7 @@ From c86299049c2cc0503728deee280d9f6bf50886f4 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 23 Aug 2017 10:37:27 -0400 -Subject: [PATCH 191/250] Make libgrub.pp depend on config-util.h +Subject: [PATCH] Make libgrub.pp depend on config-util.h If you build with "make -j48" a lot, sometimes you see: @@ -43,6 +43,3 @@ index 7795baeb654..c7b0e6a9c46 100644 $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrubmods_a_CPPFLAGS) $(libgrubkern_a_CPPFLAGS) $(CPPFLAGS) \ -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1) CLEANFILES += libgrub.pp --- -2.14.3 - diff --git a/0192-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch b/0192-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch index 103216aa..68c1cbb1 100644 --- a/0192-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch +++ b/0192-Don-t-guess-boot-efi-as-HFS-on-ppc-machines-in-grub-.patch @@ -1,7 +1,7 @@ From 351799d9310a4bec23ed4074444780c2a35435fd Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 20 Apr 2017 13:29:06 -0400 -Subject: [PATCH 192/250] Don't guess /boot/efi/ as HFS+ on ppc machines in +Subject: [PATCH] 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 @@ -39,6 +39,3 @@ index cd84a72b97b..48f2abc3ea5 100644 if (!grub_util_is_directory (d)) { free (d); --- -2.14.3 - diff --git a/0193-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch b/0193-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch index f34f1e45..c9de84e4 100644 --- a/0193-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch +++ b/0193-Fix-util-grub.d-20_linux_xen.in-Add-xen_boot-command.patch @@ -1,7 +1,7 @@ From cba0322cd88baf136ac693f5ec1826f3314daeff Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Mon, 28 Aug 2017 13:51:14 -0400 -Subject: [PATCH 193/250] Fix util/grub.d/20_linux_xen.in: Add xen_boot command +Subject: [PATCH] Fix util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64 Commit d33045ce7ffcb7c1e4a60c14d5ca64b36e3c5abe introduced @@ -57,6 +57,3 @@ index 462f8e1f819..9b1bd716965 100644 fi while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` --- -2.14.3 - diff --git a/0194-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch b/0194-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch index 93064b95..8b84cd0a 100644 --- a/0194-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch +++ b/0194-Use-grub-file-to-figure-out-whether-multiboot2-shoul.patch @@ -1,7 +1,7 @@ From 87c089b6f1945ebcc690697d279c74284f1b4072 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Mon, 28 Aug 2017 13:59:12 -0400 -Subject: [PATCH 194/250] Use grub-file to figure out whether multiboot2 should +Subject: [PATCH] Use grub-file to figure out whether multiboot2 should be used for Xen.gz The multiboot2 is much more preferable than multiboot. Especiall @@ -28,6 +28,3 @@ index 9b1bd716965..fae1ffe9494 100644 fi while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` --- -2.14.3 - diff --git a/0195-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch b/0195-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch index f18d68b7..2530b54b 100644 --- a/0195-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch +++ b/0195-20_linux_xen-load-xen-or-multiboot-2-modules-as-need.patch @@ -1,7 +1,7 @@ From 92d3db585076d022521ab94a2ceed03eb05013fc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 19 Oct 2017 11:29:11 -0400 -Subject: [PATCH 195/250] 20_linux_xen: load xen or multiboot{,2} modules as +Subject: [PATCH] 20_linux_xen: load xen or multiboot{,2} modules as needed. Signed-off-by: Peter Jones @@ -30,6 +30,3 @@ index fae1ffe9494..fc53bd54231 100644 ${module_loader} --nounzip ${rel_dirname}/${initrd} EOF fi --- -2.14.3 - diff --git a/0196-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch b/0196-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch index c8386222..fcfc8a6a 100644 --- a/0196-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch +++ b/0196-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch @@ -1,8 +1,8 @@ -From 2e5b957292d3f313d48bded25e8ca83468326c5b Mon Sep 17 00:00:00 2001 +From 446794de8da4329ea532cbee4ca877bcafd0e534 Mon Sep 17 00:00:00 2001 From: "David E. Box" Date: Fri, 15 Sep 2017 15:37:05 -0700 -Subject: [PATCH 196/250] tsc: Change default tsc calibration method to pmtimer - on EFI systems +Subject: [PATCH] tsc: Change default tsc calibration method to pmtimer on EFI + systems On efi systems, make pmtimer based tsc calibration the default over the pit. This prevents Grub from hanging on Intel SoC systems that power gate @@ -27,6 +27,3 @@ index 2e85289d848..f266eb13185 100644 #elif defined (GRUB_MACHINE_COREBOOT) (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || calibrate_tsc_hardcode()); #else --- -2.14.3 - diff --git a/0197-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0197-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch index 6350cf1f..236d7970 100644 --- a/0197-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch +++ b/0197-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch @@ -1,7 +1,7 @@ From 0b158c30810db86f549cabd6e6021ab15962370d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 7 Nov 2017 17:12:17 -0500 -Subject: [PATCH 197/250] Make pmtimer tsc calibration not take 51 seconds to +Subject: [PATCH] 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 @@ -210,6 +210,3 @@ index c9c36169978..ca15c3aacd7 100644 tsc_diff = grub_pmtimer_wait_count_tsc (pmtimer, 3580); if (tsc_diff == 0) return 0; --- -2.14.3 - diff --git a/0198-align-struct-efi_variable-better.patch b/0198-align-struct-efi_variable-better.patch index 8ce8bdc8..2ad86512 100644 --- a/0198-align-struct-efi_variable-better.patch +++ b/0198-align-struct-efi_variable-better.patch @@ -1,7 +1,7 @@ From 2485633ada06c11c07a34a696a92b14e58f1e846 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 27 Feb 2018 13:55:35 -0500 -Subject: [PATCH 198/250] align struct efi_variable better... +Subject: [PATCH] align struct efi_variable better... --- include/grub/efiemu/runtime.h | 2 +- @@ -31,6 +31,3 @@ index b93e4820194..f6a9723971d 100644 #ifdef GRUB_BUILD # define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P --- -2.14.3 - diff --git a/0199-Add-quicksort-implementation.patch b/0199-Add-quicksort-implementation.patch index 6f0e50ed..d8db032d 100644 --- a/0199-Add-quicksort-implementation.patch +++ b/0199-Add-quicksort-implementation.patch @@ -1,7 +1,7 @@ From a2cd100d71711b950beaf60ea7ddca4c77a70d59 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 9 Dec 2016 15:39:47 -0500 -Subject: [PATCH 199/250] Add quicksort implementation +Subject: [PATCH] Add quicksort implementation This will be used to sort the boot menu entries that are read from the BootLoaderSpec config files. @@ -320,6 +320,3 @@ index 4737da1eaa9..3d55bafd64e 100644 + void *state); + #endif /* ! GRUB_MISC_HEADER */ --- -2.14.3 - diff --git a/0200-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch b/0200-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch index 3bd5dab6..a41a1829 100644 --- a/0200-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch +++ b/0200-Add-blscfg-command-support-to-parse-BootLoaderSpec-c.patch @@ -1,7 +1,7 @@ From ed595feeea2f7b7fd0158d42fa2fd39420eea683 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 9 Dec 2016 15:40:58 -0500 -Subject: [PATCH 200/250] Add blscfg command support to parse BootLoaderSpec +Subject: [PATCH] Add blscfg command support to parse BootLoaderSpec config fragments The BootLoaderSpec (BLS) defines a scheme where different bootloaders can @@ -1137,6 +1137,3 @@ index c9e1d7a73dc..9859ff4cc79 100644 +#define UNUSED __attribute__((__unused__)) + #endif /* ! GRUB_COMPILER_HEADER */ --- -2.14.3 - diff --git a/0201-Add-BLS-support-to-grub-mkconfig.patch b/0201-Add-BLS-support-to-grub-mkconfig.patch index 3de6cf88..ccac5c22 100644 --- a/0201-Add-BLS-support-to-grub-mkconfig.patch +++ b/0201-Add-BLS-support-to-grub-mkconfig.patch @@ -1,7 +1,7 @@ From d847a4806bb7a4f3b457d0074d712e500fbd5e97 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 9 Dec 2016 15:40:29 -0500 -Subject: [PATCH 201/250] Add BLS support to grub-mkconfig +Subject: [PATCH] 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, @@ -165,6 +165,3 @@ index 7e78ad33636..f5daefb9d24 100644 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 - diff --git a/0202-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch b/0202-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch index 8a4f100f..bc5324c8 100644 --- a/0202-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch +++ b/0202-Remove-duplicated-grub_exit-definition-for-grub-emu-.patch @@ -1,7 +1,7 @@ From 2d7dabdbf322e8f679eeaefd48cb26b083cdeb1c Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Tue, 6 Feb 2018 11:02:09 +0100 -Subject: [PATCH 202/250] Remove duplicated grub_exit() definition for grub-emu +Subject: [PATCH] Remove duplicated grub_exit() definition for grub-emu platform The grub_exit() function signature was changed on all platforms to take a @@ -31,6 +31,3 @@ index 7e47ec81263..55ea5a11ccd 100644 void grub_machine_init (void) { --- -2.14.3 - diff --git a/0203-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch b/0203-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch index b757dacd..01fb11a6 100644 --- a/0203-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch +++ b/0203-Don-t-attempt-to-backtrace-on-grub_abort-for-grub-em.patch @@ -1,7 +1,7 @@ From f45946a92377c83ffcad8dbc3298fc26072567d9 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Tue, 6 Feb 2018 11:16:28 +0100 -Subject: [PATCH 203/250] Don't attempt to backtrace on grub_abort() for +Subject: [PATCH] Don't attempt to backtrace on grub_abort() for grub-emu The emu platform doesn't have a grub_backtrace() implementation, so this @@ -25,6 +25,3 @@ index 04371ac49f2..636f97e1ba1 100644 grub_backtrace(); #endif #endif --- -2.14.3 - diff --git a/0204-Enable-blscfg-command-for-the-emu-platform.patch b/0204-Enable-blscfg-command-for-the-emu-platform.patch index 7bdf2c86..b2aafffe 100644 --- a/0204-Enable-blscfg-command-for-the-emu-platform.patch +++ b/0204-Enable-blscfg-command-for-the-emu-platform.patch @@ -1,7 +1,7 @@ From 39bb86c661911f06ff40caa842a9babf18f27c8b Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 2 Feb 2018 11:36:29 +0100 -Subject: [PATCH 204/250] Enable blscfg command for the emu platform +Subject: [PATCH] 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 @@ -162,6 +162,3 @@ index 9ab45631465..e5617c3bc6c 100644 { grub_unregister_extcmd (cmd); } --- -2.14.3 - diff --git a/0205-Add-linux-and-initrd-commands-for-grub-emu.patch b/0205-Add-linux-and-initrd-commands-for-grub-emu.patch index 935450b8..3b1208f4 100644 --- a/0205-Add-linux-and-initrd-commands-for-grub-emu.patch +++ b/0205-Add-linux-and-initrd-commands-for-grub-emu.patch @@ -1,7 +1,7 @@ From 49c719a6f6e223b95733e18720a48993ab6e5317 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Tue, 6 Feb 2018 09:09:00 +0100 -Subject: [PATCH 205/250] Add linux and initrd commands for grub-emu +Subject: [PATCH] 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, to allow booting the selected menu entry. @@ -349,6 +349,3 @@ index f7b4d29b0b3..75e8715e631 100644 if COND_GRUB_EMU_SDL KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h endif --- -2.14.3 - diff --git a/0206-Fix-the-efidir-in-grub-setpassword.patch b/0206-Fix-the-efidir-in-grub-setpassword.patch index d6135d33..36074fda 100644 --- a/0206-Fix-the-efidir-in-grub-setpassword.patch +++ b/0206-Fix-the-efidir-in-grub-setpassword.patch @@ -1,7 +1,7 @@ From c7c6cb4380f5bd85a2cbe747433657fdce89a802 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 15 Mar 2018 14:12:54 -0400 -Subject: [PATCH 206/250] Fix the efidir in grub-setpassword +Subject: [PATCH] Fix the efidir in grub-setpassword Signed-off-by: Peter Jones --- @@ -22,6 +22,3 @@ index d7924af5192..cf70257eed6 100644 else grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'` fi --- -2.14.3 - diff --git a/0207-Add-grub2-switch-to-blscfg.patch b/0207-Add-grub2-switch-to-blscfg.patch index 65f60ff3..8a806c0f 100644 --- a/0207-Add-grub2-switch-to-blscfg.patch +++ b/0207-Add-grub2-switch-to-blscfg.patch @@ -1,7 +1,7 @@ From 89b3a570de8b5e7ad19769983a87f6e10024f0ec Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 15 Mar 2018 14:12:40 -0400 -Subject: [PATCH 207/250] Add grub2-switch-to-blscfg +Subject: [PATCH] Add grub2-switch-to-blscfg Signed-off-by: Peter Jones --- @@ -343,6 +343,3 @@ index 00000000000..3ae5e4ea8d0 + +# Bye. +exit 0 --- -2.14.3 - diff --git a/0208-Add-grub_debug_enabled.patch b/0208-Add-grub_debug_enabled.patch index 5fb1b455..8b3ac8f0 100644 --- a/0208-Add-grub_debug_enabled.patch +++ b/0208-Add-grub_debug_enabled.patch @@ -1,7 +1,7 @@ From 6776773c89828c9b69c1552760ba6a4d9cd5589f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 30 Nov 2017 15:11:39 -0500 -Subject: [PATCH 208/250] Add grub_debug_enabled() +Subject: [PATCH] Add grub_debug_enabled() --- grub-core/kern/misc.c | 21 ++++++++++++++++----- @@ -58,6 +58,3 @@ index 3d55bafd64e..493e328d968 100644 void EXPORT_FUNC(grub_real_dprintf) (const char *file, const int line, const char *condition, --- -2.14.3 - diff --git a/0209-make-better-backtraces.patch b/0209-make-better-backtraces.patch index 2accc068..473923d9 100644 --- a/0209-make-better-backtraces.patch +++ b/0209-make-better-backtraces.patch @@ -1,7 +1,7 @@ From 318ee04aadcda40b779b2a5314dd23ead165f896 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 6 Nov 2017 18:31:56 -0500 -Subject: [PATCH 209/250] make better backtraces +Subject: [PATCH] make better backtraces Signed-off-by: Peter Jones --- @@ -882,6 +882,3 @@ index 75e8715e631..5c7a2c8f808 100644 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h --- -2.14.3 - diff --git a/0210-normal-don-t-draw-our-startup-message-if-debug-is-se.patch b/0210-normal-don-t-draw-our-startup-message-if-debug-is-se.patch index 2b29c3d1..8d279eef 100644 --- a/0210-normal-don-t-draw-our-startup-message-if-debug-is-se.patch +++ b/0210-normal-don-t-draw-our-startup-message-if-debug-is-se.patch @@ -1,7 +1,7 @@ From 81d0e079ea5aa6f43daf12f7a8698d0bcd1a36f8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 9 Nov 2017 15:58:52 -0500 -Subject: [PATCH 210/250] normal: don't draw our startup message if debug is +Subject: [PATCH] normal: don't draw our startup message if debug is set --- @@ -22,6 +22,3 @@ index b69f9e738fa..04ae9ed02f6 100644 msg_formatted = grub_xasprintf (_("Minimal BASH-like line editing is supported. For " "the first word, TAB lists possible command completions. Anywhere " "else TAB lists possible device or file completions. %s"), --- -2.14.3 - diff --git a/0211-Work-around-some-minor-include-path-weirdnesses.patch b/0211-Work-around-some-minor-include-path-weirdnesses.patch index 9abddb29..1348d2f1 100644 --- a/0211-Work-around-some-minor-include-path-weirdnesses.patch +++ b/0211-Work-around-some-minor-include-path-weirdnesses.patch @@ -1,7 +1,7 @@ From e2bba0f7ee8e56c68e425853a21a8fdd766add70 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 16 Mar 2018 13:28:57 -0400 -Subject: [PATCH 211/250] Work around some minor include path weirdnesses +Subject: [PATCH] Work around some minor include path weirdnesses Signed-off-by: Peter Jones --- @@ -135,6 +135,3 @@ index 00000000000..dba9d8678d0 +#include + +#endif /* ! GRUB_X86_64_EFI_CONSOLE_H */ --- -2.14.3 - diff --git a/0212-Make-it-possible-to-enabled-build-id-sha1.patch b/0212-Make-it-possible-to-enabled-build-id-sha1.patch index 50e486e6..33c50e67 100644 --- a/0212-Make-it-possible-to-enabled-build-id-sha1.patch +++ b/0212-Make-it-possible-to-enabled-build-id-sha1.patch @@ -1,7 +1,7 @@ From 8521929bcf671b465d6450b969d11617b6aec608 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 25 Jun 2015 15:41:06 -0400 -Subject: [PATCH 212/250] Make it possible to enabled --build-id=sha1 +Subject: [PATCH] Make it possible to enabled --build-id=sha1 Signed-off-by: Peter Jones --- @@ -59,6 +59,3 @@ index 78cdf6e1d01..242e829ff23 100644 dnl Check nm AC_DEFUN([grub_PROG_NM_WORKS], [AC_MSG_CHECKING([whether nm works]) --- -2.14.3 - diff --git a/0213-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch b/0213-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch index f85d9e21..f4762c42 100644 --- a/0213-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch +++ b/0213-Add-grub_qdprintf-grub_dprintf-without-the-file-line.patch @@ -1,7 +1,7 @@ From 8c4b2eaa204f0ea0377ca4592d2be6029fdb9be7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Sun, 28 Jun 2015 13:09:58 -0400 -Subject: [PATCH 213/250] Add grub_qdprintf() - grub_dprintf() without the +Subject: [PATCH] Add grub_qdprintf() - grub_dprintf() without the file+line number. This just makes copy+paste of our debug loading info easier. @@ -54,6 +54,3 @@ index 493e328d968..4607e8defa9 100644 int EXPORT_FUNC(grub_vprintf) (const char *fmt, va_list args); int EXPORT_FUNC(grub_snprintf) (char *str, grub_size_t n, const char *fmt, ...) __attribute__ ((format (GNU_PRINTF, 3, 4))); --- -2.14.3 - diff --git a/0214-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch b/0214-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch index 948793bc..18d4f7ba 100644 --- a/0214-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch +++ b/0214-Make-a-gdb-dprintf-that-tells-us-load-addresses.patch @@ -1,7 +1,7 @@ From 030095a01a205aba04a0849ac0c0329ac429a9ed Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 25 Jun 2015 15:11:36 -0400 -Subject: [PATCH 214/250] Make a "gdb" dprintf that tells us load addresses. +Subject: [PATCH] Make a "gdb" dprintf that tells us load addresses. This makes a grub_dprintf() call during platform init and during module loading that tells us the virtual addresses of the .text and .data @@ -176,6 +176,3 @@ index 68326d96f5a..6702b312040 100644 void grub_efi_mm_init (void); void grub_efi_mm_fini (void); --- -2.14.3 - diff --git a/0215-Only-attempt-to-scan-different-BLS-directories-on-EF.patch b/0215-Only-attempt-to-scan-different-BLS-directories-on-EF.patch index 41be8792..43471585 100644 --- a/0215-Only-attempt-to-scan-different-BLS-directories-on-EF.patch +++ b/0215-Only-attempt-to-scan-different-BLS-directories-on-EF.patch @@ -1,7 +1,7 @@ From 5f0417c63a4dd2252a5a801568f4369ac74a47e6 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Tue, 3 Apr 2018 15:42:47 +0200 -Subject: [PATCH 215/250] Only attempt to scan different BLS directories on EFI +Subject: [PATCH] Only attempt to scan different BLS directories on EFI machines Current BLS support attempted to scan for BLS directories, but this only @@ -44,6 +44,3 @@ index e5617c3bc6c..c0973ff83ea 100644 #endif finish: --- -2.14.3 - diff --git a/0216-Core-TPM-support.patch b/0216-Core-TPM-support.patch index 498db769..aa7d8fc4 100644 --- a/0216-Core-TPM-support.patch +++ b/0216-Core-TPM-support.patch @@ -1,7 +1,7 @@ From 65be94a64a5608209561ba0914d29445d81bf4b2 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 17:06:35 -0700 -Subject: [PATCH 216/250] Core TPM support +Subject: [PATCH] Core TPM support Add support for performing basic TPM measurements. Right now this only supports extending PCRs statically and only on UEFI and BIOS systems, but @@ -784,6 +784,3 @@ index 5c7a2c8f808..84b076962d8 100644 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/memory.h if COND_i386_pc --- -2.14.3 - diff --git a/0217-Measure-kernel-initrd.patch b/0217-Measure-kernel-initrd.patch index cbeb72d0..7ced377d 100644 --- a/0217-Measure-kernel-initrd.patch +++ b/0217-Measure-kernel-initrd.patch @@ -1,7 +1,7 @@ From ffd305d09def6610ef96f928c0df8303c5529d63 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Thu, 16 Jul 2015 15:22:34 -0700 -Subject: [PATCH 217/250] Measure kernel + initrd +Subject: [PATCH] Measure kernel + initrd Measure the kernel and initrd when loaded on UEFI systems --- @@ -37,6 +37,3 @@ index 6db5d0bf3a0..48febdc8100 100644 rc = grub_linuxefi_secure_validate (kernel, filelen); if (rc < 0) { --- -2.14.3 - diff --git a/0218-Add-BIOS-boot-measurement.patch b/0218-Add-BIOS-boot-measurement.patch index 7ad0443a..3fff53ec 100644 --- a/0218-Add-BIOS-boot-measurement.patch +++ b/0218-Add-BIOS-boot-measurement.patch @@ -1,7 +1,7 @@ From d8870587d46f8aa8d4f8db2cdcddecc829993447 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 15:48:51 -0700 -Subject: [PATCH 218/250] Add BIOS boot measurement +Subject: [PATCH] Add BIOS boot measurement Measure the on-disk grub core on BIOS systems - unlike UEFI, the firmware can't do this stage for us. @@ -174,6 +174,3 @@ index c8b87ed293c..05dd7fa701c 100644 /* * message: write the string pointed to by %si * --- -2.14.3 - diff --git a/0219-Measure-kernel-and-initrd-on-BIOS-systems.patch b/0219-Measure-kernel-and-initrd-on-BIOS-systems.patch index 068ccd63..9ebc347b 100644 --- a/0219-Measure-kernel-and-initrd-on-BIOS-systems.patch +++ b/0219-Measure-kernel-and-initrd-on-BIOS-systems.patch @@ -1,7 +1,7 @@ From 5aee2444093cfc8006865766f89e5a775a940ab1 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:28:29 -0700 -Subject: [PATCH 219/250] Measure kernel and initrd on BIOS systems +Subject: [PATCH] Measure kernel and initrd on BIOS systems Measure the kernel and initrd when loaded on BIOS systems --- @@ -82,6 +82,3 @@ index be6fa0f4d45..3005c0d19c9 100644 ptr += cursize; } if (newc) --- -2.14.3 - diff --git a/0220-Measure-the-kernel-commandline.patch b/0220-Measure-the-kernel-commandline.patch index 7a5cd6e5..c17d8dc1 100644 --- a/0220-Measure-the-kernel-commandline.patch +++ b/0220-Measure-the-kernel-commandline.patch @@ -1,7 +1,7 @@ From c1694574d6eb287e6e181dd018fe54b718a613b3 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:32:29 -0700 -Subject: [PATCH 220/250] Measure the kernel commandline +Subject: [PATCH] Measure the kernel commandline Measure the kernel commandline to ensure that it hasn't been modified --- @@ -38,6 +38,3 @@ index 970ea868c14..6b56304d4a7 100644 + return i; } --- -2.14.3 - diff --git a/0221-Measure-commands.patch b/0221-Measure-commands.patch index b15765d5..9d5530fc 100644 --- a/0221-Measure-commands.patch +++ b/0221-Measure-commands.patch @@ -1,7 +1,7 @@ From c93a27f2e6a323a4985e6fe902eb5c6447fca572 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Mon, 10 Aug 2015 15:27:12 -0700 -Subject: [PATCH 221/250] Measure commands +Subject: [PATCH] Measure commands Measure each command executed by grub, which includes script execution. --- @@ -71,6 +71,3 @@ index 40d3cf65ba6..7fc9d77d277 100644 #define TPM_TAG_RQU_COMMAND 0x00C1 #define TPM_ORD_Extend 0x14 --- -2.14.3 - diff --git a/0222-Measure-multiboot-images-and-modules.patch b/0222-Measure-multiboot-images-and-modules.patch index 0f5bd31c..3332a464 100644 --- a/0222-Measure-multiboot-images-and-modules.patch +++ b/0222-Measure-multiboot-images-and-modules.patch @@ -1,7 +1,7 @@ From b164ec560cd6373c0c5d8a189d70baeca2c3ef13 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 1 Sep 2015 16:02:55 -0700 -Subject: [PATCH 222/250] Measure multiboot images and modules +Subject: [PATCH] Measure multiboot images and modules --- grub-core/loader/i386/multiboot_mbi.c | 3 +++ @@ -73,6 +73,3 @@ index b0679a9f6c9..a7b4a57ec4f 100644 if (header == 0) { grub_free (mld.buffer); --- -2.14.3 - diff --git a/0223-Fix-boot-when-there-s-no-TPM.patch b/0223-Fix-boot-when-there-s-no-TPM.patch index 30570d1b..886cb577 100644 --- a/0223-Fix-boot-when-there-s-no-TPM.patch +++ b/0223-Fix-boot-when-there-s-no-TPM.patch @@ -1,7 +1,7 @@ From 33fb6113d65a819496d0b67b8db071fedad845a7 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 23 Mar 2016 16:49:42 -0700 -Subject: [PATCH 223/250] Fix boot when there's no TPM +Subject: [PATCH] Fix boot when there's no TPM If the firmware has TPM support but has no TPM, we're jumping to core.img without popping the registers back onto the stack. Fix that. @@ -27,6 +27,3 @@ index c1df86dec0b..acab37369ae 100644 /* boot kernel */ jmp *(LOCAL(kernel_address)) --- -2.14.3 - diff --git a/0224-Rework-TPM-measurements.patch b/0224-Rework-TPM-measurements.patch index 5bc18b7a..cc6bc38b 100644 --- a/0224-Rework-TPM-measurements.patch +++ b/0224-Rework-TPM-measurements.patch @@ -1,7 +1,7 @@ From 415072bbda8b4de133c6dc6add230e41ee6d9579 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 23 Mar 2016 17:03:43 -0700 -Subject: [PATCH 224/250] Rework TPM measurements +Subject: [PATCH] Rework TPM measurements Rework TPM measurements to use fewer PCRs. After discussion with upstream, it's preferable to avoid using so many PCRs. Instead, measure into PCRs 8 @@ -214,6 +214,3 @@ index 7fc9d77d277..ecb2d09ff5d 100644 const char *description); #if defined (GRUB_MACHINE_EFI) || defined (GRUB_MACHINE_PCBIOS) grub_err_t grub_tpm_execute(PassThroughToTPM_InputParamBlock *inbuf, --- -2.14.3 - diff --git a/0225-Fix-event-log-prefix.patch b/0225-Fix-event-log-prefix.patch index 6c70fadd..af1b6591 100644 --- a/0225-Fix-event-log-prefix.patch +++ b/0225-Fix-event-log-prefix.patch @@ -1,7 +1,7 @@ From 0816621235226952a5bd0cfd027eb97ff84df547 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 29 Mar 2016 15:36:49 -0700 -Subject: [PATCH 225/250] Fix event log prefix +Subject: [PATCH] Fix event log prefix We're not passing the prefixed version of the description to the event log. Fix that. @@ -24,6 +24,3 @@ index cb5a812035d..e5e8fced624 100644 grub_free(desc); return ret; } --- -2.14.3 - diff --git a/0226-Set-the-first-boot-menu-entry-as-default-when-using-.patch b/0226-Set-the-first-boot-menu-entry-as-default-when-using-.patch index 975fa0ce..3a26a6cb 100644 --- a/0226-Set-the-first-boot-menu-entry-as-default-when-using-.patch +++ b/0226-Set-the-first-boot-menu-entry-as-default-when-using-.patch @@ -1,7 +1,7 @@ From 8278e40fdc4a4db0865fc632cbe2dcf7c124ba7a Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 6 Apr 2018 14:08:36 +0200 -Subject: [PATCH 226/250] Set the first boot menu entry as default when using +Subject: [PATCH] Set the first boot menu entry as default when using BLS fragments When BootLoaderSpec configuration files are used, the default boot menu @@ -25,6 +25,3 @@ index f5daefb9d24..b24bb410dc0 100644 ${grub_editenv} - set kernelopts="root=${linux_root_device_thisversion} ro ${args}" exit 0 --- -2.14.3 - diff --git a/0227-tpm-fix-warnings-when-compiling-for-platforms-other-.patch b/0227-tpm-fix-warnings-when-compiling-for-platforms-other-.patch index 8821be46..44a1b5d0 100644 --- a/0227-tpm-fix-warnings-when-compiling-for-platforms-other-.patch +++ b/0227-tpm-fix-warnings-when-compiling-for-platforms-other-.patch @@ -1,7 +1,7 @@ From 4c53f61b1a889c0f55e76a763b05b6686ec613b8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 21 Aug 2016 18:24:58 -0700 -Subject: [PATCH 227/250] tpm: fix warnings when compiling for platforms other +Subject: [PATCH] tpm: fix warnings when compiling for platforms other than pc and efi --- @@ -36,6 +36,3 @@ index ecb2d09ff5d..972a5edc836 100644 { return 0; }; --- -2.14.3 - diff --git a/0228-Make-TPM-errors-less-fatal.patch b/0228-Make-TPM-errors-less-fatal.patch index 69c6ed0e..a3eaca18 100644 --- a/0228-Make-TPM-errors-less-fatal.patch +++ b/0228-Make-TPM-errors-less-fatal.patch @@ -1,7 +1,7 @@ From 406f7dda0cc2689170f102341a546c87072d1ce5 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Thu, 13 Oct 2016 13:55:26 -0700 -Subject: [PATCH 228/250] Make TPM errors less fatal +Subject: [PATCH] Make TPM errors less fatal Handle TPM errors, and stop trying to use the TPM once we hit one. --- @@ -206,6 +206,3 @@ index 976643c47b0..93965777138 100644 grub_free(cmdstring); invert = 0; argc = argv.argc - 1; --- -2.14.3 - diff --git a/0229-blscfg-handle-multiple-initramfs-images.patch b/0229-blscfg-handle-multiple-initramfs-images.patch index 362f642a..b3aad41b 100644 --- a/0229-blscfg-handle-multiple-initramfs-images.patch +++ b/0229-blscfg-handle-multiple-initramfs-images.patch @@ -1,7 +1,7 @@ From a230ec5c31d818c2f046acf3592a5492d3e2ea69 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 11 Apr 2018 13:44:29 -0400 -Subject: [PATCH 229/250] blscfg: handle multiple initramfs images. +Subject: [PATCH] blscfg: handle multiple initramfs images. Signed-off-by: Peter Jones --- @@ -102,6 +102,3 @@ index c0973ff83ea..1e5972422d6 100644 } struct find_entry_info { --- -2.14.3 - diff --git a/0230-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch b/0230-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch index 8d440839..3afb880c 100644 --- a/0230-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch +++ b/0230-BLS-Fix-grub2-switch-to-blscfg-on-non-EFI-machines.patch @@ -1,7 +1,7 @@ From f006df881d1b2b3ca7320ecfcd33181295ec1018 Mon Sep 17 00:00:00 2001 From: Jan Hlavac Date: Tue, 10 Apr 2018 16:07:36 +0200 -Subject: [PATCH 230/250] BLS: Fix grub2-switch-to-blscfg on non-EFI machines +Subject: [PATCH] BLS: Fix grub2-switch-to-blscfg on non-EFI machines On the non-EFI machines the grub2-switch-to-blscfg script places the BLS snippets into the /boot directory. But the right location is @@ -23,6 +23,3 @@ index 3ae5e4ea8d0..f740b8f4d03 100644 fi backupsuffix=.bak --- -2.14.3 - diff --git a/0231-BLS-Use-etcdefaultgrub-instead-of-etc.patch b/0231-BLS-Use-etcdefaultgrub-instead-of-etc.patch index 4e436b3d..4054cdf3 100644 --- a/0231-BLS-Use-etcdefaultgrub-instead-of-etc.patch +++ b/0231-BLS-Use-etcdefaultgrub-instead-of-etc.patch @@ -1,7 +1,7 @@ From 29b79fde633a43223ead7874ffd373603f129832 Mon Sep 17 00:00:00 2001 From: Jan Hlavac Date: Tue, 10 Apr 2018 16:56:28 +0200 -Subject: [PATCH 231/250] BLS: Use ${etcdefaultgrub} instead of /etc/... +Subject: [PATCH] BLS: Use ${etcdefaultgrub} instead of /etc/... Inside the grub-switch-to-blscfg script the ${etcdefaultgrub} variable is used. So replace the hardcoded /etc/default/grub with it. @@ -22,6 +22,3 @@ index f740b8f4d03..eae3c379e4a 100644 gettext_printf "Updating %s failed\n" "${GRUB_CONFIG_FILE}" exit 1 fi --- -2.14.3 - diff --git a/0232-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch b/0232-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch index 8a295825..19cfe4ed 100644 --- a/0232-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch +++ b/0232-Add-missing-options-to-grub2-switch-to-blscfg-man-pa.patch @@ -1,7 +1,7 @@ From c3a05672a450fd9e95de5df2b0c27c24fe04cd83 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Wed, 11 Apr 2018 11:36:43 +0200 -Subject: [PATCH 232/250] Add missing options to grub2-switch-to-blscfg man +Subject: [PATCH] Add missing options to grub2-switch-to-blscfg man page The script --bls-directory and --backup-suffix options were not documented @@ -30,6 +30,3 @@ index 134dfc62a7b..7d99de2d2f9 100644 + .SH SEE ALSO .BR "info grub" --- -2.14.3 - diff --git a/0233-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch b/0233-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch index 8ed4ada6..cacb22c4 100644 --- a/0233-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch +++ b/0233-Make-grub2-switch-to-blscfg-to-generate-debug-BLS-wh.patch @@ -1,7 +1,7 @@ From 55b00d518e029a563653401c6908489924c07238 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Wed, 11 Apr 2018 11:49:24 +0200 -Subject: [PATCH 233/250] Make grub2-switch-to-blscfg to generate debug BLS +Subject: [PATCH] Make grub2-switch-to-blscfg to generate debug BLS when MAKEDEBUG is set If MAKEDEBUG=yes in /etc/sysconfig/kernel, then a debug menu entry should @@ -56,6 +56,3 @@ index eae3c379e4a..c59299ffa6a 100644 done GENERATE=0 --- -2.14.3 - diff --git a/0234-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch b/0234-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch index cc144306..2b2a9bc9 100644 --- a/0234-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch +++ b/0234-Make-grub2-switch-to-blscfg-to-generate-BLS-fragment.patch @@ -1,7 +1,7 @@ From 60bddbc714c96ca05821d52bdd7dbad7eabd6dd5 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Wed, 11 Apr 2018 12:39:59 +0200 -Subject: [PATCH 234/250] Make grub2-switch-to-blscfg to generate BLS fragment +Subject: [PATCH] Make grub2-switch-to-blscfg to generate BLS fragment for rescue kernel If a rescue image is available, it should have a BootLoaderSpec fragment. @@ -26,6 +26,3 @@ index c59299ffa6a..bc28053cd30 100644 GENERATE=0 if grep '^GRUB_ENABLE_BLSCFG=.*' "${etcdefaultgrub}" \ | grep -vq '^GRUB_ENABLE_BLSCFG="*true"*\s*$' ; then --- -2.14.3 - diff --git a/0235-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch b/0235-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch index aa0a3893..51ef03f1 100644 --- a/0235-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch +++ b/0235-Only-attempt-to-query-dev-mounted-in-boot-efi-as-boo.patch @@ -1,7 +1,7 @@ From 8afe59812e83e78564697ef8241ed4f1b3527423 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Tue, 24 Apr 2018 02:16:38 +0200 -Subject: [PATCH 235/250] Only attempt to query dev mounted in /boot/efi as +Subject: [PATCH] Only attempt to query dev mounted in /boot/efi as boot dev on EFI machines The 10_linux script calls grub2-probe to probe the information for the dev @@ -38,6 +38,3 @@ index b24bb410dc0..c2ffc77398f 100644 cat << EOF insmod blscfg --- -2.14.3 - diff --git a/0236-Include-OSTree-path-when-searching-kernels-images-if.patch b/0236-Include-OSTree-path-when-searching-kernels-images-if.patch index d2cadb11..25211d6e 100644 --- a/0236-Include-OSTree-path-when-searching-kernels-images-if.patch +++ b/0236-Include-OSTree-path-when-searching-kernels-images-if.patch @@ -1,7 +1,7 @@ From 459eaeacbb40116dcb501cf165c7816e70c66fb3 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Tue, 24 Apr 2018 02:28:04 +0200 -Subject: [PATCH 236/250] Include OSTree path when searching kernels images if +Subject: [PATCH] Include OSTree path when searching kernels images if BLS config is enabled The OSTree based distros (i.e: Fedora Atomic) don't install kernel images @@ -36,6 +36,3 @@ index c2ffc77398f..15ba8eff8a6 100644 case "$machine" in i?86) GENKERNEL_ARCH="x86" ;; mips|mips64) GENKERNEL_ARCH="mips" ;; --- -2.14.3 - diff --git a/0237-Use-BLS-version-field-to-compare-entries-if-id-field.patch b/0237-Use-BLS-version-field-to-compare-entries-if-id-field.patch index 24e32dc9..0c94feea 100644 --- a/0237-Use-BLS-version-field-to-compare-entries-if-id-field.patch +++ b/0237-Use-BLS-version-field-to-compare-entries-if-id-field.patch @@ -1,7 +1,7 @@ From 689a48c76bee8049a50f962852f43f108c815450 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Fri, 27 Apr 2018 17:53:41 +0200 -Subject: [PATCH 237/250] Use BLS version field to compare entries if id field +Subject: [PATCH] Use BLS version field to compare entries if id field isn't defined The BootLoaderSpec fragments generated by OSTree don't have the id field, @@ -27,6 +27,3 @@ index 1e5972422d6..72ee497ea2d 100644 if (rc == 0) rc = bls_keyval_cmp (e0, e1, "title"); --- -2.14.3 - diff --git a/0238-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch b/0238-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch index bc7d3c87..70494b47 100644 --- a/0238-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch +++ b/0238-Add-version-field-to-BLS-generated-by-grub2-switch-t.patch @@ -1,7 +1,7 @@ From 0994be8d655420685d900a08443b4fd53f639e72 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Thu, 10 May 2018 10:52:11 +0200 -Subject: [PATCH 238/250] Add version field to BLS generated by +Subject: [PATCH] Add version field to BLS generated by grub2-switch-to-blscfg The version field is present in the BLS fragments that are shipped in the @@ -40,6 +40,3 @@ index bc28053cd30..89487ad611c 100644 linux /vmlinuz-${kernelver} initrd /initramfs-${kernelver}.img options \$kernelopts --- -2.14.3 - diff --git a/0239-Fixup-for-newer-compiler.patch b/0239-Fixup-for-newer-compiler.patch index ee21a227..74f6a2c8 100644 --- a/0239-Fixup-for-newer-compiler.patch +++ b/0239-Fixup-for-newer-compiler.patch @@ -1,7 +1,7 @@ From 0724038a6f554f688cfcd6e05d52329c384d8a6d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 10 May 2018 13:40:19 -0400 -Subject: [PATCH 239/250] Fixup for newer compiler +Subject: [PATCH] Fixup for newer compiler --- grub-core/fs/btrfs.c | 2 +- @@ -48,6 +48,3 @@ index 044ab3abe88..c75848f5c06 100644 CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d --- -2.14.3 - diff --git a/0240-net-read-bracketed-ipv6-addrs-and-port-numbers.patch b/0240-net-read-bracketed-ipv6-addrs-and-port-numbers.patch index 201768d6..273ebc1f 100644 --- a/0240-net-read-bracketed-ipv6-addrs-and-port-numbers.patch +++ b/0240-net-read-bracketed-ipv6-addrs-and-port-numbers.patch @@ -1,7 +1,7 @@ From 360588a02da16caf45c639dde159ae55dbdf651e Mon Sep 17 00:00:00 2001 From: Aaron Miller Date: Fri, 29 Jul 2016 17:41:38 +0800 -Subject: [PATCH 240/250] net: read bracketed ipv6 addrs and port numbers +Subject: [PATCH] net: read bracketed ipv6 addrs and port numbers Allow specifying port numbers for http and tftp paths, and allow ipv6 addresses to be recognized with brackets around them, which is required to specify a port @@ -244,6 +244,3 @@ index f8f3ec13acc..24232ec71fc 100644 grub_net_app_level_t protocol; grub_net_packets_t packs; grub_off_t offset; --- -2.14.3 - diff --git a/0241-New-net_bootp6-command-and-UEFI-IPv6-PXE-support.patch b/0241-New-net_bootp6-command-and-UEFI-IPv6-PXE-support.patch index c2fede7c..39eb0940 100644 --- a/0241-New-net_bootp6-command-and-UEFI-IPv6-PXE-support.patch +++ b/0241-New-net_bootp6-command-and-UEFI-IPv6-PXE-support.patch @@ -1,7 +1,7 @@ From 77e75c900368ef656c00d4c485eff7b1d66d58eb Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Sun, 10 Jul 2016 23:46:06 +0800 -Subject: [PATCH 241/250] New net_bootp6 command and UEFI IPv6 PXE support +Subject: [PATCH] New net_bootp6 command and UEFI IPv6 PXE support When grub2 image is booted from UEFI IPv6 PXE, the DHCPv6 Reply packet is cached in firmware buffer which can be obtained by PXE Base Code protocol. The @@ -1349,6 +1349,3 @@ index 24232ec71fc..373ad1080cf 100644 int grub_net_hwaddr_cmp (const grub_net_link_level_address_t *a, const grub_net_link_level_address_t *b); --- -2.14.3 - diff --git a/0242-grub.texi-Add-net_bootp6-doument.patch b/0242-grub.texi-Add-net_bootp6-doument.patch index 46361a04..37fad226 100644 --- a/0242-grub.texi-Add-net_bootp6-doument.patch +++ b/0242-grub.texi-Add-net_bootp6-doument.patch @@ -1,7 +1,7 @@ From a0c969d3c591c21eeeb0ba032ec8ea1257efb898 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Tue, 5 May 2015 14:19:24 +0800 -Subject: [PATCH 242/250] grub.texi: Add net_bootp6 doument +Subject: [PATCH] grub.texi: Add net_bootp6 doument Update grub documentation for net_bootp6 command. @@ -46,6 +46,3 @@ index f28c4cd5247..0e14a78ceaa 100644 @node net_del_addr @subsection net_del_addr --- -2.14.3 - diff --git a/0243-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch b/0243-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch index cbb05d4d..396808b9 100644 --- a/0243-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch +++ b/0243-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch @@ -1,7 +1,7 @@ From 7b6d6e50bea268456d55806cb21d49cbc01c10d1 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 14 Jul 2016 18:45:14 +0800 -Subject: [PATCH 243/250] bootp: Add processing DHCPACK packet from HTTP Boot +Subject: [PATCH] bootp: Add processing DHCPACK packet from HTTP Boot The vendor class identifier with the string "HTTPClient" is used to denote the packet as responding to HTTP boot request. In DHCP4 config, the filename for @@ -125,6 +125,3 @@ index 373ad1080cf..1c7c3ecb6ab 100644 GRUB_NET_BOOTP_CLIENT_ID = 0x3d, GRUB_NET_BOOTP_CLIENT_UUID = 0x61, GRUB_NET_BOOTP_END = 0xff --- -2.14.3 - diff --git a/0244-efinet-Setting-network-from-UEFI-device-path.patch b/0244-efinet-Setting-network-from-UEFI-device-path.patch index 4547a53c..e460193e 100644 --- a/0244-efinet-Setting-network-from-UEFI-device-path.patch +++ b/0244-efinet-Setting-network-from-UEFI-device-path.patch @@ -1,7 +1,7 @@ From da2f323f72641219714b2ae448c62db6a7f64898 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Sun, 10 Jul 2016 23:46:31 +0800 -Subject: [PATCH 244/250] efinet: Setting network from UEFI device path +Subject: [PATCH] efinet: Setting network from UEFI device path The PXE Base Code protocol used to obtain cached PXE DHCPACK packet is no longer provided for HTTP Boot. Instead, we have to get the HTTP boot @@ -397,6 +397,3 @@ index 6a545cc6d5d..eba987de00a 100644 #define GRUB_EFI_VENDOR_MESSAGING_DEVICE_PATH_SUBTYPE 10 /* Media Device Path. */ --- -2.14.3 - diff --git a/0245-efinet-Setting-DNS-server-from-UEFI-protocol.patch b/0245-efinet-Setting-DNS-server-from-UEFI-protocol.patch index 4b8d030b..894ca84b 100644 --- a/0245-efinet-Setting-DNS-server-from-UEFI-protocol.patch +++ b/0245-efinet-Setting-DNS-server-from-UEFI-protocol.patch @@ -1,7 +1,7 @@ From bb5acb2cc50c1fbd6e214ca66268e04733a906eb Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Thu, 14 Jul 2016 17:48:45 +0800 -Subject: [PATCH 245/250] efinet: Setting DNS server from UEFI protocol +Subject: [PATCH] efinet: Setting DNS server from UEFI protocol In the URI device path node, any name rahter than address can be used for looking up the resources so that DNS service become needed to get answer of the @@ -335,6 +335,3 @@ index eba987de00a..48302449170 100644 #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \ || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__) --- -2.14.3 - diff --git a/0246-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch b/0246-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch index df4a8199..8824a789 100644 --- a/0246-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch +++ b/0246-grub-core-video-efi_gop.c-Add-support-for-BLT_ONLY-a.patch @@ -1,7 +1,7 @@ From f332a348642ef45df2445c4ec04a629a234e04fd Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Wed, 1 Feb 2017 23:10:45 +0100 -Subject: [PATCH 246/250] grub-core/video/efi_gop.c: Add support for BLT_ONLY +Subject: [PATCH] grub-core/video/efi_gop.c: Add support for BLT_ONLY adapters EFI GOP has support for multiple different bitness types of frame buffers @@ -55,6 +55,3 @@ index 12977741192..e4388127c66 100644 } grub_efi_gop_pixel_format_t; --- -2.14.3 - diff --git a/0247-Support-UEFI-networking-protocols.patch b/0247-Support-UEFI-networking-protocols.patch index 962c1542..90cc31d4 100644 --- a/0247-Support-UEFI-networking-protocols.patch +++ b/0247-Support-UEFI-networking-protocols.patch @@ -1,7 +1,7 @@ From 2ba7c6d3c99c669ce20d26fdc9ed7851fc10b6b4 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 22 Feb 2017 14:27:50 +0800 -Subject: [PATCH 247/250] Support UEFI networking protocols +Subject: [PATCH] Support UEFI networking protocols References: fate#320130, bsc#1015589, bsc#1076132 Patch-Mainline: no @@ -5038,6 +5038,3 @@ index 00000000000..de90d223e8e +extern grub_command_func_t grub_efi_net_bootp6; + +#endif /* ! GRUB_NET_EFI_HEADER */ --- -2.14.3 - diff --git a/0248-AUDIT-0-http-boot-tracker-bug.patch b/0248-AUDIT-0-http-boot-tracker-bug.patch index 5c4dd4e3..efd1c978 100644 --- a/0248-AUDIT-0-http-boot-tracker-bug.patch +++ b/0248-AUDIT-0-http-boot-tracker-bug.patch @@ -1,7 +1,7 @@ From d7e857c8a02ae15a940faacc6e8b688cc590c4d7 Mon Sep 17 00:00:00 2001 From: Sebastian Krahmer Date: Tue, 28 Nov 2017 17:24:38 +0800 -Subject: [PATCH 248/250] AUDIT-0: http boot tracker bug +Subject: [PATCH] AUDIT-0: http boot tracker bug Fixing a memory leak in case of error, and a integer overflow, leading to a heap overflow due to overly large chunk sizes. @@ -60,6 +60,3 @@ index f182d7b871d..5004ecfee42 100644 grub_errno = GRUB_ERR_NONE; if (data->chunk_rem == 0) { --- -2.14.3 - diff --git a/0249-linuxefi-honor-the-linux-and-initrd-names-of-command.patch b/0249-linuxefi-honor-the-linux-and-initrd-names-of-command.patch index 99d221d0..3d7b22a6 100644 --- a/0249-linuxefi-honor-the-linux-and-initrd-names-of-command.patch +++ b/0249-linuxefi-honor-the-linux-and-initrd-names-of-command.patch @@ -1,7 +1,7 @@ From d621b18f82c4fe2a903432c3fb811fb9281b0273 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 11 May 2018 10:58:34 -0400 -Subject: [PATCH 249/250] linuxefi: honor the "linux" and "initrd" names of +Subject: [PATCH] linuxefi: honor the "linux" and "initrd" names of commands. Signed-off-by: Peter Jones @@ -93,6 +93,3 @@ index 6c9268f2ff5..2cdfa8f671c 100644 + grub_unregister_command (cmd_linuxefi); + grub_unregister_command (cmd_initrdefi); } --- -2.14.3 - diff --git a/0250-xfs-accept-filesystem-with-sparse-inodes.patch b/0250-xfs-accept-filesystem-with-sparse-inodes.patch index bd508e9c..201b56ac 100644 --- a/0250-xfs-accept-filesystem-with-sparse-inodes.patch +++ b/0250-xfs-accept-filesystem-with-sparse-inodes.patch @@ -1,7 +1,7 @@ From d0a896275ec2969f507e6b60c75a4b24c7fd5bd5 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Tue, 15 May 2018 14:55:55 -0500 -Subject: [PATCH 250/250] xfs: accept filesystem with sparse inodes +Subject: [PATCH] xfs: accept filesystem with sparse inodes The sparse inode metadata format became a mkfs.xfs default in xfsprogs-4.16.0, and such filesystems are now rejected by grub as @@ -53,6 +53,3 @@ index 9f66dd6e4c6..d7222b529f5 100644 XFS_SB_FEAT_INCOMPAT_META_UUID) struct grub_xfs_sblock --- -2.14.3 - diff --git a/10002-Make-it-possible-to-enabled-build-id-sha1.patch b/10002-Make-it-possible-to-enabled-build-id-sha1.patch index 1f100e3e..a2f8551c 100644 --- a/10002-Make-it-possible-to-enabled-build-id-sha1.patch +++ b/10002-Make-it-possible-to-enabled-build-id-sha1.patch @@ -1,7 +1,7 @@ From 5334ed8ae9c8f15928139be986a1e877e9837630 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 25 Jun 2015 15:41:06 -0400 -Subject: [PATCH 10002/10006] Make it possible to enabled --build-id=sha1 +Subject: [PATCH] Make it possible to enabled --build-id=sha1 Signed-off-by: Peter Jones --- @@ -59,6 +59,4 @@ index d6ef6c3..3e897bd 100644 if test "x$target_cpu" = xi386; then if test "$platform" != emu && test "x$TARGET_APPLE_LINKER" != x1 ; then if test ! -z "$TARGET_IMG_LDSCRIPT"; then --- -2.5.0 diff --git a/do-rebase b/do-rebase index 7fdae456..2dc69af7 100755 --- a/do-rebase +++ b/do-rebase @@ -6,7 +6,7 @@ shopt -qs expand_aliases export LC_COLLATE=C export LC_ALL=C -format_patch_ops="--stat=80 --summary -O.git.diff.order --patience -l0" +format_patch_ops="--no-signature --no-numbered --stat=80 --summary -O.git.diff.order --patience -l0" alias othergit="GIT_DIR=$PWD/.rhboot.git GIT_WORK_TREE=$PWD git" alias formatpatch="othergit format-patch $format_patch_ops" @@ -17,7 +17,8 @@ usage() exec 1>&2 retcode=$1 fi - echo usage: do-rebase \$releasever \$gitrepo + echo usage: do-rebase [OPTIONS] [--dist RELEASEVER | RELEASEVER ] [GITREPO] + echo OPTIONS: --dist=RELEASEVER --repo=REPO --amend --nocommit --nobumpspec exit $retcode } @@ -29,6 +30,8 @@ fi gitrepo="git@github.com:rhboot/grub2.git" releasever="" amend="" +commit=1 +bumpspec=1 declare -a savedargs savedargs=() @@ -54,6 +57,21 @@ while [ $# -gt 0 ]; do --amend) amend="--amend" ;; + --commit) + commit=1 + ;; + --nocommit) + # --nocommit implies nobumpspec, but --bumpspec after it will + # force bumpspec to get run. + commit=0 + bumpspec=0 + ;; + --bumpspec) + bumpspec=2 + ;; + --nobumpspec) + bumpspec=0 + ;; *) savedargs[${#savedargs[@]}]="$1" ;; @@ -138,12 +156,14 @@ patches=$(formatpatch grub-2.02..refs/remotes/rhboot/${releasever}) for x in $patches ; do echo Patch$(echo ${x} | cut -d- -f1): ${x} >> grub.patches done -if [ -z "$amend" ]; then +if [[ -z "$amend" && ${bumpspec} -gt 0 ]] || [[ ${bumpspec} -ge 2 ]] ; then rpmdev-bumpspec -c "- Rebased to newer upstream for ${releasever}" grub2.spec fi git add 0*.patch grub2.spec grub.patches -if [ -z "$amend" ]; then - fedpkg commit -s -c $amend -else - git commit --amend +if [[ ${commit} -eq 1 ]] ; then + if [ -z "$amend" ]; then + fedpkg commit -s -c + else + git commit --amend + fi fi