diff --git a/0001-NEWS-update.patch b/0001-NEWS-update.patch new file mode 100644 index 0000000..bdc0718 --- /dev/null +++ b/0001-NEWS-update.patch @@ -0,0 +1,62 @@ +From d017ea8ede3f76aaf6b6c9dabe3e96af0eebd395 Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Sun, 28 Feb 2016 21:52:08 +0300 +Subject: [PATCH 001/123] NEWS update + +--- + NEWS | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/NEWS b/NEWS +index c9a975219..572eadb3e 100644 +--- a/NEWS ++++ b/NEWS +@@ -18,6 +18,7 @@ New in 2.02: + * ZFS features support. + * ZFS LZ4 support. + * XFS V5 format support. ++ * LVM RAID1 support. + + * New/improved terminal and video support: + * Monochrome text (matching `hercules' in GRUB Legacy). +@@ -49,6 +50,7 @@ New in 2.02: + * Improve TFTP robustness. + * Parse `nd' disk names in GRUB Legacy configuration files. + * Issue separate DNS queries for IPv4 and IPv6. ++ * Support IPv6 Router Advertisement to configure default router. + + * Coreboot improvements: + * CBFS support both in on-disk images (loopback) and flash. +@@ -96,6 +98,8 @@ New in 2.02: + EFI Stall. If everything fails, use hardcoded frequency 800MHz. + * Support Hyper-V Gen2 platforms which lack PIT for TSC calibration. + * Map UEFI Persistent Memory to E820 persistent memory. ++ * New Xen loader on ARM64. ++ * Respect alignment requirement for block device IO buffers on EFI. + + * Security: + * Add optional facility to enforce that all files read by the core image +@@ -134,6 +138,11 @@ New in 2.02: + menu entry immediately. + * New `file' command and grub-file utility to check file types. + * New syslinux configuration file parser. ++ * Set menu entry class to primary OS name returned by os-prober to display ++ OS specific icon. ++ * On Linux x86 detect EFI word size in grub-install and automatically select ++ correct platform (x86_64-efi or i386-efi) to install. Requires Linux kernel ++ 4.0 or higher. + + * Build system: + * Remove all uses of nested functions; GRUB no longer requires an +@@ -160,6 +169,8 @@ New in 2.02: + * emu libusb support removed (was broken and unmaintained). + * powerpc64le compile support. + * Use fixed timestamp when generating GRUB image for reproducible builds. ++ * Verify at build time that modules contain only supported relocations and their ++ structure matches what boot-time module loader expects. + + * Revision control moved to git. + +-- +2.14.3 + diff --git a/0002-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch b/0002-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch new file mode 100644 index 0000000..fe32a59 --- /dev/null +++ b/0002-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch @@ -0,0 +1,27 @@ +From 082bc9f77b200eb48a5f1147163dea9c9d02d44c Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sat, 5 Mar 2016 17:30:48 -0500 +Subject: [PATCH 002/123] 10_linux: Fix grouping of tests for GRUB_DEVICE + +Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to +mixing of || and && operators. Add some parens to help with that. +--- + util/grub.d/10_linux.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 5a78513ae..de9044c7f 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -47,7 +47,7 @@ esac + # and mounting btrfs requires user space scanning, so force UUID in this case. + if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ +- || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then ++ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} + else + LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} +-- +2.14.3 + diff --git a/0003-20_linux_xen-fix-test-for-GRUB_DEVICE.patch b/0003-20_linux_xen-fix-test-for-GRUB_DEVICE.patch new file mode 100644 index 0000000..1c07624 --- /dev/null +++ b/0003-20_linux_xen-fix-test-for-GRUB_DEVICE.patch @@ -0,0 +1,26 @@ +From 9545a8fd04ca33bcecc1907fec4d2354b02992ba Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Sun, 6 Mar 2016 08:54:19 +0300 +Subject: [PATCH 003/123] 20_linux_xen: fix test for GRUB_DEVICE + +Same fix as in 082bc9f. +--- + util/grub.d/20_linux_xen.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in +index 46045db1a..c48af948d 100644 +--- a/util/grub.d/20_linux_xen.in ++++ b/util/grub.d/20_linux_xen.in +@@ -47,7 +47,7 @@ esac + # and mounting btrfs requires user space scanning, so force UUID in this case. + if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ +- || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then ++ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} + else + LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} +-- +2.14.3 + diff --git a/0004-multiboot2-Remove-useless-GRUB_PACKED.patch b/0004-multiboot2-Remove-useless-GRUB_PACKED.patch new file mode 100644 index 0000000..86da872 --- /dev/null +++ b/0004-multiboot2-Remove-useless-GRUB_PACKED.patch @@ -0,0 +1,26 @@ +From 7f2a856faec951b7ab816880bd26e1e10b17a596 Mon Sep 17 00:00:00 2001 +From: Vladimir Serbinenko +Date: Thu, 10 Mar 2016 21:16:10 +0100 +Subject: [PATCH 004/123] multiboot2: Remove useless GRUB_PACKED + +Reported by: Daniel Kiper +--- + include/multiboot2.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/multiboot2.h b/include/multiboot2.h +index 9d4862759..8b8c1568a 100644 +--- a/include/multiboot2.h ++++ b/include/multiboot2.h +@@ -176,7 +176,7 @@ struct multiboot_mmap_entry + #define MULTIBOOT_MEMORY_BADRAM 5 + multiboot_uint32_t type; + multiboot_uint32_t zero; +-} GRUB_PACKED; ++}; + typedef struct multiboot_mmap_entry multiboot_memory_map_t; + + struct multiboot_tag +-- +2.14.3 + diff --git a/0005-xen_file-Fix-invalid-payload-size.patch b/0005-xen_file-Fix-invalid-payload-size.patch new file mode 100644 index 0000000..a1e5c57 --- /dev/null +++ b/0005-xen_file-Fix-invalid-payload-size.patch @@ -0,0 +1,30 @@ +From 15aee573d2312ebf4aab53d07d3d30eccf1484f9 Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Fri, 11 Mar 2016 10:26:51 +0100 +Subject: [PATCH 005/123] xen_file: Fix invalid payload size + +--- + grub-core/loader/i386/xen_file.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/grub-core/loader/i386/xen_file.c b/grub-core/loader/i386/xen_file.c +index 583621890..37f9ad8ac 100644 +--- a/grub-core/loader/i386/xen_file.c ++++ b/grub-core/loader/i386/xen_file.c +@@ -55,11 +55,11 @@ grub_xen_file (grub_file_t file) + grub_dprintf ("xen", "found bzimage payload 0x%llx-0x%llx\n", + (unsigned long long) (lh.setup_sects + 1) * 512 + + lh.payload_offset, +- (unsigned long long) lh.payload_length - 4); ++ (unsigned long long) lh.payload_length); + + off_file = grub_file_offset_open (file, (lh.setup_sects + 1) * 512 + + lh.payload_offset, +- lh.payload_length - 4); ++ lh.payload_length); + if (!off_file) + goto fail; + +-- +2.14.3 + diff --git a/0006-Failed-config-now-returns-exit-code-1252311.patch b/0006-Failed-config-now-returns-exit-code-1252311.patch new file mode 100644 index 0000000..57834f2 --- /dev/null +++ b/0006-Failed-config-now-returns-exit-code-1252311.patch @@ -0,0 +1,28 @@ +From 3c3e96d0443e8de64ff29a6563fb69c8a37dd15a Mon Sep 17 00:00:00 2001 +From: Robert Marshall +Date: Fri, 29 Jan 2016 14:49:24 -0500 +Subject: [PATCH 006/123] Failed config now returns exit code (#1252311) + +Grub would notify the user if the new config was invalid, however, it +did not exit properly with exit code 1. Added the proper exit code. + +Resolves: rhbz#1252311 +--- + util/grub-mkconfig.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 203b07696..f8496d28b 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -273,6 +273,7 @@ Ensure that there are no errors in /etc/default/grub + and /etc/grub.d/* files or please file a bug report with + %s file attached." "${grub_cfg}.new" >&2 + echo >&2 ++ exit 1 + else + # none of the children aborted with error, install the new grub.cfg + mv -f ${grub_cfg}.new ${grub_cfg} +-- +2.14.3 + diff --git a/0007-Makefile.util.def-add-LIBINTL-to-grub-macbless-flags.patch b/0007-Makefile.util.def-add-LIBINTL-to-grub-macbless-flags.patch new file mode 100644 index 0000000..652a1de --- /dev/null +++ b/0007-Makefile.util.def-add-LIBINTL-to-grub-macbless-flags.patch @@ -0,0 +1,29 @@ +From ee83919e938e7987c2753b3003a2074e92edf671 Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Sun, 13 Mar 2016 08:11:58 +0300 +Subject: [PATCH 007/123] Makefile.util.def: add $LIBINTL to grub-macbless + flags + +Fixes compilation on OpenBSD 5.9. + +Reported by Jiri B +--- + Makefile.util.def | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.util.def b/Makefile.util.def +index ed9b4c697..f9caccb97 100644 +--- a/Makefile.util.def ++++ b/Makefile.util.def +@@ -416,7 +416,7 @@ program = { + ldadd = libgrubgcry.a; + ldadd = libgrubkern.a; + ldadd = grub-core/gnulib/libgnu.a; +- ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; ++ ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; + }; + + data = { +-- +2.14.3 + diff --git a/0008-Remove-the-variable-oldname-which-is-attempting-to-f.patch b/0008-Remove-the-variable-oldname-which-is-attempting-to-f.patch new file mode 100644 index 0000000..92127af --- /dev/null +++ b/0008-Remove-the-variable-oldname-which-is-attempting-to-f.patch @@ -0,0 +1,45 @@ +From 76eac44af37358fb14f437a7878119e6d34e8d7f Mon Sep 17 00:00:00 2001 +From: Aaron Luft +Date: Mon, 14 Mar 2016 16:48:33 -0400 +Subject: [PATCH 008/123] Remove the variable oldname which is attempting to + free stack space. + +Historically this variable hold previous value of filename that +had to be freed if allocated previously. Currently this branch +is entered only if filename was not allocated previously so it +became redundant. It did not cause real problems because grub_free +was not called, but code is confusing and causes compilation error +in some cases. +--- + grub-core/fs/iso9660.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c +index 67a67cf40..c9c8374bf 100644 +--- a/grub-core/fs/iso9660.c ++++ b/grub-core/fs/iso9660.c +@@ -750,19 +750,15 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir, + + if (dir->data->joliet && !ctx.filename) + { +- char *oldname, *semicolon; ++ char *semicolon; + +- oldname = name; + ctx.filename = grub_iso9660_convert_string +- ((grub_uint8_t *) oldname, dirent.namelen >> 1); ++ ((grub_uint8_t *) name, dirent.namelen >> 1); + + semicolon = grub_strrchr (ctx.filename, ';'); + if (semicolon) + *semicolon = '\0'; + +- if (ctx.filename_alloc) +- grub_free (oldname); +- + ctx.filename_alloc = 1; + } + +-- +2.14.3 + diff --git a/0009-bootp-fix-memory-leak-in-grub_cmd_dhcpopt.patch b/0009-bootp-fix-memory-leak-in-grub_cmd_dhcpopt.patch new file mode 100644 index 0000000..101b618 --- /dev/null +++ b/0009-bootp-fix-memory-leak-in-grub_cmd_dhcpopt.patch @@ -0,0 +1,56 @@ +From 5b8ddf6e03bbc780d6902b1d9c1e3aa6361c9cc3 Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Sat, 19 Mar 2016 09:39:30 +0300 +Subject: [PATCH 009/123] bootp: fix memory leak in grub_cmd_dhcpopt + +--- + grub-core/net/bootp.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c +index a088244b4..09c6f7606 100644 +--- a/grub-core/net/bootp.c ++++ b/grub-core/net/bootp.c +@@ -368,6 +368,7 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)), + + if (grub_strcmp (args[3], "string") == 0) + { ++ grub_err_t err = GRUB_ERR_NONE; + char *val = grub_malloc (taglength + 1); + if (!val) + return grub_errno; +@@ -376,8 +377,9 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)), + if (args[0][0] == '-' && args[0][1] == 0) + grub_printf ("%s\n", val); + else +- return grub_env_set (args[0], val); +- return GRUB_ERR_NONE; ++ err = grub_env_set (args[0], val); ++ grub_free (val); ++ return err; + } + + if (grub_strcmp (args[3], "number") == 0) +@@ -399,6 +401,7 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)), + + if (grub_strcmp (args[3], "hex") == 0) + { ++ grub_err_t err = GRUB_ERR_NONE; + char *val = grub_malloc (2 * taglength + 1); + int i; + if (!val) +@@ -412,8 +415,9 @@ grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)), + if (args[0][0] == '-' && args[0][1] == 0) + grub_printf ("%s\n", val); + else +- return grub_env_set (args[0], val); +- return GRUB_ERR_NONE; ++ err = grub_env_set (args[0], val); ++ grub_free (val); ++ return err; + } + + return grub_error (GRUB_ERR_BAD_ARGUMENT, +-- +2.14.3 + diff --git a/0010-bootp-check-that-interface-is-not-NULL-in-configure_.patch b/0010-bootp-check-that-interface-is-not-NULL-in-configure_.patch new file mode 100644 index 0000000..a674872 --- /dev/null +++ b/0010-bootp-check-that-interface-is-not-NULL-in-configure_.patch @@ -0,0 +1,29 @@ +From 6714d7ecffe58021760e4d1ebfa9cc3473f7fb24 Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Sun, 20 Mar 2016 10:32:33 +0300 +Subject: [PATCH 010/123] bootp: check that interface is not NULL in + configure_by_dhcp_ack + +grub_net_add_addr may fail with OOM and we use returned interface +later without any checks. +--- + grub-core/net/bootp.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c +index 09c6f7606..189551a48 100644 +--- a/grub-core/net/bootp.c ++++ b/grub-core/net/bootp.c +@@ -157,6 +157,9 @@ grub_net_configure_by_dhcp_ack (const char *name, + hwaddr.type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET; + + inter = grub_net_add_addr (name, card, &addr, &hwaddr, flags); ++ if (!inter) ++ return 0; ++ + #if 0 + /* This is likely based on misunderstanding. gateway_ip refers to + address of BOOTP relay and should not be used after BOOTP transaction +-- +2.14.3 + diff --git a/0011-configure-set-fno-pie-together-with-fno-PIE.patch b/0011-configure-set-fno-pie-together-with-fno-PIE.patch new file mode 100644 index 0000000..1d3ab98 --- /dev/null +++ b/0011-configure-set-fno-pie-together-with-fno-PIE.patch @@ -0,0 +1,39 @@ +From f4d35d49e32c29183b3492da18ea480d91716efe Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Tue, 22 Mar 2016 20:12:22 +0300 +Subject: [PATCH 011/123] configure: set -fno-pie together with -fno-PIE + +OpenBSD 5.9 apparently defaults to -fpie. We use -fno-PIE when appropriate +already, but that is not enough - it does not turn off -fpie. + +Actually check for -fPIE is not precise enough. __PIE__ is set for both +-fpie and -fPIE but with different values. As far as I can tell, both +options were introduced at the same time, so both should always be supported. + +This fixes compilation on OpenBSD 5.9 which otherwise created insanely big +lzma_decompress.img. + +Reported, suggested and tested by: Jiri B +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a85b134ec..57e17138e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1185,9 +1185,9 @@ CFLAGS="$TARGET_CFLAGS" + # Position independent executable. + grub_CHECK_PIE + [# Need that, because some distributions ship compilers that include +-# `-fPIE' in the default specs. ++# `-fPIE' or '-fpie' in the default specs. + if [ x"$pie_possible" = xyes ]; then +- TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE" ++ TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE -fno-pie" + fi] + + CFLAGS="$TARGET_CFLAGS" +-- +2.14.3 + diff --git a/0012-http-fix-superfluous-null-line-in-range-request-head.patch b/0012-http-fix-superfluous-null-line-in-range-request-head.patch new file mode 100644 index 0000000..6648981 --- /dev/null +++ b/0012-http-fix-superfluous-null-line-in-range-request-head.patch @@ -0,0 +1,31 @@ +From abf9beb7d667d3604774753cf698c439c6fbc736 Mon Sep 17 00:00:00 2001 +From: Michael Chang +Date: Wed, 6 Apr 2016 18:19:14 +0800 +Subject: [PATCH 012/123] http: fix superfluous null line in range request + header + +At least the apache sever is very unhappy with that extra null line and will +take more than ten seconds in responding to each range request, which slows +down a lot the entire http file transfer process or even time out. +--- + grub-core/net/http.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/grub-core/net/http.c b/grub-core/net/http.c +index 4684f8b33..a7c5101a1 100644 +--- a/grub-core/net/http.c ++++ b/grub-core/net/http.c +@@ -381,9 +381,8 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial) + ptr = nb->tail; + grub_snprintf ((char *) ptr, + sizeof ("Range: bytes=XXXXXXXXXXXXXXXXXXXX-" +- "\r\n" + "\r\n"), +- "Range: bytes=%" PRIuGRUB_UINT64_T "-\r\n\r\n", ++ "Range: bytes=%" PRIuGRUB_UINT64_T "-\r\n", + offset); + grub_netbuff_put (nb, grub_strlen ((char *) ptr)); + } +-- +2.14.3 + diff --git a/0013-build-Use-AC_HEADER_MAJOR-to-find-device-macros.patch b/0013-build-Use-AC_HEADER_MAJOR-to-find-device-macros.patch new file mode 100644 index 0000000..283e7b0 --- /dev/null +++ b/0013-build-Use-AC_HEADER_MAJOR-to-find-device-macros.patch @@ -0,0 +1,107 @@ +From 7a5b301e3adb8e054288518a325135a1883c1c6c Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Tue, 19 Apr 2016 14:27:22 -0400 +Subject: [PATCH 013/123] build: Use AC_HEADER_MAJOR to find device macros + +Depending on the OS/libc, device macros are defined in different +headers. This change ensures we include the right one. + +sys/types.h - BSD +sys/mkdev.h - Sun +sys/sysmacros.h - glibc (Linux) + +glibc currently pulls sys/sysmacros.h into sys/types.h, but this may +change in a future release. + +https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html +--- + configure.ac | 3 ++- + grub-core/osdep/devmapper/getroot.c | 6 ++++++ + grub-core/osdep/devmapper/hostdisk.c | 5 +++++ + grub-core/osdep/linux/getroot.c | 6 ++++++ + grub-core/osdep/unix/getroot.c | 4 +++- + 5 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 57e17138e..9ddfc5323 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -388,7 +388,8 @@ fi + + # Check for functions and headers. + AC_CHECK_FUNCS(posix_memalign memalign getextmntent) +-AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h sys/mkdev.h limits.h) ++AC_CHECK_HEADERS(sys/param.h sys/mount.h sys/mnttab.h limits.h) ++AC_HEADER_MAJOR + + AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$ac_includes_default + #include +diff --git a/grub-core/osdep/devmapper/getroot.c b/grub-core/osdep/devmapper/getroot.c +index 05eda500a..72e558275 100644 +--- a/grub-core/osdep/devmapper/getroot.c ++++ b/grub-core/osdep/devmapper/getroot.c +@@ -40,6 +40,12 @@ + #include + #endif + ++#if defined(MAJOR_IN_MKDEV) ++#include ++#elif defined(MAJOR_IN_SYSMACROS) ++#include ++#endif ++ + #include + + #include +diff --git a/grub-core/osdep/devmapper/hostdisk.c b/grub-core/osdep/devmapper/hostdisk.c +index 19c1101fd..a697bcb4d 100644 +--- a/grub-core/osdep/devmapper/hostdisk.c ++++ b/grub-core/osdep/devmapper/hostdisk.c +@@ -24,6 +24,11 @@ + #include + #include + ++#if defined(MAJOR_IN_MKDEV) ++#include ++#elif defined(MAJOR_IN_SYSMACROS) ++#include ++#endif + + #ifdef HAVE_DEVICE_MAPPER + # include +diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c +index 10480b646..09e7e6e6d 100644 +--- a/grub-core/osdep/linux/getroot.c ++++ b/grub-core/osdep/linux/getroot.c +@@ -35,6 +35,12 @@ + #include + #endif + ++#if defined(MAJOR_IN_MKDEV) ++#include ++#elif defined(MAJOR_IN_SYSMACROS) ++#include ++#endif ++ + #include + #include /* ioctl */ + #include +diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c +index 1079a919d..4bf37b027 100644 +--- a/grub-core/osdep/unix/getroot.c ++++ b/grub-core/osdep/unix/getroot.c +@@ -51,8 +51,10 @@ + #endif + + #include +-#if defined(HAVE_SYS_MKDEV_H) ++#if defined(MAJOR_IN_MKDEV) + #include ++#elif defined(MAJOR_IN_SYSMACROS) ++#include + #endif + + #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR) +-- +2.14.3 + diff --git a/0014-http-reset-EOF-indication-in-http_seek.patch b/0014-http-reset-EOF-indication-in-http_seek.patch new file mode 100644 index 0000000..8cec1fe --- /dev/null +++ b/0014-http-reset-EOF-indication-in-http_seek.patch @@ -0,0 +1,26 @@ +From 13f7ead3a17a5c2681b95c4bb4f40d8eb8648880 Mon Sep 17 00:00:00 2001 +From: Stefan Fritsch +Date: Sat, 30 Apr 2016 09:10:12 +0300 +Subject: [PATCH 014/123] http: reset EOF indication in http_seek + +Otherwise next read will stop polling too early due to stale EOF +indicator, returning incomplete data to caller. +--- + grub-core/net/http.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/grub-core/net/http.c b/grub-core/net/http.c +index a7c5101a1..5aa4ad3be 100644 +--- a/grub-core/net/http.c ++++ b/grub-core/net/http.c +@@ -449,6 +449,7 @@ http_seek (struct grub_file *file, grub_off_t off) + } + + file->device->net->stall = 0; ++ file->device->net->eof = 0; + file->device->net->offset = off; + + data = grub_zalloc (sizeof (*data)); +-- +2.14.3 + diff --git a/0015-net-reset-net-stall-in-grub_net_seek_real.patch b/0015-net-reset-net-stall-in-grub_net_seek_real.patch new file mode 100644 index 0000000..56e1b8c --- /dev/null +++ b/0015-net-reset-net-stall-in-grub_net_seek_real.patch @@ -0,0 +1,27 @@ +From e045af148a580203e47e47276e387fc3958391a5 Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Sat, 30 Apr 2016 09:15:36 +0300 +Subject: [PATCH 015/123] net: reset net->stall in grub_net_seek_real + +If we open new connection, we need to reset stall indication, otherwise +nothing will ever be polled (low level code rely on this field being +zero when establishing connection). +--- + grub-core/net/net.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/grub-core/net/net.c b/grub-core/net/net.c +index 942459527..26a1fc3fc 100644 +--- a/grub-core/net/net.c ++++ b/grub-core/net/net.c +@@ -1672,6 +1672,7 @@ grub_net_seek_real (struct grub_file *file, grub_off_t offset) + file->device->net->packs.last = NULL; + file->device->net->offset = 0; + file->device->net->eof = 0; ++ file->device->net->stall = 0; + err = file->device->net->protocol->open (file, file->device->net->name); + if (err) + return err; +-- +2.14.3 + diff --git a/0016-net-translate-pxe-prefix-to-tftp-when-checking-for-s.patch b/0016-net-translate-pxe-prefix-to-tftp-when-checking-for-s.patch new file mode 100644 index 0000000..cd287eb --- /dev/null +++ b/0016-net-translate-pxe-prefix-to-tftp-when-checking-for-s.patch @@ -0,0 +1,35 @@ +From b524fa27f56381bb0efa4944e36f50265113aee5 Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Tue, 3 May 2016 19:23:31 +0300 +Subject: [PATCH 016/123] net: translate pxe prefix to tftp when checking for + self-load + +Commit ba218c1 missed legacy pxe and pxe: prefixes which are +translated to tftp, so comparison failed. +--- + grub-core/net/net.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/grub-core/net/net.c b/grub-core/net/net.c +index 26a1fc3fc..10773fc34 100644 +--- a/grub-core/net/net.c ++++ b/grub-core/net/net.c +@@ -1346,6 +1346,15 @@ grub_net_open_real (const char *name) + continue; + } + ++ if (grub_strncmp (prefdev, "pxe", sizeof ("pxe") - 1) == 0 && ++ (!prefdev[sizeof ("pxe") - 1] || (prefdev[sizeof("pxe") - 1] == ':'))) ++ { ++ grub_free (prefdev); ++ prefdev = grub_strdup ("tftp"); ++ if (!prefdev) ++ continue; ++ } ++ + comma = grub_strchr (prefdev, ','); + if (comma) + *comma = '\0'; +-- +2.14.3 + diff --git a/0001-IBM-client-architecture-CAS-reboot-support.patch b/0017-IBM-client-architecture-CAS-reboot-support.patch similarity index 96% rename from 0001-IBM-client-architecture-CAS-reboot-support.patch rename to 0017-IBM-client-architecture-CAS-reboot-support.patch index 22c682d..7e5d4f3 100644 --- a/0001-IBM-client-architecture-CAS-reboot-support.patch +++ b/0017-IBM-client-architecture-CAS-reboot-support.patch @@ -1,7 +1,7 @@ From e32c57d2abd034cbdea24a8f51de8dbef453bd96 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Thu, 20 Sep 2012 18:07:39 -0300 -Subject: [PATCH 01/90] IBM client architecture (CAS) reboot support +Subject: [PATCH 017/123] IBM client architecture (CAS) reboot support This is an implementation of IBM client architecture (CAS) reboot for GRUB. @@ -25,7 +25,7 @@ parameters 4 files changed, 90 insertions(+) diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c -index ddb7783..6db8b98 100644 +index ddb778340..6db8b9865 100644 --- a/grub-core/kern/ieee1275/openfw.c +++ b/grub-core/kern/ieee1275/openfw.c @@ -561,3 +561,65 @@ grub_ieee1275_canonicalise_devname (const char *path) @@ -95,7 +95,7 @@ index ddb7783..6db8b98 100644 + return 0; +} diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 78a70a8..249e19b 100644 +index 78a70a8bf..249e19bc7 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -33,6 +33,9 @@ @@ -132,7 +132,7 @@ index 78a70a8..249e19b 100644 grub_errno = GRUB_ERR_NONE; } diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index a8502d9..ab78ca8 100644 +index a8502d907..ab78ca87f 100644 --- a/grub-core/script/execute.c +++ b/grub-core/script/execute.c @@ -27,6 +27,9 @@ @@ -157,7 +157,7 @@ index a8502d9..ab78ca8 100644 { char *line; diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index 8e42513..9f26c69 100644 +index 8e4251303..9f26c69a2 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -234,6 +234,8 @@ int EXPORT_FUNC(grub_ieee1275_devalias_next) (struct grub_ieee1275_devalias *ali @@ -170,5 +170,5 @@ index 8e42513..9f26c69 100644 #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));) -- -2.9.3 +2.14.3 diff --git a/0002-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0018-for-ppc-reset-console-display-attr-when-clear-screen.patch similarity index 90% rename from 0002-for-ppc-reset-console-display-attr-when-clear-screen.patch rename to 0018-for-ppc-reset-console-display-attr-when-clear-screen.patch index 3582760..d213501 100644 --- a/0002-for-ppc-reset-console-display-attr-when-clear-screen.patch +++ b/0018-for-ppc-reset-console-display-attr-when-clear-screen.patch @@ -1,7 +1,7 @@ From 4f82466e3b1fcf3370d82432e406f51906e1fa46 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 24 Apr 2013 10:51:48 -0300 -Subject: [PATCH 02/90] for ppc, reset console display attr when clear screen +Subject: [PATCH 018/123] for ppc, reset console display attr when clear screen v2: Also use \x0c instead of a literal ^L to make future patches less awkward. @@ -15,7 +15,7 @@ Signed-off-by: Peter Jones 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c -index f0d3e3d..9bb75c1 100644 +index f0d3e3deb..9bb75c173 100644 --- a/grub-core/term/terminfo.c +++ b/grub-core/term/terminfo.c @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term, @@ -28,5 +28,5 @@ index f0d3e3d..9bb75c1 100644 data->reverse_video_off = grub_strdup ("\e[m"); if (grub_strcmp ("ieee1275", str) == 0) -- -2.9.3 +2.14.3 diff --git a/0003-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0019-Disable-GRUB-video-support-for-IBM-power-machines.patch similarity index 91% rename from 0003-Disable-GRUB-video-support-for-IBM-power-machines.patch rename to 0019-Disable-GRUB-video-support-for-IBM-power-machines.patch index 335100a..38e53fa 100644 --- a/0003-Disable-GRUB-video-support-for-IBM-power-machines.patch +++ b/0019-Disable-GRUB-video-support-for-IBM-power-machines.patch @@ -1,7 +1,7 @@ From 9cff6efa3a7e15a6968fed29a29f38713da864fd Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 11 Jun 2013 15:14:05 -0300 -Subject: [PATCH 03/90] Disable GRUB video support for IBM power machines +Subject: [PATCH 019/123] Disable GRUB video support for IBM power machines Should fix the problem in bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=973205 @@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=973205 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c -index 3e12e6b..3e14f53 100644 +index 3e12e6b24..3e14f5393 100644 --- a/grub-core/kern/ieee1275/cmain.c +++ b/grub-core/kern/ieee1275/cmain.c @@ -90,7 +90,10 @@ grub_ieee1275_find_options (void) @@ -28,7 +28,7 @@ index 3e12e6b..3e14f53 100644 /* Old Macs have no key repeat, newer ones have fully working one. The ones inbetween when repeated key generates an escaoe sequence diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c -index 0b150ec..813ab38 100644 +index 0b150ec24..813ab38e1 100644 --- a/grub-core/video/ieee1275.c +++ b/grub-core/video/ieee1275.c @@ -351,9 +351,12 @@ static struct grub_video_adapter grub_video_ieee1275_adapter = @@ -48,7 +48,7 @@ index 0b150ec..813ab38 100644 GRUB_MOD_FINI(ieee1275_fb) diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index 9f26c69..ab4f284 100644 +index 9f26c69a2..ab4f284c3 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -146,6 +146,8 @@ enum grub_ieee1275_flag @@ -61,5 +61,5 @@ index 9f26c69..ab4f284 100644 extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag); -- -2.9.3 +2.14.3 diff --git a/0004-Fix-bzr-s-ignore-artificats-in-.gitignore.patch b/0020-Fix-bzr-s-ignore-artificats-in-.gitignore.patch similarity index 98% rename from 0004-Fix-bzr-s-ignore-artificats-in-.gitignore.patch rename to 0020-Fix-bzr-s-ignore-artificats-in-.gitignore.patch index 7705c8e..d7eb2a5 100644 --- a/0004-Fix-bzr-s-ignore-artificats-in-.gitignore.patch +++ b/0020-Fix-bzr-s-ignore-artificats-in-.gitignore.patch @@ -1,7 +1,7 @@ From 512fe6865738286c94f87da64ca6b475bc3e2f38 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 7 Jul 2015 10:13:14 -0400 -Subject: [PATCH 04/90] Fix bzr's ignore artificats in .gitignore +Subject: [PATCH 020/123] Fix bzr's ignore artificats in .gitignore We lost a man page because of incompatibilities between bzr's ignore system and .gitignore, so solve that slightly better. @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones 1 file changed, 120 insertions(+), 145 deletions(-) diff --git a/.gitignore b/.gitignore -index 18ab8e8..06c9f3a 100644 +index 18ab8e812..06c9f3ab7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,93 +1,154 @@ @@ -367,5 +367,5 @@ index 18ab8e8..06c9f3a 100644 -/grub-fs-tester +xzcompress_test -- -2.9.3 +2.14.3 diff --git a/0005-Honor-a-symlink-when-generating-configuration-by-gru.patch b/0021-Honor-a-symlink-when-generating-configuration-by-gru.patch similarity index 87% rename from 0005-Honor-a-symlink-when-generating-configuration-by-gru.patch rename to 0021-Honor-a-symlink-when-generating-configuration-by-gru.patch index 5977a22..e5c1138 100644 --- a/0005-Honor-a-symlink-when-generating-configuration-by-gru.patch +++ b/0021-Honor-a-symlink-when-generating-configuration-by-gru.patch @@ -1,7 +1,7 @@ From 7f1ea377390345b8ef7609ad0fa2952708b17e19 Mon Sep 17 00:00:00 2001 From: Marcel Kolaja Date: Tue, 21 Jan 2014 10:57:08 -0500 -Subject: [PATCH 05/90] Honor a symlink when generating configuration by +Subject: [PATCH 021/123] Honor a symlink when generating configuration by grub2-mkconfig Honor a symlink when generating configuration by grub2-mkconfig, so that @@ -11,7 +11,7 @@ the -o option follows it rather than overwriting it with a regular file. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index f8496d2..3b070fd 100644 +index f8496d28b..3b070fd76 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -276,7 +276,8 @@ and /etc/grub.d/* files or please file a bug report with @@ -25,5 +25,5 @@ index f8496d2..3b070fd 100644 fi -- -2.9.3 +2.14.3 diff --git a/0006-Move-bash-completion-script-922997.patch b/0022-Move-bash-completion-script-922997.patch similarity index 92% rename from 0006-Move-bash-completion-script-922997.patch rename to 0022-Move-bash-completion-script-922997.patch index 4f60fb0..1103001 100644 --- a/0006-Move-bash-completion-script-922997.patch +++ b/0022-Move-bash-completion-script-922997.patch @@ -1,7 +1,7 @@ From 5b77e510eb6e4b649c53ab0790cdc9fdf0c85be9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Apr 2013 14:35:34 -0400 -Subject: [PATCH 06/90] Move bash completion script (#922997) +Subject: [PATCH 022/123] Move bash completion script (#922997) Apparently these go in a new place now. --- @@ -10,7 +10,7 @@ Apparently these go in a new place now. 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 9ddfc53..ab9134c 100644 +index 9ddfc5323..ab9134c86 100644 --- a/configure.ac +++ b/configure.ac @@ -287,6 +287,14 @@ AC_SUBST(grubdirname) @@ -39,7 +39,7 @@ index 9ddfc53..ab9134c 100644 if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then tmp_ac_tool_prefix="$ac_tool_prefix" diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am -index 136287c..61108f0 100644 +index 136287cf1..61108f054 100644 --- a/util/bash-completion.d/Makefile.am +++ b/util/bash-completion.d/Makefile.am @@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source) @@ -51,5 +51,5 @@ index 136287c..61108f0 100644 $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status -- -2.9.3 +2.14.3 diff --git a/0007-Update-to-minilzo-2.08.patch b/0023-Update-to-minilzo-2.08.patch similarity index 99% rename from 0007-Update-to-minilzo-2.08.patch rename to 0023-Update-to-minilzo-2.08.patch index cb8e4a6..23a9aba 100644 --- a/0007-Update-to-minilzo-2.08.patch +++ b/0023-Update-to-minilzo-2.08.patch @@ -1,7 +1,7 @@ From 579ecb682efc5221b4a13b8009af1731f5349912 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Dec 2014 15:36:09 -0500 -Subject: [PATCH 07/90] Update to minilzo-2.08 +Subject: [PATCH 023/123] Update to minilzo-2.08 This fixes CVE-2014-4607 - lzo: lzo1x_decompress_safe() integer overflow @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones 4 files changed, 4630 insertions(+), 2010 deletions(-) diff --git a/grub-core/lib/minilzo/lzoconf.h b/grub-core/lib/minilzo/lzoconf.h -index 1d0fe14..61be29c 100644 +index 1d0fe14fc..61be29c5d 100644 --- a/grub-core/lib/minilzo/lzoconf.h +++ b/grub-core/lib/minilzo/lzoconf.h @@ -2,22 +2,7 @@ @@ -353,7 +353,7 @@ index 1d0fe14..61be29c 100644 -/* vim:set ts=4 et: */ +/* vim:set ts=4 sw=4 et: */ diff --git a/grub-core/lib/minilzo/lzodefs.h b/grub-core/lib/minilzo/lzodefs.h -index 0e40e33..f4ae948 100644 +index 0e40e332a..f4ae9487e 100644 --- a/grub-core/lib/minilzo/lzodefs.h +++ b/grub-core/lib/minilzo/lzodefs.h @@ -2,22 +2,7 @@ @@ -3361,7 +3361,7 @@ index 0e40e33..f4ae948 100644 -/* vim:set ts=4 et: */ +/* vim:set ts=4 sw=4 et: */ diff --git a/grub-core/lib/minilzo/minilzo.c b/grub-core/lib/minilzo/minilzo.c -index 25a1f68..ab2be5f 100644 +index 25a1f68b3..ab2be5f4f 100644 --- a/grub-core/lib/minilzo/minilzo.c +++ b/grub-core/lib/minilzo/minilzo.c @@ -2,22 +2,7 @@ @@ -8740,7 +8740,7 @@ index 25a1f68..ab2be5f 100644 /***** End of minilzo.c *****/ - diff --git a/grub-core/lib/minilzo/minilzo.h b/grub-core/lib/minilzo/minilzo.h -index 74fefa9..7937454 100644 +index 74fefa9fe..793745467 100644 --- a/grub-core/lib/minilzo/minilzo.h +++ b/grub-core/lib/minilzo/minilzo.h @@ -2,22 +2,7 @@ @@ -8786,5 +8786,5 @@ index 74fefa9..7937454 100644 -- -2.9.3 +2.14.3 diff --git a/0008-Add-vlan-tag-support-on-IBM-PPC-machines.patch b/0024-Add-vlan-tag-support-on-IBM-PPC-machines.patch similarity index 95% rename from 0008-Add-vlan-tag-support-on-IBM-PPC-machines.patch rename to 0024-Add-vlan-tag-support-on-IBM-PPC-machines.patch index 05af50c..154f07f 100644 --- a/0008-Add-vlan-tag-support-on-IBM-PPC-machines.patch +++ b/0024-Add-vlan-tag-support-on-IBM-PPC-machines.patch @@ -1,7 +1,7 @@ From de423b22780b0fd225a1ee476166777af29d53d0 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 30 Oct 2012 15:19:39 -0200 -Subject: [PATCH 08/90] Add vlan-tag support on IBM PPC machines +Subject: [PATCH 024/123] Add vlan-tag support on IBM PPC machines This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows multiple VLANs in a bridged network to share the same physical network link but @@ -20,7 +20,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=871563 5 files changed, 73 insertions(+), 3 deletions(-) diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 1259022..5fa26e1 100644 +index 12590225e..5fa26e189 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -125,6 +125,7 @@ grub_machine_get_bootlocation (char **device, char **path) @@ -32,7 +32,7 @@ index 1259022..5fa26e1 100644 ptr = canon + grub_strlen (canon) - 1; while (ptr > canon && (*ptr == ',' || *ptr == ':')) diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c -index 6db8b98..81276fa 100644 +index 6db8b9865..81276fae7 100644 --- a/grub-core/kern/ieee1275/openfw.c +++ b/grub-core/kern/ieee1275/openfw.c @@ -23,6 +23,7 @@ @@ -80,7 +80,7 @@ index 6db8b98..81276fa 100644 grub_ieee1275_get_device_type (const char *path) { diff --git a/grub-core/net/ethernet.c b/grub-core/net/ethernet.c -index c397b1b..faaca67 100644 +index c397b1b34..faaca67c5 100644 --- a/grub-core/net/ethernet.c +++ b/grub-core/net/ethernet.c @@ -23,6 +23,7 @@ @@ -159,7 +159,7 @@ index c397b1b..faaca67 100644 return err; diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h -index ab4f284..663935d 100644 +index ab4f284c3..663935da7 100644 --- a/include/grub/ieee1275/ieee1275.h +++ b/include/grub/ieee1275/ieee1275.h @@ -238,6 +238,7 @@ void EXPORT_FUNC(grub_ieee1275_children_first) (const char *devpath, @@ -171,7 +171,7 @@ index ab4f284..663935d 100644 #define FOR_IEEE1275_DEVALIASES(alias) for (grub_ieee1275_devalias_init_iterator (&(alias)); grub_ieee1275_devalias_next (&(alias));) diff --git a/include/grub/net.h b/include/grub/net.h -index 2192fa1..6ac9d72 100644 +index 2192fa186..6ac9d72bf 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -561,4 +561,6 @@ extern char *grub_net_default_server; @@ -182,5 +182,5 @@ index 2192fa1..6ac9d72 100644 + #endif /* ! GRUB_NET_HEADER */ -- -2.9.3 +2.14.3 diff --git a/0009-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0025-Allow-fallback-to-include-entries-by-title-not-just-.patch similarity index 96% rename from 0009-Allow-fallback-to-include-entries-by-title-not-just-.patch rename to 0025-Allow-fallback-to-include-entries-by-title-not-just-.patch index 37f85f1..48ee0ae 100644 --- a/0009-Allow-fallback-to-include-entries-by-title-not-just-.patch +++ b/0025-Allow-fallback-to-include-entries-by-title-not-just-.patch @@ -1,8 +1,8 @@ From 196ae5abd961cd64b60d9ab41bfc02d340e8bb6f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 5 Sep 2014 10:07:04 -0400 -Subject: [PATCH 09/90] Allow "fallback" to include entries by title, not just - number. +Subject: [PATCH 025/123] Allow "fallback" to include entries by title, not + just number. Resolves: rhbz#1026084 @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones 1 file changed, 58 insertions(+), 27 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index 719e2fb..2e8a7bd 100644 +index 719e2fb1c..2e8a7bd89 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -163,16 +163,41 @@ grub_menu_set_timeout (int timeout) @@ -140,5 +140,5 @@ index 719e2fb..2e8a7bd 100644 static int get_entry_number (grub_menu_t menu, const char *name) -- -2.9.3 +2.14.3 diff --git a/0010-Add-GRUB_DISABLE_UUID.patch b/0026-Add-GRUB_DISABLE_UUID.patch similarity index 96% rename from 0010-Add-GRUB_DISABLE_UUID.patch rename to 0026-Add-GRUB_DISABLE_UUID.patch index 6bd4ca7..d70c1aa 100644 --- a/0010-Add-GRUB_DISABLE_UUID.patch +++ b/0026-Add-GRUB_DISABLE_UUID.patch @@ -1,7 +1,7 @@ From 8f405e93871ad51cd9ab4dfdea844042a33fa7f0 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 16:49:25 -0400 -Subject: [PATCH 10/90] Add GRUB_DISABLE_UUID. +Subject: [PATCH 026/123] Add GRUB_DISABLE_UUID. This will cause "search --fs-uuid --set=root ..." not to be generated by grub2-mkconfig, and instead simply attempt to use the grub device name @@ -15,7 +15,7 @@ Signed-off-by: Peter Jones 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi -index 82f6fa4..98d4d0d 100644 +index 82f6fa459..98d4d0d52 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -1409,6 +1409,13 @@ disable the use of UUIDs, set this option to @samp{true}. @@ -33,7 +33,7 @@ index 82f6fa4..98d4d0d 100644 If graphical video support is required, either because the @samp{gfxterm} graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set, diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 3b070fd..c088b70 100644 +index 3b070fd76..c088b7054 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -133,11 +133,11 @@ fi @@ -73,7 +73,7 @@ index 3b070fd..c088b70 100644 GRUB_GFXMODE \ GRUB_BACKGROUND \ diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in -index 60b31ca..cf35e41 100644 +index 60b31cadd..cf35e4174 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -156,7 +156,7 @@ prepare_grub_to_access_device () @@ -95,5 +95,5 @@ index 60b31ca..cf35e41 100644 else echo $device |sed 's, ,_,g' -- -2.9.3 +2.14.3 diff --git a/0011-Make-exit-take-a-return-code.patch b/0027-Make-exit-take-a-return-code.patch similarity index 93% rename from 0011-Make-exit-take-a-return-code.patch rename to 0027-Make-exit-take-a-return-code.patch index 1bae1cd..3dd14e6 100644 --- a/0011-Make-exit-take-a-return-code.patch +++ b/0027-Make-exit-take-a-return-code.patch @@ -1,7 +1,7 @@ From 6879936079d17ace35cebcab787f7fb9f8cd205e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 26 Feb 2014 21:49:12 -0500 -Subject: [PATCH 11/90] Make "exit" take a return code. +Subject: [PATCH 027/123] Make "exit" take a return code. This adds "exit" with a return code. With this patch, any "exit" command /may/ include a return code, and on platforms that support @@ -27,7 +27,7 @@ Signed-off-by: Peter Jones 14 files changed, 39 insertions(+), 21 deletions(-) diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c -index a3a1182..b25ca4b 100644 +index a3a118241..b25ca4b9f 100644 --- a/grub-core/commands/minicmd.c +++ b/grub-core/commands/minicmd.c @@ -176,12 +176,24 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)), @@ -60,7 +60,7 @@ index a3a1182..b25ca4b 100644 } diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index caf9bcc..101307f 100644 +index caf9bcc41..101307fc7 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -155,11 +155,16 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle) @@ -83,7 +83,7 @@ index caf9bcc..101307f 100644 } diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c -index f91280f..34634d3 100644 +index f91280f68..34634d3d5 100644 --- a/grub-core/kern/emu/main.c +++ b/grub-core/kern/emu/main.c @@ -66,7 +66,7 @@ grub_reboot (void) @@ -96,7 +96,7 @@ index f91280f..34634d3 100644 grub_reboot (); } diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c -index d361feb..331fa62 100644 +index d361feb00..331fa62a4 100644 --- a/grub-core/kern/emu/misc.c +++ b/grub-core/kern/emu/misc.c @@ -136,9 +136,10 @@ xasprintf (const char *fmt, ...) @@ -113,7 +113,7 @@ index d361feb..331fa62 100644 #endif diff --git a/grub-core/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c -index 3314f02..36f9134 100644 +index 3314f027f..36f9134b7 100644 --- a/grub-core/kern/i386/coreboot/init.c +++ b/grub-core/kern/i386/coreboot/init.c @@ -41,7 +41,7 @@ extern grub_uint8_t _end[]; @@ -126,7 +126,7 @@ index 3314f02..36f9134 100644 /* We can't use grub_fatal() in this function. This would create an infinite loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit(). */ diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c -index 271b6fb..9fafe98 100644 +index 271b6fbfa..9fafe98f0 100644 --- a/grub-core/kern/i386/qemu/init.c +++ b/grub-core/kern/i386/qemu/init.c @@ -42,7 +42,7 @@ extern grub_uint8_t _end[]; @@ -139,7 +139,7 @@ index 271b6fb..9fafe98 100644 /* We can't use grub_fatal() in this function. This would create an infinite loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit(). */ diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 5fa26e1..8a3ecd5 100644 +index 5fa26e189..8a3ecd580 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -68,7 +68,7 @@ grub_addr_t grub_ieee1275_original_stack; @@ -152,7 +152,7 @@ index 5fa26e1..8a3ecd5 100644 grub_ieee1275_exit (); } diff --git a/grub-core/kern/mips/arc/init.c b/grub-core/kern/mips/arc/init.c -index 3834a14..86b3a25 100644 +index 3834a1490..86b3a25ec 100644 --- a/grub-core/kern/mips/arc/init.c +++ b/grub-core/kern/mips/arc/init.c @@ -276,7 +276,7 @@ grub_halt (void) @@ -165,7 +165,7 @@ index 3834a14..86b3a25 100644 GRUB_ARC_FIRMWARE_VECTOR->exit (); diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c -index 7b96531..dff598c 100644 +index 7b96531b9..dff598ca7 100644 --- a/grub-core/kern/mips/loongson/init.c +++ b/grub-core/kern/mips/loongson/init.c @@ -304,7 +304,7 @@ grub_halt (void) @@ -178,7 +178,7 @@ index 7b96531..dff598c 100644 grub_halt (); } diff --git a/grub-core/kern/mips/qemu_mips/init.c b/grub-core/kern/mips/qemu_mips/init.c -index be88b77..8b6c55f 100644 +index be88b77d2..8b6c55ffc 100644 --- a/grub-core/kern/mips/qemu_mips/init.c +++ b/grub-core/kern/mips/qemu_mips/init.c @@ -75,7 +75,7 @@ grub_machine_fini (int flags __attribute__ ((unused))) @@ -191,7 +191,7 @@ index be88b77..8b6c55f 100644 grub_halt (); } diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index d1a54df..6bb0351 100644 +index d1a54df6c..6bb035175 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -1094,7 +1094,7 @@ grub_abort (void) @@ -204,7 +204,7 @@ index d1a54df..6bb0351 100644 void diff --git a/grub-core/kern/uboot/init.c b/grub-core/kern/uboot/init.c -index 5dcc106..430c62b 100644 +index 5dcc106ed..430c62b66 100644 --- a/grub-core/kern/uboot/init.c +++ b/grub-core/kern/uboot/init.c @@ -43,9 +43,9 @@ extern grub_uint32_t grub_uboot_machine_type; @@ -229,7 +229,7 @@ index 5dcc106..430c62b 100644 else if (ver > API_SIG_VERSION) { diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c -index 0559c03..fce526d 100644 +index 0559c033c..fce526d41 100644 --- a/grub-core/kern/xen/init.c +++ b/grub-core/kern/xen/init.c @@ -549,7 +549,7 @@ grub_machine_init (void) @@ -242,7 +242,7 @@ index 0559c03..fce526d 100644 struct sched_shutdown arg; diff --git a/include/grub/misc.h b/include/grub/misc.h -index 2a9f87c..0620814 100644 +index 2a9f87cc2..062081437 100644 --- a/include/grub/misc.h +++ b/include/grub/misc.h @@ -334,7 +334,7 @@ int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt, @@ -255,5 +255,5 @@ index 2a9f87c..0620814 100644 grub_uint64_t d, grub_uint64_t *r); -- -2.9.3 +2.14.3 diff --git a/0012-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch b/0028-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch similarity index 76% rename from 0012-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch rename to 0028-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch index e947704..5d255e5 100644 --- a/0012-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch +++ b/0028-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch @@ -1,8 +1,8 @@ From ef756db92dd4f47ed4bb4aede86d33326b0b9188 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 22 Jul 2015 11:21:01 -0400 -Subject: [PATCH 12/90] Mark po/exclude.pot as binary so git won't try to diff - nonprintables. +Subject: [PATCH 028/123] Mark po/exclude.pot as binary so git won't try to + diff nonprintables. Signed-off-by: Peter Jones --- @@ -12,11 +12,11 @@ Signed-off-by: Peter Jones diff --git a/.gitattributes b/.gitattributes new file mode 100644 -index 0000000..33ffaa4 +index 000000000..33ffaa404 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +po/exclude.pot binary -- -2.9.3 +2.14.3 diff --git a/0013-Make-efi-machines-load-an-env-block-from-a-variable.patch b/0029-Make-efi-machines-load-an-env-block-from-a-variable.patch similarity index 93% rename from 0013-Make-efi-machines-load-an-env-block-from-a-variable.patch rename to 0029-Make-efi-machines-load-an-env-block-from-a-variable.patch index cf4e42d..09f6e6c 100644 --- a/0013-Make-efi-machines-load-an-env-block-from-a-variable.patch +++ b/0029-Make-efi-machines-load-an-env-block-from-a-variable.patch @@ -1,7 +1,7 @@ From e14c5369fea76d1e067ca9f7e5e55bfe615cb639 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 7 Dec 2015 14:20:49 -0500 -Subject: [PATCH 13/90] Make efi machines load an env block from a variable +Subject: [PATCH 029/123] Make efi machines load an env block from a variable Signed-off-by: Peter Jones --- @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 58b4208..f8d4634 100644 +index 58b4208b0..f8d46342a 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -173,6 +173,7 @@ kernel = { @@ -22,7 +22,7 @@ index 58b4208..f8d4634 100644 i386_multiboot = kern/i386/pc/acpi.c; i386_coreboot = kern/acpi.c; diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c -index e9c85de..a5b6c1d 100644 +index e9c85de12..a5b6c1dfe 100644 --- a/grub-core/kern/efi/init.c +++ b/grub-core/kern/efi/init.c @@ -25,9 +25,40 @@ @@ -80,5 +80,5 @@ index e9c85de..a5b6c1d 100644 char **path); -- -2.9.3 +2.14.3 diff --git a/0014-DHCP-client-ID-and-UUID-options-added.patch b/0030-DHCP-client-ID-and-UUID-options-added.patch similarity index 96% rename from 0014-DHCP-client-ID-and-UUID-options-added.patch rename to 0030-DHCP-client-ID-and-UUID-options-added.patch index aefc4af..872555b 100644 --- a/0014-DHCP-client-ID-and-UUID-options-added.patch +++ b/0030-DHCP-client-ID-and-UUID-options-added.patch @@ -1,7 +1,7 @@ From 12fb24b4d8a8f0fd7f79bc224157c290ebab31f4 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:18:53 -0200 -Subject: [PATCH 14/90] DHCP client ID and UUID options added. +Subject: [PATCH 030/123] DHCP client ID and UUID options added. --- grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++----- @@ -9,7 +9,7 @@ Subject: [PATCH 14/90] DHCP client ID and UUID options added. 2 files changed, 81 insertions(+), 8 deletions(-) diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c -index 189551a..a9c8f47 100644 +index 189551a48..a9c8f470b 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -25,6 +25,49 @@ @@ -128,7 +128,7 @@ index 189551a..a9c8f47 100644 grub_cmd_dhcpopt (struct grub_command *cmd __attribute__ ((unused)), int argc, char **args) diff --git a/include/grub/net.h b/include/grub/net.h -index 6ac9d72..96aa9fa 100644 +index 6ac9d72bf..96aa9fac0 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -456,6 +456,8 @@ enum @@ -141,5 +141,5 @@ index 6ac9d72..96aa9fa 100644 }; -- -2.9.3 +2.14.3 diff --git a/0015-trim-arp-packets-with-abnormal-size.patch b/0031-trim-arp-packets-with-abnormal-size.patch similarity index 91% rename from 0015-trim-arp-packets-with-abnormal-size.patch rename to 0031-trim-arp-packets-with-abnormal-size.patch index fed31b4..e504060 100644 --- a/0015-trim-arp-packets-with-abnormal-size.patch +++ b/0031-trim-arp-packets-with-abnormal-size.patch @@ -1,7 +1,7 @@ From a6f4624278357f853e3e8888e538eb0ef3654556 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 5 Feb 2014 09:42:42 -0200 -Subject: [PATCH 15/90] trim arp packets with abnormal size +Subject: [PATCH 031/123] trim arp packets with abnormal size GRUB uses arp request to create the arp response. If the incoming packet is foobared, GRUB needs to trim the arp response packet before sending it. @@ -10,7 +10,7 @@ is foobared, GRUB needs to trim the arp response packet before sending it. 1 file changed, 6 insertions(+) diff --git a/grub-core/net/arp.c b/grub-core/net/arp.c -index 4b68c41..f7c59d3 100644 +index 4b68c4151..f7c59d371 100644 --- a/grub-core/net/arp.c +++ b/grub-core/net/arp.c @@ -142,6 +142,12 @@ grub_net_arp_receive (struct grub_net_buff *nb, @@ -27,5 +27,5 @@ index 4b68c41..f7c59d3 100644 struct grub_net_buff nb_reply; struct arppkt *arp_reply; -- -2.9.3 +2.14.3 diff --git a/0016-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/0032-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch similarity index 92% rename from 0016-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch rename to 0032-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch index 011204e..5abc3c0 100644 --- a/0016-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch +++ b/0032-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch @@ -1,7 +1,7 @@ From c22139b340f1a306ad718646a4cd4bc1d4039d7b Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Wed, 12 Mar 2014 10:58:16 -0400 -Subject: [PATCH 16/90] Fix bad test on GRUB_DISABLE_SUBMENU. +Subject: [PATCH 032/123] Fix bad test on GRUB_DISABLE_SUBMENU. The file /etc/grub.d/10_linux does @@ -20,7 +20,7 @@ Resolves: rhbz#1063414 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index de9044c..cf6331f 100644 +index de9044c7f..cf6331f2a 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -224,7 +224,11 @@ while [ "x$list" != "x" ] ; do @@ -37,5 +37,5 @@ index de9044c..cf6331f 100644 "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -- -2.9.3 +2.14.3 diff --git a/0017-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/0033-Add-support-for-UEFI-operating-systems-returned-by-o.patch similarity index 91% rename from 0017-Add-support-for-UEFI-operating-systems-returned-by-o.patch rename to 0033-Add-support-for-UEFI-operating-systems-returned-by-o.patch index fb49bb7..94aacf9 100644 --- a/0017-Add-support-for-UEFI-operating-systems-returned-by-o.patch +++ b/0033-Add-support-for-UEFI-operating-systems-returned-by-o.patch @@ -1,7 +1,7 @@ From f0daa044a90c508f8f60d23e5ef39597ec80c2cc Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 12 Jun 2013 11:51:49 -0400 -Subject: [PATCH 17/90] Add support for UEFI operating systems returned by +Subject: [PATCH 033/123] Add support for UEFI operating systems returned by os-prober os-prober returns UEFI operating systems in the form: @@ -15,7 +15,7 @@ contrast to legacy OSes, where path is the device string. Handle this case. 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 515a68c..9b8f596 100644 +index 515a68c7a..9b8f5968e 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -328,8 +328,23 @@ EOF @@ -46,5 +46,5 @@ index 515a68c..9b8f596 100644 esac done -- -2.9.3 +2.14.3 diff --git a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0034-Migrate-PPC-from-Yaboot-to-Grub2.patch similarity index 95% rename from 0018-Migrate-PPC-from-Yaboot-to-Grub2.patch rename to 0034-Migrate-PPC-from-Yaboot-to-Grub2.patch index f605f68..d7d7bf0 100644 --- a/0018-Migrate-PPC-from-Yaboot-to-Grub2.patch +++ b/0034-Migrate-PPC-from-Yaboot-to-Grub2.patch @@ -1,7 +1,7 @@ From 0e433858169473aa7a042c28dd6f0d4e1adab8d7 Mon Sep 17 00:00:00 2001 From: Mark Hamzy Date: Wed, 28 Mar 2012 14:46:41 -0500 -Subject: [PATCH 18/90] Migrate PPC from Yaboot to Grub2 +Subject: [PATCH 034/123] Migrate PPC from Yaboot to Grub2 Add configuration support for serial terminal consoles. This will set the maximum screen size so that text is not overwritten. @@ -12,26 +12,26 @@ maximum screen size so that text is not overwritten. create mode 100644 util/grub.d/20_ppc_terminfo.in diff --git a/Makefile.util.def b/Makefile.util.def -index f9caccb..6d452da 100644 +index f9caccb97..6d452da02 100644 --- a/Makefile.util.def +++ b/Makefile.util.def -@@ -487,6 +487,13 @@ script = { +@@ -486,6 +486,13 @@ script = { + condition = COND_HOST_LINUX; }; - script = { ++script = { + name = '20_ppc_terminfo'; + common = util/grub.d/20_ppc_terminfo.in; + installdir = grubconf; + condition = COND_HOST_LINUX; +}; + -+script = { + script = { name = '30_os-prober'; common = util/grub.d/30_os-prober.in; - installdir = grubconf; diff --git a/util/grub.d/20_ppc_terminfo.in b/util/grub.d/20_ppc_terminfo.in new file mode 100644 -index 0000000..10d6658 +index 000000000..10d665868 --- /dev/null +++ b/util/grub.d/20_ppc_terminfo.in @@ -0,0 +1,114 @@ @@ -150,5 +150,5 @@ index 0000000..10d6658 + terminfo -g ${X}x${Y} ${TERMINAL} +EOF -- -2.9.3 +2.14.3 diff --git a/0019-Add-fw_path-variable-revised.patch b/0035-Add-fw_path-variable-revised.patch similarity index 94% rename from 0019-Add-fw_path-variable-revised.patch rename to 0035-Add-fw_path-variable-revised.patch index 8724bf3..91edbdd 100644 --- a/0019-Add-fw_path-variable-revised.patch +++ b/0035-Add-fw_path-variable-revised.patch @@ -1,7 +1,7 @@ From fdc52554d998170f56ed45856082f4a3bfeb3e2a Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 19 Sep 2012 21:22:55 -0300 -Subject: [PATCH 19/90] Add fw_path variable (revised) +Subject: [PATCH 035/123] Add fw_path variable (revised) This patch makes grub look for its config file on efi where the app was found. It was originally written by Matthew Garrett, and adapted to fix the @@ -14,7 +14,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=857936 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index 9cad0c4..8ab7794 100644 +index 9cad0c448..8ab7794c4 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -127,16 +127,15 @@ grub_set_prefix_and_root (void) @@ -41,7 +41,7 @@ index 9cad0c4..8ab7794 100644 } diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 249e19b..759c475 100644 +index 249e19bc7..759c475c4 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -338,7 +338,30 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), @@ -77,5 +77,5 @@ index 249e19b..759c475 100644 prefix = grub_env_get ("prefix"); if (prefix) -- -2.9.3 +2.14.3 diff --git a/0020-Add-support-for-linuxefi.patch b/0036-Add-support-for-linuxefi.patch similarity index 97% rename from 0020-Add-support-for-linuxefi.patch rename to 0036-Add-support-for-linuxefi.patch index 19940a6..be23fed 100644 --- a/0020-Add-support-for-linuxefi.patch +++ b/0036-Add-support-for-linuxefi.patch @@ -1,7 +1,7 @@ From a64179016df64b72cc956fd6085ca3ed1a41baac Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 10 Jul 2012 11:58:52 -0400 -Subject: [PATCH 20/90] Add support for linuxefi +Subject: [PATCH 036/123] Add support for linuxefi --- grub-core/Makefile.core.def | 8 + @@ -13,13 +13,14 @@ Subject: [PATCH 20/90] Add support for linuxefi create mode 100644 grub-core/loader/i386/efi/linux.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index f8d4634..de8c9df 100644 +index f8d46342a..de8c9df66 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -1732,6 +1732,14 @@ module = { +@@ -1731,6 +1731,14 @@ module = { + enable = x86_64_efi; }; - module = { ++module = { + name = linuxefi; + efi = loader/i386/efi/linux.c; + efi = lib/cmdline.c; @@ -27,12 +28,11 @@ index f8d4634..de8c9df 100644 + enable = x86_64_efi; +}; + -+module = { + module = { name = chain; efi = loader/efi/chainloader.c; - i386_pc = loader/i386/pc/chainloader.c; diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c -index 20a47aa..efb15cc 100644 +index 20a47aaf5..efb15cc1b 100644 --- a/grub-core/kern/efi/mm.c +++ b/grub-core/kern/efi/mm.c @@ -49,6 +49,38 @@ static grub_efi_uintn_t finish_desc_size; @@ -76,7 +76,7 @@ index 20a47aa..efb15cc 100644 grub_efi_allocate_pages (grub_efi_physical_address_t address, diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c new file mode 100644 -index 0000000..b79e632 +index 000000000..b79e6320b --- /dev/null +++ b/grub-core/loader/i386/efi/linux.c @@ -0,0 +1,371 @@ @@ -452,7 +452,7 @@ index 0000000..b79e632 + grub_unregister_command (cmd_initrd); +} diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 0e6fd86..9a2da0e 100644 +index 0e6fd86b0..9a2da0eb3 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -40,6 +40,9 @@ void EXPORT_FUNC(grub_efi_stall) (grub_efi_uintn_t microseconds); @@ -466,7 +466,7 @@ index 0e6fd86..9a2da0e 100644 grub_efi_uintn_t pages); int diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h -index da0ca3b..fc36bda 100644 +index da0ca3b83..fc36bdaf3 100644 --- a/include/grub/i386/linux.h +++ b/include/grub/i386/linux.h @@ -139,6 +139,7 @@ struct linux_kernel_header @@ -478,5 +478,5 @@ index da0ca3b..fc36bda 100644 /* Boot parameters for Linux based on 2.6.12. This is used by the setup -- -2.9.3 +2.14.3 diff --git a/0021-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0037-Use-linuxefi-and-initrdefi-where-appropriate.patch similarity index 93% rename from 0021-Use-linuxefi-and-initrdefi-where-appropriate.patch rename to 0037-Use-linuxefi-and-initrdefi-where-appropriate.patch index 1af6eb2..7991b52 100644 --- a/0021-Use-linuxefi-and-initrdefi-where-appropriate.patch +++ b/0037-Use-linuxefi-and-initrdefi-where-appropriate.patch @@ -1,14 +1,14 @@ From 5894e3bfaf055554c786b4c1a9452d4e3bb9f568 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 16 Jul 2012 18:57:11 -0400 -Subject: [PATCH 21/90] Use "linuxefi" and "initrdefi" where appropriate. +Subject: [PATCH 037/123] Use "linuxefi" and "initrdefi" where appropriate. --- util/grub.d/10_linux.in | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index cf6331f..8ccf012 100644 +index cf6331f2a..8ccf012f7 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -129,17 +129,31 @@ linux_entry () @@ -46,5 +46,5 @@ index cf6331f..8ccf012 100644 sed "s/^/$submenu_indentation/" << EOF } -- -2.9.3 +2.14.3 diff --git a/0022-Don-t-allow-insmod-when-secure-boot-is-enabled.patch b/0038-Don-t-allow-insmod-when-secure-boot-is-enabled.patch similarity index 95% rename from 0022-Don-t-allow-insmod-when-secure-boot-is-enabled.patch rename to 0038-Don-t-allow-insmod-when-secure-boot-is-enabled.patch index 4ff26a8..4191e67 100644 --- a/0022-Don-t-allow-insmod-when-secure-boot-is-enabled.patch +++ b/0038-Don-t-allow-insmod-when-secure-boot-is-enabled.patch @@ -1,7 +1,7 @@ From 9d70f7f9a356d965ed48963e2ead12af8de97615 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 23 Oct 2012 10:40:49 -0400 -Subject: [PATCH 22/90] Don't allow insmod when secure boot is enabled. +Subject: [PATCH 038/123] Don't allow insmod when secure boot is enabled. Hi, @@ -23,7 +23,7 @@ moves the check into grub_dl_load_file. 3 files changed, 51 insertions(+) diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c -index e394cd9..6210709 100644 +index e394cd96f..621070918 100644 --- a/grub-core/kern/dl.c +++ b/grub-core/kern/dl.c @@ -32,12 +32,21 @@ @@ -69,7 +69,7 @@ index e394cd9..6210709 100644 file = grub_file_open (filename); diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 101307f..0859910 100644 +index 101307fc7..08599101a 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -269,6 +269,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -108,7 +108,7 @@ index 101307f..0859910 100644 /* Search the mods section from the PE32/PE32+ image. This code uses diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 9a2da0e..2245632 100644 +index 9a2da0eb3..22456327e 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -76,6 +76,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var, @@ -120,5 +120,5 @@ index 9a2da0e..2245632 100644 EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1, const grub_efi_device_path_t *dp2); -- -2.9.3 +2.14.3 diff --git a/0023-Pass-x-hex-hex-straight-through-unmolested.patch b/0039-Pass-x-hex-hex-straight-through-unmolested.patch similarity index 96% rename from 0023-Pass-x-hex-hex-straight-through-unmolested.patch rename to 0039-Pass-x-hex-hex-straight-through-unmolested.patch index ac6cd8b..6f9481f 100644 --- a/0023-Pass-x-hex-hex-straight-through-unmolested.patch +++ b/0039-Pass-x-hex-hex-straight-through-unmolested.patch @@ -1,7 +1,7 @@ From c2a19ee447623af8765254b87ff83cbb5b8253bc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 Oct 2012 13:24:37 -0400 -Subject: [PATCH 23/90] Pass "\x[[:hex:]][[:hex:]]" straight through +Subject: [PATCH 039/123] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested. --- @@ -11,7 +11,7 @@ Subject: [PATCH 23/90] Pass "\x[[:hex:]][[:hex:]]" straight through 3 files changed, 84 insertions(+), 9 deletions(-) diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c -index 9b4e727..02c46f9 100644 +index 9b4e72766..02c46f9fd 100644 --- a/grub-core/commands/wildcard.c +++ b/grub-core/commands/wildcard.c @@ -462,6 +462,12 @@ check_file (const char *dir, const char *basename) @@ -45,7 +45,7 @@ index 9b4e727..02c46f9 100644 *optr++ = iptr[1]; iptr += 2; diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c -index d5e10ee..0a5b2af 100644 +index d5e10ee87..0a5b2afb9 100644 --- a/grub-core/lib/cmdline.c +++ b/grub-core/lib/cmdline.c @@ -20,6 +20,12 @@ @@ -104,7 +104,7 @@ index d5e10ee..0a5b2af 100644 *buf++ = *c; diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c -index ab78ca8..cf6cd66 100644 +index ab78ca87f..cf6cd6601 100644 --- a/grub-core/script/execute.c +++ b/grub-core/script/execute.c @@ -55,6 +55,12 @@ static struct grub_script_scope *scope = 0; @@ -179,5 +179,5 @@ index ab78ca8..cf6cd66 100644 case '$': if (escaped) -- -2.9.3 +2.14.3 diff --git a/0024-Add-X-option-to-printf-functions.patch b/0040-Add-X-option-to-printf-functions.patch similarity index 93% rename from 0024-Add-X-option-to-printf-functions.patch rename to 0040-Add-X-option-to-printf-functions.patch index be1dc64..6e8b33d 100644 --- a/0024-Add-X-option-to-printf-functions.patch +++ b/0040-Add-X-option-to-printf-functions.patch @@ -1,14 +1,14 @@ From c482ec700b2ba4b1fabccaa5848cccae466d3a12 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 16:58:39 -0200 -Subject: [PATCH 24/90] Add %X option to printf functions. +Subject: [PATCH 040/123] Add %X option to printf functions. --- grub-core/kern/misc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 6bb0351..81be344 100644 +index 6bb035175..81be34424 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -587,7 +587,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r) @@ -54,5 +54,5 @@ index 6bb0351..81be344 100644 case 'd': { -- -2.9.3 +2.14.3 diff --git a/0025-Search-for-specific-config-file-for-netboot.patch b/0041-Search-for-specific-config-file-for-netboot.patch similarity index 97% rename from 0025-Search-for-specific-config-file-for-netboot.patch rename to 0041-Search-for-specific-config-file-for-netboot.patch index 0e6d042..5fc302c 100644 --- a/0025-Search-for-specific-config-file-for-netboot.patch +++ b/0041-Search-for-specific-config-file-for-netboot.patch @@ -1,7 +1,7 @@ From 70a8c5e075d59ec13fdee4c3868b3862a8cd8aa4 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:22:07 -0200 -Subject: [PATCH 25/90] Search for specific config file for netboot +Subject: [PATCH 041/123] Search for specific config file for netboot This patch implements a search for a specific configuration when the config file is on a remoteserver. It uses the following order: @@ -22,7 +22,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=873406 3 files changed, 135 insertions(+), 4 deletions(-) diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 10773fc..0769bf8 100644 +index 10773fc34..0769bf850 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -1735,6 +1735,124 @@ grub_net_restore_hw (void) @@ -151,7 +151,7 @@ index 10773fc..0769bf8 100644 static grub_command_t cmd_addaddr, cmd_deladdr, cmd_addroute, cmd_delroute; diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 759c475..b2654ef 100644 +index 759c475c4..b2654ef62 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -33,6 +33,7 @@ @@ -187,7 +187,7 @@ index 759c475..b2654ef 100644 grub_enter_normal_mode (config); grub_free (config); diff --git a/include/grub/net.h b/include/grub/net.h -index 96aa9fa..e13ae1e 100644 +index 96aa9fac0..e13ae1ef5 100644 --- a/include/grub/net.h +++ b/include/grub/net.h @@ -565,4 +565,7 @@ extern char *grub_net_default_server; @@ -199,5 +199,5 @@ index 96aa9fa..e13ae1e 100644 + #endif /* ! GRUB_NET_HEADER */ -- -2.9.3 +2.14.3 diff --git a/0026-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0042-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch similarity index 96% rename from 0026-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch rename to 0042-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch index af5efe3..0d219b5 100644 --- a/0026-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +++ b/0042-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch @@ -1,7 +1,7 @@ From 8992c2812e1e914e803429314b9164a19af4398b Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Tue, 22 Jan 2013 06:31:38 +0100 -Subject: [PATCH 26/90] blscfg: add blscfg module to parse Boot Loader +Subject: [PATCH 042/123] blscfg: add blscfg module to parse Boot Loader Specification snippets http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec @@ -21,13 +21,14 @@ Signed-off-by: Peter Jones create mode 100644 grub-core/commands/blscfg.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index de8c9df..e79bb0c 100644 +index de8c9df66..e79bb0cc5 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def -@@ -741,6 +741,14 @@ module = { +@@ -740,6 +740,14 @@ module = { + common = commands/blocklist.c; }; - module = { ++module = { + name = blscfg; + common = commands/blscfg.c; + enable = i386_efi; @@ -35,13 +36,12 @@ index de8c9df..e79bb0c 100644 + enable = i386_pc; +}; + -+module = { + module = { name = boot; common = commands/boot.c; - i386_pc = lib/i386/pc/biosnum.c; diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c new file mode 100644 -index 0000000..4274aca +index 000000000..4274aca5a --- /dev/null +++ b/grub-core/commands/blscfg.c @@ -0,0 +1,201 @@ @@ -247,5 +247,5 @@ index 0000000..4274aca + grub_unregister_extcmd (cmd); +} -- -2.9.3 +2.14.3 diff --git a/0027-Don-t-write-messages-to-the-screen.patch b/0043-Don-t-write-messages-to-the-screen.patch similarity index 95% rename from 0027-Don-t-write-messages-to-the-screen.patch rename to 0043-Don-t-write-messages-to-the-screen.patch index 3b889cd..4e78180 100644 --- a/0027-Don-t-write-messages-to-the-screen.patch +++ b/0043-Don-t-write-messages-to-the-screen.patch @@ -1,7 +1,7 @@ From 3e83ff704af9a967fa55d60cc3917bc4ccd85f32 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:30:20 -0400 -Subject: [PATCH 27/90] Don't write messages to the screen +Subject: [PATCH 043/123] Don't write messages to the screen Writing messages to the screen before the menus or boot splash happens so quickly it looks like something is wrong and isn't @@ -15,7 +15,7 @@ very appealing. 5 files changed, 5 insertions(+), 40 deletions(-) diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S -index 2bd0b2d..ea167fe 100644 +index 2bd0b2d28..ea167fe12 100644 --- a/grub-core/boot/i386/pc/boot.S +++ b/grub-core/boot/i386/pc/boot.S @@ -249,9 +249,6 @@ real_start: @@ -29,7 +29,7 @@ index 2bd0b2d..ea167fe 100644 movw $disk_address_packet, %si diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S -index 1ee4cf5..c8b87ed 100644 +index 1ee4cf5b2..c8b87ed29 100644 --- a/grub-core/boot/i386/pc/diskboot.S +++ b/grub-core/boot/i386/pc/diskboot.S @@ -50,11 +50,6 @@ _start: @@ -45,7 +45,7 @@ index 1ee4cf5..c8b87ed 100644 movw $LOCAL(firstlist), %di diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c -index 4880cef..b22e1bc 100644 +index 4880cefe3..b22e1bcc9 100644 --- a/grub-core/gettext/gettext.c +++ b/grub-core/gettext/gettext.c @@ -434,16 +434,12 @@ static char * @@ -127,7 +127,7 @@ index 4880cef..b22e1bc 100644 grub_register_variable_hook ("locale_dir", NULL, read_main); grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary); diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c -index 8ab7794..da47b18 100644 +index 8ab7794c4..da47b18b5 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -268,11 +268,6 @@ grub_main (void) @@ -143,7 +143,7 @@ index 8ab7794..da47b18 100644 grub_boot_time ("Before loading embedded modules."); diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 8ccf012..a3d9711 100644 +index 8ccf012f7..a3d9711d6 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -128,29 +128,22 @@ linux_entry () @@ -177,5 +177,5 @@ index 8ccf012..a3d9711 100644 EOF fi -- -2.9.3 +2.14.3 diff --git a/0028-Don-t-print-GNU-GRUB-header.patch b/0044-Don-t-print-GNU-GRUB-header.patch similarity index 92% rename from 0028-Don-t-print-GNU-GRUB-header.patch rename to 0044-Don-t-print-GNU-GRUB-header.patch index 7c9fbb7..c3fba80 100644 --- a/0028-Don-t-print-GNU-GRUB-header.patch +++ b/0044-Don-t-print-GNU-GRUB-header.patch @@ -1,7 +1,7 @@ From 9bd3d2fb49a6b8e3807ce7275876fd4b416545c9 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:53:48 -0400 -Subject: [PATCH 28/90] Don't print GNU GRUB header +Subject: [PATCH 044/123] Don't print GNU GRUB header No one cares. --- @@ -9,7 +9,7 @@ No one cares. 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index b2654ef..f57b750 100644 +index b2654ef62..f57b7508a 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -202,15 +202,16 @@ read_config_file (const char *config) @@ -41,5 +41,5 @@ index b2654ef..f57b750 100644 static void -- -2.9.3 +2.14.3 diff --git a/0029-Don-t-add-to-highlighted-row.patch b/0045-Don-t-add-to-highlighted-row.patch similarity index 88% rename from 0029-Don-t-add-to-highlighted-row.patch rename to 0045-Don-t-add-to-highlighted-row.patch index 96218b3..be22c98 100644 --- a/0029-Don-t-add-to-highlighted-row.patch +++ b/0045-Don-t-add-to-highlighted-row.patch @@ -1,7 +1,7 @@ From dd2c80ddd0e5e57b33a9d06894225e629b1b8b5e Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 17:49:45 -0400 -Subject: [PATCH 29/90] Don't add '*' to highlighted row +Subject: [PATCH 045/123] Don't add '*' to highlighted row It is already highlighted. --- @@ -9,7 +9,7 @@ It is already highlighted. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index e22bb91..a3d1f23 100644 +index e22bb91f6..a3d1f23f6 100644 --- a/grub-core/normal/menu_text.c +++ b/grub-core/normal/menu_text.c @@ -242,7 +242,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry, @@ -22,5 +22,5 @@ index e22bb91..a3d1f23 100644 grub_print_ucs4_menu (unicode_title, unicode_title + len, -- -2.9.3 +2.14.3 diff --git a/0030-Message-string-cleanups.patch b/0046-Message-string-cleanups.patch similarity index 97% rename from 0030-Message-string-cleanups.patch rename to 0046-Message-string-cleanups.patch index 51f80fd..c111347 100644 --- a/0030-Message-string-cleanups.patch +++ b/0046-Message-string-cleanups.patch @@ -1,7 +1,7 @@ From 4cc90ad7d495b896e0b6b2677285ced8ce70cee1 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 11:09:04 -0400 -Subject: [PATCH 30/90] Message string cleanups +Subject: [PATCH 046/123] Message string cleanups Make use of terminology consistent. Remove jargon. --- @@ -9,7 +9,7 @@ Make use of terminology consistent. Remove jargon. 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index a3d1f23..64a8386 100644 +index a3d1f23f6..64a83862f 100644 --- a/grub-core/normal/menu_text.c +++ b/grub-core/normal/menu_text.c @@ -157,9 +157,8 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run) @@ -67,5 +67,5 @@ index a3d1f23..64a8386 100644 { grub_print_error (); -- -2.9.3 +2.14.3 diff --git a/0031-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0047-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch similarity index 88% rename from 0031-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch rename to 0047-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch index 6a7ec27..babeed7 100644 --- a/0031-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch +++ b/0047-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch @@ -1,14 +1,14 @@ From ee01481e906071d01649b61925eaac0348f9a9a7 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:23 -0400 -Subject: [PATCH 31/90] Fix border spacing now that we aren't displaying it +Subject: [PATCH 047/123] Fix border spacing now that we aren't displaying it --- grub-core/normal/menu_text.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index 64a8386..1062d64 100644 +index 64a83862f..1062d64ee 100644 --- a/grub-core/normal/menu_text.c +++ b/grub-core/normal/menu_text.c @@ -331,12 +331,12 @@ grub_menu_init_page (int nested, int edit, @@ -28,5 +28,5 @@ index 64a8386..1062d64 100644 geo->timeout_lines = 2; -- -2.9.3 +2.14.3 diff --git a/0032-Use-the-correct-indentation-for-the-term-help-text.patch b/0048-Use-the-correct-indentation-for-the-term-help-text.patch similarity index 89% rename from 0032-Use-the-correct-indentation-for-the-term-help-text.patch rename to 0048-Use-the-correct-indentation-for-the-term-help-text.patch index 168471d..447f83d 100644 --- a/0032-Use-the-correct-indentation-for-the-term-help-text.patch +++ b/0048-Use-the-correct-indentation-for-the-term-help-text.patch @@ -1,7 +1,7 @@ From 748c629f47f4191c66011646e010cdf5ab506b90 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:49 -0400 -Subject: [PATCH 32/90] Use the correct indentation for the term help text +Subject: [PATCH 048/123] Use the correct indentation for the term help text That is consistent with the menu help text --- @@ -9,7 +9,7 @@ That is consistent with the menu help text 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index f57b750..0ce59fd 100644 +index f57b7508a..0ce59fdc3 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -426,8 +426,8 @@ grub_normal_reader_init (int nested) @@ -24,5 +24,5 @@ index f57b750..0ce59fd 100644 grub_print_message_indented (msg_formatted, 0, 0, term); grub_putcode ('\n', term); -- -2.9.3 +2.14.3 diff --git a/0033-Indent-menu-entries.patch b/0049-Indent-menu-entries.patch similarity index 89% rename from 0033-Indent-menu-entries.patch rename to 0049-Indent-menu-entries.patch index 8af01f6..e5a05b2 100644 --- a/0033-Indent-menu-entries.patch +++ b/0049-Indent-menu-entries.patch @@ -1,14 +1,14 @@ From 93092c8a33db0cb36392c9684a60c12fbc823554 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:30:55 -0400 -Subject: [PATCH 33/90] Indent menu entries +Subject: [PATCH 049/123] Indent menu entries --- grub-core/normal/menu_text.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index 1062d64..ecc60f9 100644 +index 1062d64ee..ecc60f99f 100644 --- a/grub-core/normal/menu_text.c +++ b/grub-core/normal/menu_text.c @@ -239,7 +239,8 @@ print_entry (int y, int highlight, grub_menu_entry_t entry, @@ -22,5 +22,5 @@ index 1062d64..ecc60f9 100644 grub_print_ucs4_menu (unicode_title, unicode_title + len, -- -2.9.3 +2.14.3 diff --git a/0034-Fix-margins.patch b/0050-Fix-margins.patch similarity index 93% rename from 0034-Fix-margins.patch rename to 0050-Fix-margins.patch index f9541af..0f00f93 100644 --- a/0034-Fix-margins.patch +++ b/0050-Fix-margins.patch @@ -1,14 +1,14 @@ From ee7064d8667cf51d12f2cc5ead9b428446c563ad Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:59:36 -0400 -Subject: [PATCH 34/90] Fix margins +Subject: [PATCH 050/123] Fix margins --- grub-core/normal/menu_text.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index ecc60f9..0e43f2c 100644 +index ecc60f99f..0e43f2c10 100644 --- a/grub-core/normal/menu_text.c +++ b/grub-core/normal/menu_text.c @@ -333,17 +333,15 @@ grub_menu_init_page (int nested, int edit, @@ -33,5 +33,5 @@ index ecc60f9..0e43f2c 100644 - geo->timeout_lines /* timeout */ - 1 /* empty final line */; -- -2.9.3 +2.14.3 diff --git a/0035-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0051-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch similarity index 86% rename from 0035-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch rename to 0051-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch index 1d9a608..7036a59 100644 --- a/0035-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch +++ b/0051-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch @@ -1,7 +1,7 @@ From 712f456d542ec913c4a5bc13f86443f79912cbf3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 21 Jun 2013 14:44:08 -0400 -Subject: [PATCH 35/90] Use -2 instead of -1 for our right-hand margin, so +Subject: [PATCH 051/123] Use -2 instead of -1 for our right-hand margin, so linewrapping works (#976643). Signed-off-by: Peter Jones @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index 0e43f2c..537d4bf 100644 +index 0e43f2c10..537d4bf86 100644 --- a/grub-core/normal/menu_text.c +++ b/grub-core/normal/menu_text.c @@ -334,7 +334,7 @@ grub_menu_init_page (int nested, int edit, @@ -23,5 +23,5 @@ index 0e43f2c..537d4bf 100644 geo->first_entry_y = 3; /* three empty lines*/ -- -2.9.3 +2.14.3 diff --git a/0036-Use-linux16-when-appropriate-880840.patch b/0052-Use-linux16-when-appropriate-880840.patch similarity index 92% rename from 0036-Use-linux16-when-appropriate-880840.patch rename to 0052-Use-linux16-when-appropriate-880840.patch index c895892..2e7a77f 100644 --- a/0036-Use-linux16-when-appropriate-880840.patch +++ b/0052-Use-linux16-when-appropriate-880840.patch @@ -1,7 +1,7 @@ From aedb9655a10717fe3678a9e2fc720b55f5b0ffbc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:05:07 -0400 -Subject: [PATCH 36/90] Use linux16 when appropriate (#880840) +Subject: [PATCH 052/123] Use linux16 when appropriate (#880840) The kernel group really would prefer that we use the 16 bit entry point on x86 bios machines. @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index a3d9711..f3bf6ac 100644 +index a3d9711d6..f3bf6acd8 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -76,6 +76,11 @@ linux_entry () @@ -48,5 +48,5 @@ index a3d9711..f3bf6ac 100644 fi fi -- -2.9.3 +2.14.3 diff --git a/0037-Enable-pager-by-default.-985860.patch b/0053-Enable-pager-by-default.-985860.patch similarity index 86% rename from 0037-Enable-pager-by-default.-985860.patch rename to 0053-Enable-pager-by-default.-985860.patch index 948b5ea..d67409c 100644 --- a/0037-Enable-pager-by-default.-985860.patch +++ b/0053-Enable-pager-by-default.-985860.patch @@ -1,7 +1,7 @@ From 0b72348759eaec7d1d488e9788e724a2d48ce3f7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:09:27 -0400 -Subject: [PATCH 37/90] Enable pager by default. (#985860) +Subject: [PATCH 053/123] Enable pager by default. (#985860) Signed-off-by: Peter Jones --- @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones 1 file changed, 2 insertions(+) diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 93a9023..858b526 100644 +index 93a90233e..858b526c9 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -43,6 +43,8 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_ @@ -22,5 +22,5 @@ index 93a9023..858b526 100644 load_env fi -- -2.9.3 +2.14.3 diff --git a/0038-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0054-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch similarity index 88% rename from 0038-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch rename to 0054-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch index a3b66dc..b3c72a9 100644 --- a/0038-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch +++ b/0054-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch @@ -1,7 +1,7 @@ From 55d0f5f5fdecfab6c8439520491e08a0178bd5dc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:13:27 -0400 -Subject: [PATCH 38/90] F10 doesn't work on serial, so don't tell the user to +Subject: [PATCH 054/123] F10 doesn't work on serial, so don't tell the user to hit it (#987443) Signed-off-by: Peter Jones @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index 537d4bf..452d55b 100644 +index 537d4bf86..452d55bf9 100644 --- a/grub-core/normal/menu_text.c +++ b/grub-core/normal/menu_text.c @@ -157,7 +157,7 @@ print_message (int nested, int edit, struct grub_term_output *term, int dry_run) @@ -23,5 +23,5 @@ index 537d4bf..452d55b 100644 STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run); -- -2.9.3 +2.14.3 diff --git a/0039-Don-t-say-GNU-Linux-in-generated-menus.patch b/0055-Don-t-say-GNU-Linux-in-generated-menus.patch similarity index 90% rename from 0039-Don-t-say-GNU-Linux-in-generated-menus.patch rename to 0055-Don-t-say-GNU-Linux-in-generated-menus.patch index 59486cc..988b753 100644 --- a/0039-Don-t-say-GNU-Linux-in-generated-menus.patch +++ b/0055-Don-t-say-GNU-Linux-in-generated-menus.patch @@ -1,7 +1,7 @@ From d110064c73c1604b07cdaa3d41751074b2701142 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 14 Mar 2011 14:27:42 -0400 -Subject: [PATCH 39/90] Don't say "GNU/Linux" in generated menus. +Subject: [PATCH 055/123] Don't say "GNU/Linux" in generated menus. --- util/grub.d/10_linux.in | 4 ++-- @@ -9,7 +9,7 @@ Subject: [PATCH 39/90] Don't say "GNU/Linux" in generated menus. 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index f3bf6ac..ef52cf3 100644 +index f3bf6acd8..ef52cf3db 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@" @@ -25,7 +25,7 @@ index f3bf6ac..ef52cf3 100644 fi diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in -index c48af94..25e3c41 100644 +index c48af948d..25e3c4136 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@" @@ -41,5 +41,5 @@ index c48af94..25e3c41 100644 fi -- -2.9.3 +2.14.3 diff --git a/0040-Don-t-draw-a-border-around-the-menu.patch b/0056-Don-t-draw-a-border-around-the-menu.patch similarity index 96% rename from 0040-Don-t-draw-a-border-around-the-menu.patch rename to 0056-Don-t-draw-a-border-around-the-menu.patch index 4ae7d29..6f85d60 100644 --- a/0040-Don-t-draw-a-border-around-the-menu.patch +++ b/0056-Don-t-draw-a-border-around-the-menu.patch @@ -1,7 +1,7 @@ From fbd9d8969c059d6e5572b1acfa42ba48bc4299e2 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 16:47:33 -0400 -Subject: [PATCH 40/90] Don't draw a border around the menu +Subject: [PATCH 056/123] Don't draw a border around the menu It looks cleaner without it. --- @@ -9,7 +9,7 @@ It looks cleaner without it. 1 file changed, 43 deletions(-) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index 452d55b..1ed2bd9 100644 +index 452d55bf9..1ed2bd92c 100644 --- a/grub-core/normal/menu_text.c +++ b/grub-core/normal/menu_text.c @@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right, @@ -70,5 +70,5 @@ index 452d55b..1ed2bd9 100644 grub_term_highlight_color = old_color_highlight; geo->timeout_y = geo->first_entry_y + geo->num_entries -- -2.9.3 +2.14.3 diff --git a/0041-Use-the-standard-margin-for-the-timeout-string.patch b/0057-Use-the-standard-margin-for-the-timeout-string.patch similarity index 92% rename from 0041-Use-the-standard-margin-for-the-timeout-string.patch rename to 0057-Use-the-standard-margin-for-the-timeout-string.patch index e79707a..bde17b5 100644 --- a/0041-Use-the-standard-margin-for-the-timeout-string.patch +++ b/0057-Use-the-standard-margin-for-the-timeout-string.patch @@ -1,7 +1,7 @@ From 3aeba4760755b9b263ed4ba60dc0431352b63fe7 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 10:52:32 -0400 -Subject: [PATCH 41/90] Use the standard margin for the timeout string +Subject: [PATCH 057/123] Use the standard margin for the timeout string So that it aligns with the other messages --- @@ -9,7 +9,7 @@ So that it aligns with the other messages 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c -index 1ed2bd9..7681f7d 100644 +index 1ed2bd92c..7681f7d28 100644 --- a/grub-core/normal/menu_text.c +++ b/grub-core/normal/menu_text.c @@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit, @@ -39,5 +39,5 @@ index 1ed2bd9..7681f7d 100644 } -- -2.9.3 +2.14.3 diff --git a/0042-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0058-Add-.eh_frame-to-list-of-relocations-stripped.patch similarity index 90% rename from 0042-Add-.eh_frame-to-list-of-relocations-stripped.patch rename to 0058-Add-.eh_frame-to-list-of-relocations-stripped.patch index 6946f20..54f06ac 100644 --- a/0042-Add-.eh_frame-to-list-of-relocations-stripped.patch +++ b/0058-Add-.eh_frame-to-list-of-relocations-stripped.patch @@ -1,14 +1,14 @@ From 333159a74035a726841c6c888f43d983a40ed959 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 13 Jan 2014 21:50:59 -0500 -Subject: [PATCH 42/90] Add .eh_frame to list of relocations stripped +Subject: [PATCH 058/123] Add .eh_frame to list of relocations stripped --- conf/Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/Makefile.common b/conf/Makefile.common -index 11296b5..a476ab5 100644 +index 11296b550..a476ab580 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common @@ -38,7 +38,7 @@ CFLAGS_KERNEL = $(CFLAGS_PLATFORM) -ffreestanding @@ -21,5 +21,5 @@ index 11296b5..a476ab5 100644 CFLAGS_MODULE = $(CFLAGS_PLATFORM) -ffreestanding LDFLAGS_MODULE = $(LDFLAGS_PLATFORM) -nostdlib $(TARGET_LDFLAGS_OLDMAGIC) -Wl,-r,-d -- -2.9.3 +2.14.3 diff --git a/0043-Make-10_linux-work-with-our-changes-for-linux16-and-.patch b/0059-Make-10_linux-work-with-our-changes-for-linux16-and-.patch similarity index 94% rename from 0043-Make-10_linux-work-with-our-changes-for-linux16-and-.patch rename to 0059-Make-10_linux-work-with-our-changes-for-linux16-and-.patch index e00cec7..eb9c04d 100644 --- a/0043-Make-10_linux-work-with-our-changes-for-linux16-and-.patch +++ b/0059-Make-10_linux-work-with-our-changes-for-linux16-and-.patch @@ -1,7 +1,7 @@ From 5fa65416bae89efb88015e72cb21c28fe3833fc8 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 13:12:23 -0500 -Subject: [PATCH 43/90] Make 10_linux work with our changes for linux16 and +Subject: [PATCH 059/123] Make 10_linux work with our changes for linux16 and linuxefi on aarch64 Signed-off-by: Peter Jones @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index ef52cf3..191aebe 100644 +index ef52cf3db..191aebe80 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -77,8 +77,18 @@ linux_entry () @@ -81,5 +81,5 @@ index ef52cf3..191aebe 100644 for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do if test -e "${i}" ; then -- -2.9.3 +2.14.3 diff --git a/0044-Don-t-print-during-fdt-loading-method.patch b/0060-Don-t-print-during-fdt-loading-method.patch similarity index 85% rename from 0044-Don-t-print-during-fdt-loading-method.patch rename to 0060-Don-t-print-during-fdt-loading-method.patch index 273cba8..80c8b00 100644 --- a/0044-Don-t-print-during-fdt-loading-method.patch +++ b/0060-Don-t-print-during-fdt-loading-method.patch @@ -1,7 +1,7 @@ From e89fd78bb3f62064d930c82ad14cd490166d1a2c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 16:15:46 -0500 -Subject: [PATCH 44/90] Don't print during fdt loading method. +Subject: [PATCH 060/123] Don't print during fdt loading method. Signed-off-by: Peter Jones --- @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones 1 file changed, 2 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 191aebe..452a9f6 100644 +index 191aebe80..452a9f69d 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -164,9 +164,7 @@ EOF @@ -23,5 +23,5 @@ index 191aebe..452a9f6 100644 EOF fi -- -2.9.3 +2.14.3 diff --git a/0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch b/0061-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch similarity index 87% rename from 0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch rename to 0061-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch index a8807eb..686dcc7 100644 --- a/0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch +++ b/0061-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch @@ -1,7 +1,7 @@ From 7683e149c587abf2d35de11c39ddb0810572b2e4 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 30 Jun 2014 14:16:46 -0400 -Subject: [PATCH 45/90] Don't munge raw spaces when we're doing our cmdline +Subject: [PATCH 061/123] Don't munge raw spaces when we're doing our cmdline escaping (#923374) Signed-off-by: Peter Jones @@ -10,7 +10,7 @@ Signed-off-by: Peter Jones 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c -index 0a5b2af..970ea86 100644 +index 0a5b2afb9..970ea868c 100644 --- a/grub-core/lib/cmdline.c +++ b/grub-core/lib/cmdline.c @@ -97,16 +97,7 @@ int grub_create_loader_cmdline (int argc, char *argv[], char *buf, @@ -32,5 +32,5 @@ index 0a5b2af..970ea86 100644 { *buf++ = *c++; -- -2.9.3 +2.14.3 diff --git a/0046-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0062-Don-t-require-a-password-to-boot-entries-generated-b.patch similarity index 87% rename from 0046-Don-t-require-a-password-to-boot-entries-generated-b.patch rename to 0062-Don-t-require-a-password-to-boot-entries-generated-b.patch index b144fbf..c8fc36b 100644 --- a/0046-Don-t-require-a-password-to-boot-entries-generated-b.patch +++ b/0062-Don-t-require-a-password-to-boot-entries-generated-b.patch @@ -1,7 +1,7 @@ From 8a11a21d904e7e823ee6f17faedbf45a8e28044a Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 11 Feb 2014 11:14:50 -0500 -Subject: [PATCH 46/90] Don't require a password to boot entries generated by +Subject: [PATCH 062/123] Don't require a password to boot entries generated by grub-mkconfig. When we set a password, we just want that to mean you can't /edit/ an entry. @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 452a9f6..79a747e 100644 +index 452a9f69d..79a747ebd 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -26,7 +26,7 @@ datarootdir="@datarootdir@" @@ -27,5 +27,5 @@ index 452a9f6..79a747e 100644 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS="$(sed 's, release .*$,,g' /etc/system-release)" -- -2.9.3 +2.14.3 diff --git a/0047-Don-t-emit-Booting-.-message.patch b/0063-Don-t-emit-Booting-.-message.patch similarity index 91% rename from 0047-Don-t-emit-Booting-.-message.patch rename to 0063-Don-t-emit-Booting-.-message.patch index d8cbae1..5643f86 100644 --- a/0047-Don-t-emit-Booting-.-message.patch +++ b/0063-Don-t-emit-Booting-.-message.patch @@ -1,7 +1,7 @@ From 5468ac6eef409220e59741ccf1073d92916cdddf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 09:37:49 -0500 -Subject: [PATCH 47/90] Don't emit "Booting ..." message. +Subject: [PATCH 063/123] Don't emit "Booting ..." message. UI team still hates this stuff, so we're disabling it for RHEL 7. @@ -14,7 +14,7 @@ Signed-off-by: Peter Jones 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c -index 2e8a7bd..004711d 100644 +index 2e8a7bd89..004711dce 100644 --- a/grub-core/normal/menu.c +++ b/grub-core/normal/menu.c @@ -838,12 +838,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot) @@ -34,7 +34,7 @@ index 2e8a7bd..004711d 100644 /* Callback invoked when a default menu entry executed because of a timeout diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c -index eeeee55..8349049 100644 +index eeeee5580..83490494e 100644 --- a/grub-core/normal/menu_entry.c +++ b/grub-core/normal/menu_entry.c @@ -1167,9 +1167,6 @@ run (struct screen *screen) @@ -48,5 +48,5 @@ index eeeee55..8349049 100644 errs_before = grub_err_printed_errors; -- -2.9.3 +2.14.3 diff --git a/0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch b/0064-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch similarity index 96% rename from 0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch rename to 0064-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch index b4972d3..546f1ac 100644 --- a/0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch +++ b/0064-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch @@ -1,7 +1,7 @@ From cce065ff19272aa908a293632a265211201d7237 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 4 Mar 2014 11:00:23 -0500 -Subject: [PATCH 48/90] Replace a lot of man pages with slightly nicer ones. +Subject: [PATCH 064/123] Replace a lot of man pages with slightly nicer ones. Replace a bunch of machine generated ones with ones that look nicer. --- @@ -122,7 +122,7 @@ Replace a bunch of machine generated ones with ones that look nicer. create mode 100644 util/grub-sparc64-setup.8 diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist -index b16bd92..39eb94b 100644 +index b16bd9253..39eb94bde 100644 --- a/conf/Makefile.extra-dist +++ b/conf/Makefile.extra-dist @@ -11,7 +11,6 @@ EXTRA_DIST += unicode @@ -134,7 +134,7 @@ index b16bd92..39eb94b 100644 EXTRA_DIST += docs/grub.cfg EXTRA_DIST += docs/osdetect.cfg diff --git a/configure.ac b/configure.ac -index ab9134c..9937a82 100644 +index ab9134c86..9937a827f 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,29 @@ grub_TRANSFORM([grub-set-default]) @@ -168,7 +168,7 @@ index ab9134c..9937a82 100644 # Optimization flag. Allow user to override. if test "x$TARGET_CFLAGS" = x; then diff --git a/docs/Makefile.am b/docs/Makefile.am -index 93eb396..ab28f19 100644 +index 93eb39627..ab28f1996 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -5,5 +5,3 @@ info_TEXINFOS = grub.texi grub-dev.texi @@ -179,7 +179,7 @@ index 93eb396..ab28f19 100644 - diff --git a/docs/man/grub-bios-setup.h2m b/docs/man/grub-bios-setup.h2m deleted file mode 100644 -index ac6ede3..0000000 +index ac6ede362..000000000 --- a/docs/man/grub-bios-setup.h2m +++ /dev/null @@ -1,6 +0,0 @@ @@ -191,7 +191,7 @@ index ac6ede3..0000000 -.BR grub-mkrescue (1) diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m deleted file mode 100644 -index 3859d3d..0000000 +index 3859d3d4c..000000000 --- a/docs/man/grub-editenv.h2m +++ /dev/null @@ -1,5 +0,0 @@ @@ -202,7 +202,7 @@ index 3859d3d..0000000 -.BR grub-set-default (8) diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m deleted file mode 100644 -index ef1c000..0000000 +index ef1c00065..000000000 --- a/docs/man/grub-emu.h2m +++ /dev/null @@ -1,6 +0,0 @@ @@ -214,7 +214,7 @@ index ef1c000..0000000 -rather than this program. diff --git a/docs/man/grub-file.h2m b/docs/man/grub-file.h2m deleted file mode 100644 -index e09bb4d..0000000 +index e09bb4d31..000000000 --- a/docs/man/grub-file.h2m +++ /dev/null @@ -1,2 +0,0 @@ @@ -222,7 +222,7 @@ index e09bb4d..0000000 -grub-file \- check file type diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m deleted file mode 100644 -index 9676b15..0000000 +index 9676b159a..000000000 --- a/docs/man/grub-fstest.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -232,7 +232,7 @@ index 9676b15..0000000 -.BR grub-probe (8) diff --git a/docs/man/grub-glue-efi.h2m b/docs/man/grub-glue-efi.h2m deleted file mode 100644 -index c1c6ded..0000000 +index c1c6ded49..000000000 --- a/docs/man/grub-glue-efi.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -242,7 +242,7 @@ index c1c6ded..0000000 -grub-glue-efi processes ia32 and amd64 EFI images and glues them according to Apple format. diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m deleted file mode 100644 -index 8cbbc87..0000000 +index 8cbbc87a0..000000000 --- a/docs/man/grub-install.h2m +++ /dev/null @@ -1,6 +0,0 @@ @@ -254,7 +254,7 @@ index 8cbbc87..0000000 -.BR grub-mkrescue (1) diff --git a/docs/man/grub-kbdcomp.h2m b/docs/man/grub-kbdcomp.h2m deleted file mode 100644 -index d81f915..0000000 +index d81f9157e..000000000 --- a/docs/man/grub-kbdcomp.h2m +++ /dev/null @@ -1,10 +0,0 @@ @@ -270,7 +270,7 @@ index d81f915..0000000 -.BR grub-mklayout (8) diff --git a/docs/man/grub-macbless.h2m b/docs/man/grub-macbless.h2m deleted file mode 100644 -index 0197c00..0000000 +index 0197c0087..000000000 --- a/docs/man/grub-macbless.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -280,7 +280,7 @@ index 0197c00..0000000 -.BR grub-install (1) diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m deleted file mode 100644 -index d79aaee..0000000 +index d79aaeed8..000000000 --- a/docs/man/grub-macho2img.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -290,7 +290,7 @@ index d79aaee..0000000 -.BR grub-mkimage (1) diff --git a/docs/man/grub-menulst2cfg.h2m b/docs/man/grub-menulst2cfg.h2m deleted file mode 100644 -index c2e0055..0000000 +index c2e0055ed..000000000 --- a/docs/man/grub-menulst2cfg.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -300,7 +300,7 @@ index c2e0055..0000000 -.BR grub-mkconfig (8) diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m deleted file mode 100644 -index 9b42f81..0000000 +index 9b42f8130..000000000 --- a/docs/man/grub-mkconfig.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -310,7 +310,7 @@ index 9b42f81..0000000 -.BR grub-install (8) diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m deleted file mode 100644 -index d46fe60..0000000 +index d46fe600e..000000000 --- a/docs/man/grub-mkfont.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -320,7 +320,7 @@ index d46fe60..0000000 -.BR grub-mkconfig (8) diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m deleted file mode 100644 -index f0fbc2b..0000000 +index f0fbc2bb1..000000000 --- a/docs/man/grub-mkimage.h2m +++ /dev/null @@ -1,6 +0,0 @@ @@ -332,7 +332,7 @@ index f0fbc2b..0000000 -.BR grub-mknetdir (8) diff --git a/docs/man/grub-mklayout.h2m b/docs/man/grub-mklayout.h2m deleted file mode 100644 -index 1e43409..0000000 +index 1e43409c0..000000000 --- a/docs/man/grub-mklayout.h2m +++ /dev/null @@ -1,10 +0,0 @@ @@ -348,7 +348,7 @@ index 1e43409..0000000 -.BR grub-mkconfig (8) diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m deleted file mode 100644 -index a2ef13e..0000000 +index a2ef13ec1..000000000 --- a/docs/man/grub-mknetdir.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -358,7 +358,7 @@ index a2ef13e..0000000 -.BR grub-mkimage (1) diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m deleted file mode 100644 -index 4d202f3..0000000 +index 4d202f3da..000000000 --- a/docs/man/grub-mkpasswd-pbkdf2.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -368,7 +368,7 @@ index 4d202f3..0000000 -.BR grub-mkconfig (8) diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m deleted file mode 100644 -index d01f396..0000000 +index d01f3961e..000000000 --- a/docs/man/grub-mkrelpath.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -378,7 +378,7 @@ index d01f396..0000000 -.BR grub-probe (8) diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m deleted file mode 100644 -index a427f02..0000000 +index a427f02e3..000000000 --- a/docs/man/grub-mkrescue.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -388,7 +388,7 @@ index a427f02..0000000 -.BR grub-mkimage (1) diff --git a/docs/man/grub-mkstandalone.h2m b/docs/man/grub-mkstandalone.h2m deleted file mode 100644 -index c773139..0000000 +index c77313978..000000000 --- a/docs/man/grub-mkstandalone.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -398,7 +398,7 @@ index c773139..0000000 -.BR grub-mkimage (1) diff --git a/docs/man/grub-mount.h2m b/docs/man/grub-mount.h2m deleted file mode 100644 -index 8d16898..0000000 +index 8d168982d..000000000 --- a/docs/man/grub-mount.h2m +++ /dev/null @@ -1,2 +0,0 @@ @@ -406,7 +406,7 @@ index 8d16898..0000000 -grub-mount \- export GRUB filesystem with FUSE diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m deleted file mode 100644 -index 74b43ee..0000000 +index 74b43eea0..000000000 --- a/docs/man/grub-ofpathname.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -416,7 +416,7 @@ index 74b43ee..0000000 -.BR grub-probe (8) diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m deleted file mode 100644 -index 7ca29bd..0000000 +index 7ca29bd70..000000000 --- a/docs/man/grub-pe2elf.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -426,7 +426,7 @@ index 7ca29bd..0000000 -.BR grub-mkimage (1) diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m deleted file mode 100644 -index 6e1ffdc..0000000 +index 6e1ffdcf9..000000000 --- a/docs/man/grub-probe.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -436,7 +436,7 @@ index 6e1ffdc..0000000 -.BR grub-fstest (1) diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m deleted file mode 100644 -index e4acace..0000000 +index e4acace65..000000000 --- a/docs/man/grub-reboot.h2m +++ /dev/null @@ -1,5 +0,0 @@ @@ -447,7 +447,7 @@ index e4acace..0000000 -.BR grub-editenv (1) diff --git a/docs/man/grub-render-label.h2m b/docs/man/grub-render-label.h2m deleted file mode 100644 -index 50ae524..0000000 +index 50ae5247c..000000000 --- a/docs/man/grub-render-label.h2m +++ /dev/null @@ -1,3 +0,0 @@ @@ -456,7 +456,7 @@ index 50ae524..0000000 - diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m deleted file mode 100644 -index 3653682..0000000 +index 365368267..000000000 --- a/docs/man/grub-script-check.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -466,7 +466,7 @@ index 3653682..0000000 -.BR grub-mkconfig (8) diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m deleted file mode 100644 -index 7945001..0000000 +index 7945001c1..000000000 --- a/docs/man/grub-set-default.h2m +++ /dev/null @@ -1,5 +0,0 @@ @@ -477,7 +477,7 @@ index 7945001..0000000 -.BR grub-editenv (1) diff --git a/docs/man/grub-sparc64-setup.h2m b/docs/man/grub-sparc64-setup.h2m deleted file mode 100644 -index 18f803a..0000000 +index 18f803a50..000000000 --- a/docs/man/grub-sparc64-setup.h2m +++ /dev/null @@ -1,6 +0,0 @@ @@ -489,7 +489,7 @@ index 18f803a..0000000 -.BR grub-mkrescue (1) diff --git a/docs/man/grub-syslinux2cfg.h2m b/docs/man/grub-syslinux2cfg.h2m deleted file mode 100644 -index ad25c8a..0000000 +index ad25c8ab7..000000000 --- a/docs/man/grub-syslinux2cfg.h2m +++ /dev/null @@ -1,4 +0,0 @@ @@ -498,7 +498,7 @@ index ad25c8a..0000000 -[SEE ALSO] -.BR grub-menulst2cfg (8) diff --git a/gentpl.py b/gentpl.py -index f08bcc4..f069585 100644 +index f08bcc404..f069585e8 100644 --- a/gentpl.py +++ b/gentpl.py @@ -800,10 +800,7 @@ def manpage(defn, adddeps): @@ -515,7 +515,7 @@ index f08bcc4..f069585 100644 diff --git a/util/grub-bios-setup.8 b/util/grub-bios-setup.8 new file mode 100644 -index 0000000..56f582b +index 000000000..56f582b3d --- /dev/null +++ b/util/grub-bios-setup.8 @@ -0,0 +1,54 @@ @@ -575,7 +575,7 @@ index 0000000..56f582b +.BR "info grub" diff --git a/util/grub-editenv.1 b/util/grub-editenv.1 new file mode 100644 -index 0000000..d28ba03 +index 000000000..d28ba03ba --- /dev/null +++ b/util/grub-editenv.1 @@ -0,0 +1,46 @@ @@ -627,7 +627,7 @@ index 0000000..d28ba03 +.BR "info grub" diff --git a/util/grub-file.1 b/util/grub-file.1 new file mode 100644 -index 0000000..b29cb32 +index 000000000..b29cb3278 --- /dev/null +++ b/util/grub-file.1 @@ -0,0 +1,165 @@ @@ -798,7 +798,7 @@ index 0000000..b29cb32 +.BR "info grub" diff --git a/util/grub-fstest.1 b/util/grub-fstest.1 new file mode 100644 -index 0000000..792fa78 +index 000000000..792fa7863 --- /dev/null +++ b/util/grub-fstest.1 @@ -0,0 +1,99 @@ @@ -903,7 +903,7 @@ index 0000000..792fa78 +.BR "info grub" diff --git a/util/grub-glue-efi.1 b/util/grub-glue-efi.1 new file mode 100644 -index 0000000..72bd555 +index 000000000..72bd555d5 --- /dev/null +++ b/util/grub-glue-efi.1 @@ -0,0 +1,31 @@ @@ -940,7 +940,7 @@ index 0000000..72bd555 +.BR "info grub" diff --git a/util/grub-install.8 b/util/grub-install.8 new file mode 100644 -index 0000000..76272a3 +index 000000000..76272a39d --- /dev/null +++ b/util/grub-install.8 @@ -0,0 +1,129 @@ @@ -1075,7 +1075,7 @@ index 0000000..76272a3 +.BR "info grub" diff --git a/util/grub-kbdcomp.1 b/util/grub-kbdcomp.1 new file mode 100644 -index 0000000..0bb969a +index 000000000..0bb969a5b --- /dev/null +++ b/util/grub-kbdcomp.1 @@ -0,0 +1,19 @@ @@ -1100,7 +1100,7 @@ index 0000000..0bb969a +.BR "info grub" diff --git a/util/grub-macbless.1 b/util/grub-macbless.1 new file mode 100644 -index 0000000..41a9618 +index 000000000..41a96186f --- /dev/null +++ b/util/grub-macbless.1 @@ -0,0 +1,22 @@ @@ -1128,7 +1128,7 @@ index 0000000..41a9618 +.BR "info grub" diff --git a/util/grub-menulst2cfg.1 b/util/grub-menulst2cfg.1 new file mode 100644 -index 0000000..91e2ef8 +index 000000000..91e2ef871 --- /dev/null +++ b/util/grub-menulst2cfg.1 @@ -0,0 +1,12 @@ @@ -1146,7 +1146,7 @@ index 0000000..91e2ef8 +.BR "info grub" diff --git a/util/grub-mkconfig.8 b/util/grub-mkconfig.8 new file mode 100644 -index 0000000..a2d1f57 +index 000000000..a2d1f577b --- /dev/null +++ b/util/grub-mkconfig.8 @@ -0,0 +1,17 @@ @@ -1169,7 +1169,7 @@ index 0000000..a2d1f57 +.BR "info grub" diff --git a/util/grub-mkfont.1 b/util/grub-mkfont.1 new file mode 100644 -index 0000000..3494857 +index 000000000..349485798 --- /dev/null +++ b/util/grub-mkfont.1 @@ -0,0 +1,87 @@ @@ -1262,7 +1262,7 @@ index 0000000..3494857 +.BR "info grub" diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1 new file mode 100644 -index 0000000..4dea4f5 +index 000000000..4dea4f545 --- /dev/null +++ b/util/grub-mkimage.1 @@ -0,0 +1,95 @@ @@ -1363,7 +1363,7 @@ index 0000000..4dea4f5 +.BR "info grub" diff --git a/util/grub-mklayout.1 b/util/grub-mklayout.1 new file mode 100644 -index 0000000..d1bbc2e +index 000000000..d1bbc2ec5 --- /dev/null +++ b/util/grub-mklayout.1 @@ -0,0 +1,27 @@ @@ -1396,7 +1396,7 @@ index 0000000..d1bbc2e +.BR "info grub" diff --git a/util/grub-mknetdir.1 b/util/grub-mknetdir.1 new file mode 100644 -index 0000000..fa7e8d4 +index 000000000..fa7e8d4ef --- /dev/null +++ b/util/grub-mknetdir.1 @@ -0,0 +1,12 @@ @@ -1414,7 +1414,7 @@ index 0000000..fa7e8d4 +.BR "info grub" diff --git a/util/grub-mkpasswd-pbkdf2.1 b/util/grub-mkpasswd-pbkdf2.1 new file mode 100644 -index 0000000..73c437c +index 000000000..73c437c15 --- /dev/null +++ b/util/grub-mkpasswd-pbkdf2.1 @@ -0,0 +1,27 @@ @@ -1447,7 +1447,7 @@ index 0000000..73c437c +.BR "info grub" diff --git a/util/grub-mkrelpath.1 b/util/grub-mkrelpath.1 new file mode 100644 -index 0000000..85f1113 +index 000000000..85f111362 --- /dev/null +++ b/util/grub-mkrelpath.1 @@ -0,0 +1,12 @@ @@ -1465,7 +1465,7 @@ index 0000000..85f1113 +.BR "info grub" diff --git a/util/grub-mkrescue.1 b/util/grub-mkrescue.1 new file mode 100644 -index 0000000..4ed9fc7 +index 000000000..4ed9fc723 --- /dev/null +++ b/util/grub-mkrescue.1 @@ -0,0 +1,123 @@ @@ -1594,7 +1594,7 @@ index 0000000..4ed9fc7 +.BR "info grub" diff --git a/util/grub-mkstandalone.1 b/util/grub-mkstandalone.1 new file mode 100644 -index 0000000..ba2d2bd +index 000000000..ba2d2bdf2 --- /dev/null +++ b/util/grub-mkstandalone.1 @@ -0,0 +1,100 @@ @@ -1700,7 +1700,7 @@ index 0000000..ba2d2bd +.BR "info grub" diff --git a/util/grub-ofpathname.8 b/util/grub-ofpathname.8 new file mode 100644 -index 0000000..bf3743a +index 000000000..bf3743aeb --- /dev/null +++ b/util/grub-ofpathname.8 @@ -0,0 +1,12 @@ @@ -1718,7 +1718,7 @@ index 0000000..bf3743a +.BR "info grub" diff --git a/util/grub-probe.8 b/util/grub-probe.8 new file mode 100644 -index 0000000..04e26c8 +index 000000000..04e26c832 --- /dev/null +++ b/util/grub-probe.8 @@ -0,0 +1,80 @@ @@ -1804,7 +1804,7 @@ index 0000000..04e26c8 +.BR "info grub" diff --git a/util/grub-reboot.8 b/util/grub-reboot.8 new file mode 100644 -index 0000000..faa5e4e +index 000000000..faa5e4eec --- /dev/null +++ b/util/grub-reboot.8 @@ -0,0 +1,21 @@ @@ -1831,7 +1831,7 @@ index 0000000..faa5e4e +.BR "info grub" diff --git a/util/grub-render-label.1 b/util/grub-render-label.1 new file mode 100644 -index 0000000..4d51c8a +index 000000000..4d51c8abf --- /dev/null +++ b/util/grub-render-label.1 @@ -0,0 +1,51 @@ @@ -1888,7 +1888,7 @@ index 0000000..4d51c8a +.BR "info grub" diff --git a/util/grub-script-check.1 b/util/grub-script-check.1 new file mode 100644 -index 0000000..0f1f625 +index 000000000..0f1f625b0 --- /dev/null +++ b/util/grub-script-check.1 @@ -0,0 +1,21 @@ @@ -1915,7 +1915,7 @@ index 0000000..0f1f625 +.BR "info grub" diff --git a/util/grub-set-default.8 b/util/grub-set-default.8 new file mode 100644 -index 0000000..a96265a +index 000000000..a96265a15 --- /dev/null +++ b/util/grub-set-default.8 @@ -0,0 +1,21 @@ @@ -1942,7 +1942,7 @@ index 0000000..a96265a +.BR "info grub" diff --git a/util/grub-sparc64-setup.8 b/util/grub-sparc64-setup.8 new file mode 100644 -index 0000000..37ea2dd +index 000000000..37ea2dd5e --- /dev/null +++ b/util/grub-sparc64-setup.8 @@ -0,0 +1,12 @@ @@ -1959,5 +1959,5 @@ index 0000000..37ea2dd +.SH SEE ALSO +.BR "info grub" -- -2.9.3 +2.14.3 diff --git a/0049-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0065-use-fw_path-prefix-when-fallback-searching-for-grub-.patch similarity index 92% rename from 0049-use-fw_path-prefix-when-fallback-searching-for-grub-.patch rename to 0065-use-fw_path-prefix-when-fallback-searching-for-grub-.patch index 626253f..d1eb77f 100644 --- a/0049-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +++ b/0065-use-fw_path-prefix-when-fallback-searching-for-grub-.patch @@ -1,7 +1,7 @@ From c28ddef07d11d790d89ee6ec8e3a8cc7e1aace0d Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 19 Feb 2014 15:58:43 -0500 -Subject: [PATCH 49/90] use fw_path prefix when fallback searching for grub +Subject: [PATCH 065/123] use fw_path prefix when fallback searching for grub config When PXE booting via UEFI firmware, grub was searching for grub.cfg @@ -18,7 +18,7 @@ Signed-off-by: Mark Salter 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 0ce59fd..a3713ef 100644 +index 0ce59fdc3..a3713efcd 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -343,7 +343,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), @@ -41,5 +41,5 @@ index 0ce59fd..a3713ef 100644 { grub_size_t config_len; -- -2.9.3 +2.14.3 diff --git a/0050-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0066-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch similarity index 96% rename from 0050-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch rename to 0066-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch index 4dabe63..1bc2859 100644 --- a/0050-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +++ b/0066-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch @@ -1,7 +1,8 @@ From 82812e4ade82c9aa4f2e8f091b60b714ecfd82e5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 6 Mar 2014 11:51:33 -0500 -Subject: [PATCH 50/90] Try mac/guid/etc before grub.cfg on tftp config files. +Subject: [PATCH 066/123] Try mac/guid/etc before grub.cfg on tftp config + files. Signed-off-by: Peter Jones --- @@ -9,7 +10,7 @@ Signed-off-by: Peter Jones 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index a3713ef..7d9c4f0 100644 +index a3713efcd..7d9c4f09b 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -341,53 +341,59 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)), @@ -110,5 +111,5 @@ index a3713ef..7d9c4f0 100644 else grub_enter_normal_mode (argv[0]); -- -2.9.3 +2.14.3 diff --git a/0051-Fix-convert-function-to-support-NVMe-devices.patch b/0067-Fix-convert-function-to-support-NVMe-devices.patch similarity index 92% rename from 0051-Fix-convert-function-to-support-NVMe-devices.patch rename to 0067-Fix-convert-function-to-support-NVMe-devices.patch index 8cda91a..bc246d5 100644 --- a/0051-Fix-convert-function-to-support-NVMe-devices.patch +++ b/0067-Fix-convert-function-to-support-NVMe-devices.patch @@ -1,7 +1,7 @@ From b954efc0812579f973031b24c68a2f593bd89ba1 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 11:34:00 -0500 -Subject: [PATCH 51/90] Fix convert function to support NVMe devices +Subject: [PATCH 067/123] Fix convert function to support NVMe devices This is adapted from the patch at https://bugzilla.redhat.com/show_bug.cgi?id=1019660 , which is against @@ -18,7 +18,7 @@ Signed-off-by: Peter Jones 1 file changed, 19 insertions(+) diff --git a/util/getroot.c b/util/getroot.c -index 92c0d70..bf317a2 100644 +index 92c0d709b..bf317a28e 100644 --- a/util/getroot.c +++ b/util/getroot.c @@ -153,6 +153,7 @@ convert_system_partition_to_system_disk (const char *os_dev, int *is_part) @@ -55,5 +55,5 @@ index 92c0d70..bf317a2 100644 return grub_util_devmapper_part_to_disk (&st, is_part, os_dev); -- -2.9.3 +2.14.3 diff --git a/0052-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch b/0068-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch similarity index 86% rename from 0052-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch rename to 0068-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch index 9228cd2..24bab94 100644 --- a/0052-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch +++ b/0068-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch @@ -1,7 +1,7 @@ From 6900527741a21097f57a72854944f3e078a0ee42 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 10 Feb 2014 16:13:10 -0500 -Subject: [PATCH 52/90] Switch to use APM Mustang device tree, for hardware +Subject: [PATCH 068/123] Switch to use APM Mustang device tree, for hardware testing. Signed-off-by: David A. Marlin @@ -10,7 +10,7 @@ Signed-off-by: David A. Marlin 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 79a747e..462b461 100644 +index 79a747ebd..462b461ff 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -232,8 +232,8 @@ while [ "x$list" != "x" ] ; do @@ -25,5 +25,5 @@ index 79a747e..462b461 100644 fi done -- -2.9.3 +2.14.3 diff --git a/0053-Use-the-default-device-tree-from-the-grub-default-fi.patch b/0069-Use-the-default-device-tree-from-the-grub-default-fi.patch similarity index 88% rename from 0053-Use-the-default-device-tree-from-the-grub-default-fi.patch rename to 0069-Use-the-default-device-tree-from-the-grub-default-fi.patch index 2ba5537..47db64c 100644 --- a/0053-Use-the-default-device-tree-from-the-grub-default-fi.patch +++ b/0069-Use-the-default-device-tree-from-the-grub-default-fi.patch @@ -1,7 +1,8 @@ From 823290f622902f1ae06efa29efbe4ca15af1aafe Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 12 Feb 2014 14:54:04 -0500 -Subject: [PATCH 53/90] Use the default device tree from the grub default file +Subject: [PATCH 069/123] Use the default device tree from the grub default + file instead of hardcoding a value. @@ -12,7 +13,7 @@ Signed-off-by: David A. Marlin 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index c088b70..9d595ac 100644 +index c088b7054..9d595ac05 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -235,7 +235,8 @@ export GRUB_DEFAULT \ @@ -26,7 +27,7 @@ index c088b70..9d595ac 100644 if test "x${grub_cfg}" != "x"; then rm -f "${grub_cfg}.new" diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 462b461..a9692a0 100644 +index 462b461ff..a9692a0c2 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -232,8 +232,8 @@ while [ "x$list" != "x" ] ; do @@ -41,5 +42,5 @@ index 462b461..a9692a0 100644 fi done -- -2.9.3 +2.14.3 diff --git a/0054-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0070-reopen-SNP-protocol-for-exclusive-use-by-grub.patch similarity index 92% rename from 0054-reopen-SNP-protocol-for-exclusive-use-by-grub.patch rename to 0070-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index b5cc967..faac7a4 100644 --- a/0054-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0070-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,14 +1,14 @@ From e119353dad1eadc771a011f82bf90bd04fc00f9a Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Sat, 15 Feb 2014 15:10:22 -0500 -Subject: [PATCH 54/90] reopen SNP protocol for exclusive use by grub +Subject: [PATCH 070/123] reopen SNP protocol for exclusive use by grub --- grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 5388f95..ea0e0ca 100644 +index 5388f952b..ea0e0ca36 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -330,6 +330,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, @@ -42,5 +42,5 @@ index 5388f95..ea0e0ca 100644 } } -- -2.9.3 +2.14.3 diff --git a/0055-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0071-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch similarity index 93% rename from 0055-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch rename to 0071-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 76b8635..26f4890 100644 --- a/0055-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0071-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,8 @@ From 5d47b56198754190c62179ae10ef175c00d1474d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 15:13:59 -0500 -Subject: [PATCH 55/90] Revert "reopen SNP protocol for exclusive use by grub" +Subject: [PATCH 071/123] Revert "reopen SNP protocol for exclusive use by + grub" This reverts commit a3f2c756ce34c9666bddef35e3b3b85ccecdcffc , which is obsoleted by these: @@ -16,7 +17,7 @@ Signed-off-by: Peter Jones 1 file changed, 16 deletions(-) diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index ea0e0ca..5388f95 100644 +index ea0e0ca36..5388f952b 100644 --- a/grub-core/net/drivers/efi/efinet.c +++ b/grub-core/net/drivers/efi/efinet.c @@ -330,7 +330,6 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, @@ -50,5 +51,5 @@ index ea0e0ca..5388f95 100644 } } -- -2.9.3 +2.14.3 diff --git a/0056-Add-grub_util_readlink.patch b/0072-Add-grub_util_readlink.patch similarity index 99% rename from 0056-Add-grub_util_readlink.patch rename to 0072-Add-grub_util_readlink.patch index f15414a..2633d7e 100644 --- a/0056-Add-grub_util_readlink.patch +++ b/0072-Add-grub_util_readlink.patch @@ -1,7 +1,7 @@ From 5a69c7fbfff14bcea80e781fcd6acad07c904e22 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:01:03 -0400 -Subject: [PATCH 56/90] Add grub_util_readlink() +Subject: [PATCH 072/123] Add grub_util_readlink() Add grub_util_readlink(). This requires pulling in stat and readlink from gnulib, which pulls in stat and related headers, but after that the @@ -53,7 +53,7 @@ Reviewed-by: Adam Jackson create mode 100644 m4/time_h.m4 diff --git a/grub-core/gnulib/Makefile.am b/grub-core/gnulib/Makefile.am -index 3444397..b7c5e60 100644 +index 3444397fe..b7c5e60e1 100644 --- a/grub-core/gnulib/Makefile.am +++ b/grub-core/gnulib/Makefile.am @@ -21,7 +21,7 @@ @@ -284,7 +284,7 @@ index 3444397..b7c5e60 100644 BUILT_SOURCES += unistd.h diff --git a/grub-core/gnulib/gettimeofday.c b/grub-core/gnulib/gettimeofday.c new file mode 100644 -index 0000000..8b2058e +index 000000000..8b2058e8c --- /dev/null +++ b/grub-core/gnulib/gettimeofday.c @@ -0,0 +1,154 @@ @@ -444,7 +444,7 @@ index 0000000..8b2058e +} diff --git a/grub-core/gnulib/pathmax.h b/grub-core/gnulib/pathmax.h new file mode 100644 -index 0000000..33fc355 +index 000000000..33fc3553d --- /dev/null +++ b/grub-core/gnulib/pathmax.h @@ -0,0 +1,83 @@ @@ -533,7 +533,7 @@ index 0000000..33fc355 +#endif /* _PATHMAX_H */ diff --git a/grub-core/gnulib/readlink.c b/grub-core/gnulib/readlink.c new file mode 100644 -index 0000000..4c49639 +index 000000000..4c4963951 --- /dev/null +++ b/grub-core/gnulib/readlink.c @@ -0,0 +1,74 @@ @@ -613,7 +613,7 @@ index 0000000..4c49639 +#endif /* HAVE_READLINK */ diff --git a/grub-core/gnulib/stat.c b/grub-core/gnulib/stat.c new file mode 100644 -index 0000000..35f4b0b +index 000000000..35f4b0b1a --- /dev/null +++ b/grub-core/gnulib/stat.c @@ -0,0 +1,138 @@ @@ -757,7 +757,7 @@ index 0000000..35f4b0b +} diff --git a/grub-core/gnulib/sys_stat.in.h b/grub-core/gnulib/sys_stat.in.h new file mode 100644 -index 0000000..b47a7ff +index 000000000..b47a7ff0a --- /dev/null +++ b/grub-core/gnulib/sys_stat.in.h @@ -0,0 +1,732 @@ @@ -1495,7 +1495,7 @@ index 0000000..b47a7ff +#endif diff --git a/grub-core/gnulib/sys_time.in.h b/grub-core/gnulib/sys_time.in.h new file mode 100644 -index 0000000..30057ad +index 000000000..30057ad49 --- /dev/null +++ b/grub-core/gnulib/sys_time.in.h @@ -0,0 +1,213 @@ @@ -1713,7 +1713,7 @@ index 0000000..30057ad +#endif /* _CYGWIN_SYS_TIME_H */ +#endif /* _@GUARD_PREFIX@_SYS_TIME_H */ diff --git a/grub-core/gnulib/sys_types.in.h b/grub-core/gnulib/sys_types.in.h -index d7da356..9520c09 100644 +index d7da35623..9520c0903 100644 --- a/grub-core/gnulib/sys_types.in.h +++ b/grub-core/gnulib/sys_types.in.h @@ -23,7 +23,9 @@ @@ -1728,7 +1728,7 @@ index d7da356..9520c09 100644 #define _@GUARD_PREFIX@_SYS_TYPES_H diff --git a/grub-core/gnulib/time.h b/grub-core/gnulib/time.h new file mode 100644 -index 0000000..b9203d5 +index 000000000..b9203d556 --- /dev/null +++ b/grub-core/gnulib/time.h @@ -0,0 +1,586 @@ @@ -2320,7 +2320,7 @@ index 0000000..b9203d5 +#endif diff --git a/grub-core/gnulib/time.in.h b/grub-core/gnulib/time.in.h new file mode 100644 -index 0000000..81abdf4 +index 000000000..81abdf46e --- /dev/null +++ b/grub-core/gnulib/time.in.h @@ -0,0 +1,274 @@ @@ -2599,7 +2599,7 @@ index 0000000..81abdf4 + +#endif diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c -index 85507af..6f49df4 100644 +index 85507af88..6f49df465 100644 --- a/grub-core/osdep/windows/hostdisk.c +++ b/grub-core/osdep/windows/hostdisk.c @@ -353,6 +353,12 @@ grub_util_mkdir (const char *dir) @@ -2616,7 +2616,7 @@ index 85507af..6f49df4 100644 grub_util_rename (const char *from, const char *to) { diff --git a/include/grub/osdep/hostfile_aros.h b/include/grub/osdep/hostfile_aros.h -index a059c0f..161fbb7 100644 +index a059c0fa4..161fbb7bd 100644 --- a/include/grub/osdep/hostfile_aros.h +++ b/include/grub/osdep/hostfile_aros.h @@ -68,6 +68,12 @@ grub_util_rename (const char *from, const char *to) @@ -2633,7 +2633,7 @@ index a059c0f..161fbb7 100644 struct grub_util_fd diff --git a/include/grub/osdep/hostfile_unix.h b/include/grub/osdep/hostfile_unix.h -index 9ffe46f..17cd3aa 100644 +index 9ffe46fa3..17cd3aa8b 100644 --- a/include/grub/osdep/hostfile_unix.h +++ b/include/grub/osdep/hostfile_unix.h @@ -71,6 +71,12 @@ grub_util_rename (const char *from, const char *to) @@ -2650,7 +2650,7 @@ index 9ffe46f..17cd3aa 100644 #if defined (__NetBSD__) diff --git a/include/grub/osdep/hostfile_windows.h b/include/grub/osdep/hostfile_windows.h -index bf6451b..8c92d05 100644 +index bf6451b6d..8c92d0591 100644 --- a/include/grub/osdep/hostfile_windows.h +++ b/include/grub/osdep/hostfile_windows.h @@ -41,6 +41,8 @@ typedef struct grub_util_fd_dir *grub_util_fd_dir_t; @@ -2664,7 +2664,7 @@ index bf6451b..8c92d05 100644 void diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 new file mode 100644 -index 0000000..1c2d66e +index 000000000..1c2d66ee2 --- /dev/null +++ b/m4/gettimeofday.m4 @@ -0,0 +1,138 @@ @@ -2807,7 +2807,7 @@ index 0000000..1c2d66e + AC_CHECK_FUNCS([_ftime]) +]) diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 -index 4089184..ef2ec5b 100644 +index 408918440..ef2ec5bcc 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -27,7 +27,7 @@ @@ -2828,7 +2828,7 @@ index 4089184..ef2ec5b 100644 ]) gl_AVOID([]) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 -index 7a19f60..66fd0ed 100644 +index 7a19f60d8..66fd0eda9 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -60,10 +60,13 @@ AC_DEFUN([gl_EARLY], @@ -3035,7 +3035,7 @@ index 7a19f60..66fd0ed 100644 m4/vasnprintf.m4 diff --git a/m4/largefile.m4 b/m4/largefile.m4 new file mode 100644 -index 0000000..a1b564a +index 000000000..a1b564ad9 --- /dev/null +++ b/m4/largefile.m4 @@ -0,0 +1,146 @@ @@ -3187,7 +3187,7 @@ index 0000000..a1b564a +]) diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 new file mode 100644 -index 0000000..114f91f +index 000000000..114f91f04 --- /dev/null +++ b/m4/pathmax.m4 @@ -0,0 +1,42 @@ @@ -3235,7 +3235,7 @@ index 0000000..114f91f +]) diff --git a/m4/readlink.m4 b/m4/readlink.m4 new file mode 100644 -index 0000000..f9ce868 +index 000000000..f9ce868c2 --- /dev/null +++ b/m4/readlink.m4 @@ -0,0 +1,71 @@ @@ -3312,7 +3312,7 @@ index 0000000..f9ce868 +]) diff --git a/m4/stat.m4 b/m4/stat.m4 new file mode 100644 -index 0000000..1ae327b +index 000000000..1ae327b36 --- /dev/null +++ b/m4/stat.m4 @@ -0,0 +1,71 @@ @@ -3389,7 +3389,7 @@ index 0000000..1ae327b +AC_DEFUN([gl_PREREQ_STAT], [:]) diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 new file mode 100644 -index 0000000..eaa7642 +index 000000000..eaa7642ba --- /dev/null +++ b/m4/sys_stat_h.m4 @@ -0,0 +1,96 @@ @@ -3491,7 +3491,7 @@ index 0000000..eaa7642 +]) diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 new file mode 100644 -index 0000000..5c79300 +index 000000000..5c79300f8 --- /dev/null +++ b/m4/sys_time_h.m4 @@ -0,0 +1,110 @@ @@ -3607,7 +3607,7 @@ index 0000000..5c79300 +]) diff --git a/m4/time_h.m4 b/m4/time_h.m4 new file mode 100644 -index 0000000..9852778 +index 000000000..9852778f9 --- /dev/null +++ b/m4/time_h.m4 @@ -0,0 +1,118 @@ @@ -3730,5 +3730,5 @@ index 0000000..9852778 + REPLACE_LOCALTIME=0; AC_SUBST([REPLACE_LOCALTIME]) +]) -- -2.9.3 +2.14.3 diff --git a/0057-Make-editenv-chase-symlinks-including-those-across-d.patch b/0073-Make-editenv-chase-symlinks-including-those-across-d.patch similarity index 94% rename from 0057-Make-editenv-chase-symlinks-including-those-across-d.patch rename to 0073-Make-editenv-chase-symlinks-including-those-across-d.patch index 689baec..0f0b6c5 100644 --- a/0057-Make-editenv-chase-symlinks-including-those-across-d.patch +++ b/0073-Make-editenv-chase-symlinks-including-those-across-d.patch @@ -1,7 +1,7 @@ From a867dc42c711385634d86f04176cf3193d548f1d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:38:00 -0400 -Subject: [PATCH 57/90] Make editenv chase symlinks including those across +Subject: [PATCH 073/123] Make editenv chase symlinks including those across devices. This lets us make /boot/grub2/grubenv a symlink to @@ -17,7 +17,7 @@ Reviewed-by: Adam Jackson 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/Makefile.util.def b/Makefile.util.def -index 6d452da..2061104 100644 +index 6d452da02..206110458 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -230,8 +230,17 @@ program = { @@ -39,7 +39,7 @@ index 6d452da..2061104 100644 ldadd = libgrubgcry.a; ldadd = libgrubkern.a; diff --git a/util/editenv.c b/util/editenv.c -index c6f8d22..d8d1dad 100644 +index c6f8d2298..d8d1dad6a 100644 --- a/util/editenv.c +++ b/util/editenv.c @@ -37,6 +37,7 @@ grub_util_create_envblk_file (const char *name) @@ -102,5 +102,5 @@ index c6f8d22..d8d1dad 100644 + free (rename_target); } -- -2.9.3 +2.14.3 diff --git a/0058-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0074-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch similarity index 90% rename from 0058-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch rename to 0074-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch index 354a91f..58d9354 100644 --- a/0058-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +++ b/0074-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch @@ -1,7 +1,8 @@ From 14b8db374bfc41fffa278ec33084324008384417 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 14:23:23 -0400 -Subject: [PATCH 58/90] Generate OS and CLASS in 10_linux from /etc/os-release +Subject: [PATCH 074/123] Generate OS and CLASS in 10_linux from + /etc/os-release This makes us use pretty names in the titles we generate in grub2-mkconfig when GRUB_DISTRIBUTOR isn't set. @@ -14,7 +15,7 @@ Signed-off-by: Peter Jones 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index a9692a0..c662726 100644 +index a9692a0c2..c6627268c 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@" @@ -28,5 +29,5 @@ index a9692a0..c662726 100644 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.9.3 +2.14.3 diff --git a/0059-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0075-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch similarity index 90% rename from 0059-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch rename to 0075-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch index e24ee4a..0a46ce5 100644 --- a/0059-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +++ b/0075-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch @@ -1,7 +1,7 @@ From 700c631b4c887778951503346afe5b7ee70bf7dd Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 4 Sep 2014 15:52:08 -0400 -Subject: [PATCH 59/90] Minimize the sort ordering for .debug and -rescue- +Subject: [PATCH 075/123] Minimize the sort ordering for .debug and -rescue- kernels. Resolves: rhbz#1065360 @@ -11,7 +11,7 @@ Signed-off-by: Peter Jones 1 file changed, 8 insertions(+) diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in -index cf35e41..10fabee 100644 +index cf35e4174..10fabee5e 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -248,6 +248,14 @@ version_test_gt () @@ -30,5 +30,5 @@ index cf35e41..10fabee 100644 version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b" return "$?" -- -2.9.3 +2.14.3 diff --git a/0060-Load-arm-with-SB-enabled.patch b/0076-Load-arm-with-SB-enabled.patch similarity index 98% rename from 0060-Load-arm-with-SB-enabled.patch rename to 0076-Load-arm-with-SB-enabled.patch index 4a31029..86e67ec 100644 --- a/0060-Load-arm-with-SB-enabled.patch +++ b/0076-Load-arm-with-SB-enabled.patch @@ -1,7 +1,7 @@ From cae0d2cdb28017df75358e0839c60a9c2521cb82 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 18 Sep 2014 11:26:14 -0400 -Subject: [PATCH 60/90] Load arm with SB enabled. +Subject: [PATCH 076/123] Load arm with SB enabled. Make sure we actually try to validate secure boot on this platform (even though we're not shipping it enabled by default.) @@ -21,7 +21,7 @@ is enabled. create mode 100644 include/grub/efi/linux.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index e79bb0c..7fba196 100644 +index e79bb0cc5..7fba196b3 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -1676,6 +1676,8 @@ module = { @@ -42,7 +42,7 @@ index e79bb0c..7fba196 100644 enable = x86_64_efi; }; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 9519d2e..4756ef7 100644 +index 9519d2e4d..4756ef71f 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -28,6 +28,7 @@ @@ -226,7 +226,7 @@ index 9519d2e..4756ef7 100644 if (!linux_args) diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c new file mode 100644 -index 0000000..aea378a +index 000000000..aea378adf --- /dev/null +++ b/grub-core/loader/efi/linux.c @@ -0,0 +1,65 @@ @@ -296,7 +296,7 @@ index 0000000..aea378a + return GRUB_ERR_BUG; +} diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index b79e632..e5b7785 100644 +index b79e6320b..e5b778577 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -26,6 +26,7 @@ @@ -363,7 +363,7 @@ index b79e632..e5b7785 100644 static grub_err_t diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h -index 1ea2369..a2ba24e 100644 +index 1ea23696e..a2ba24e9f 100644 --- a/include/grub/arm64/linux.h +++ b/include/grub/arm64/linux.h @@ -20,6 +20,7 @@ @@ -388,7 +388,7 @@ index 1ea2369..a2ba24e 100644 #endif /* ! GRUB_LINUX_CPU_HEADER */ diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h new file mode 100644 -index 0000000..d9ede36 +index 000000000..d9ede3677 --- /dev/null +++ b/include/grub/efi/linux.h @@ -0,0 +1,31 @@ @@ -424,5 +424,5 @@ index 0000000..d9ede36 + +#endif /* ! GRUB_EFI_LINUX_HEADER */ -- -2.9.3 +2.14.3 diff --git a/0061-Try-prefix-if-fw_path-doesn-t-work.patch b/0077-Try-prefix-if-fw_path-doesn-t-work.patch similarity index 96% rename from 0061-Try-prefix-if-fw_path-doesn-t-work.patch rename to 0077-Try-prefix-if-fw_path-doesn-t-work.patch index e107208..2136e0a 100644 --- a/0061-Try-prefix-if-fw_path-doesn-t-work.patch +++ b/0077-Try-prefix-if-fw_path-doesn-t-work.patch @@ -1,7 +1,7 @@ From d255a98813193eb2c23f9217106b121278843023 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 3 Oct 2014 11:08:03 -0400 -Subject: [PATCH 61/90] Try $prefix if $fw_path doesn't work. +Subject: [PATCH 077/123] Try $prefix if $fw_path doesn't work. Related: rhbz#1148652 @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones 3 files changed, 75 insertions(+), 75 deletions(-) diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c -index 8a3ecd5..8efa1a6 100644 +index 8a3ecd580..8efa1a6ed 100644 --- a/grub-core/kern/ieee1275/init.c +++ b/grub-core/kern/ieee1275/init.c @@ -139,23 +139,25 @@ grub_machine_get_bootlocation (char **device, char **path) @@ -57,7 +57,7 @@ index 8a3ecd5..8efa1a6 100644 } diff --git a/grub-core/net/net.c b/grub-core/net/net.c -index 0769bf8..16d2ce0 100644 +index 0769bf850..16d2ce06d 100644 --- a/grub-core/net/net.c +++ b/grub-core/net/net.c @@ -1850,7 +1850,7 @@ grub_net_search_configfile (char *config) @@ -70,7 +70,7 @@ index 0769bf8..16d2ce0 100644 static struct grub_preboot *fini_hnd; diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c -index 7d9c4f0..b69f9e7 100644 +index 7d9c4f09b..b69f9e738 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -331,74 +331,72 @@ grub_enter_normal_mode (const char *config) @@ -207,5 +207,5 @@ index 7d9c4f0..b69f9e7 100644 } -- -2.9.3 +2.14.3 diff --git a/0062-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch b/0078-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch similarity index 93% rename from 0062-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch rename to 0078-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch index 515e1f8..e073d9f 100644 --- a/0062-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch +++ b/0078-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch @@ -1,8 +1,8 @@ From 8e6fc0ea14aa01817cc9103ffd5e328a78e56857 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 27 Oct 2014 09:22:55 -0400 -Subject: [PATCH 62/90] Try to emit linux16/initrd16 and linuxefi/initrdefi in - 30-os_prober. +Subject: [PATCH 078/123] Try to emit linux16/initrd16 and linuxefi/initrdefi + in 30-os_prober. Resolves: rhbz#1108296 @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index 9b8f596..dc98eac 100644 +index 9b8f5968e..dc98eace9 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -141,6 +141,28 @@ for OS in ${OSPROBED} ; do @@ -73,5 +73,5 @@ index 9b8f596..dc98eac 100644 fi cat << EOF -- -2.9.3 +2.14.3 diff --git a/0063-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b/0079-Make-grub2-mkconfig-construct-titles-that-look-like-.patch similarity index 93% rename from 0063-Make-grub2-mkconfig-construct-titles-that-look-like-.patch rename to 0079-Make-grub2-mkconfig-construct-titles-that-look-like-.patch index 15349d8..e8090b4 100644 --- a/0063-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +++ b/0079-Make-grub2-mkconfig-construct-titles-that-look-like-.patch @@ -1,8 +1,8 @@ From b6e3ffe7ae7e4222cc15876cb72c691112f3c4b0 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 28 Apr 2015 11:15:03 -0400 -Subject: [PATCH 63/90] Make grub2-mkconfig construct titles that look like the - ones we want elsewhere. +Subject: [PATCH 079/123] Make grub2-mkconfig construct titles that look like + the ones we want elsewhere. Resolves: rhbz#1215839 @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index c662726..1215241 100644 +index c6627268c..121524185 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -68,6 +68,15 @@ case x"$GRUB_FS" in @@ -50,5 +50,5 @@ index c662726..1215241 100644 echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/" else -- -2.9.3 +2.14.3 diff --git a/0064-Update-info-with-grub.cfg-netboot-selection-order-11.patch b/0080-Update-info-with-grub.cfg-netboot-selection-order-11.patch similarity index 94% rename from 0064-Update-info-with-grub.cfg-netboot-selection-order-11.patch rename to 0080-Update-info-with-grub.cfg-netboot-selection-order-11.patch index 8f53451..95ecbec 100644 --- a/0064-Update-info-with-grub.cfg-netboot-selection-order-11.patch +++ b/0080-Update-info-with-grub.cfg-netboot-selection-order-11.patch @@ -1,7 +1,7 @@ From c4be6106eae8c1b479c325f531a1f81188f400e8 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 16:34:51 -0400 -Subject: [PATCH 64/90] Update info with grub.cfg netboot selection order +Subject: [PATCH 080/123] Update info with grub.cfg netboot selection order (#1148650) Added documentation to the grub info page that specifies the order @@ -13,7 +13,7 @@ Resolves rhbz#1148650 1 file changed, 42 insertions(+) diff --git a/docs/grub.texi b/docs/grub.texi -index 98d4d0d..4c6323b 100644 +index 98d4d0d52..4c6323b39 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -2414,6 +2414,48 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38 @@ -66,5 +66,5 @@ index 98d4d0d..4c6323b 100644 @samp{(tftp)} device. -- -2.9.3 +2.14.3 diff --git a/0065-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch b/0081-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch similarity index 97% rename from 0065-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch rename to 0081-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch index 1d5d622..03a2c07 100644 --- a/0065-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch +++ b/0081-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch @@ -1,7 +1,7 @@ From 11abe391636d0819902357591aebf0ea01b88130 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 16 Mar 2015 14:14:19 -0400 -Subject: [PATCH 65/90] Use Distribution Package Sort for grub2-mkconfig +Subject: [PATCH 081/123] Use Distribution Package Sort for grub2-mkconfig (#1124074) Users reported that newly installed kernels on their systems installed @@ -22,7 +22,7 @@ Resolves rhbz#1124074 create mode 100644 util/grub-rpm-sort.c diff --git a/.gitignore b/.gitignore -index 06c9f3a..7697877 100644 +index 06c9f3ab7..7697877ca 100644 --- a/.gitignore +++ b/.gitignore @@ -124,6 +124,7 @@ grub-ofpathname @@ -34,7 +34,7 @@ index 06c9f3a..7697877 100644 grub-set-default grub-shell diff --git a/Makefile.util.def b/Makefile.util.def -index 2061104..d846b81 100644 +index 206110458..d846b81b5 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -684,6 +684,22 @@ program = { @@ -61,7 +61,7 @@ index 2061104..d846b81 100644 name = grub-mkconfig; common = util/grub-mkconfig.in; diff --git a/configure.ac b/configure.ac -index 9937a82..d5e8d90 100644 +index 9937a827f..d5e8d90f3 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-mkrelpath]) @@ -115,7 +115,7 @@ index 9937a82..d5e8d90 100644 if test x$host_kernel = xkfreebsd; then AC_CHECK_LIB([geom], [geom_gettree], [], diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in -index 10fabee..9c410ea 100644 +index 10fabee5e..9c410eae4 100644 --- a/util/grub-mkconfig_lib.in +++ b/util/grub-mkconfig_lib.in @@ -33,6 +33,9 @@ fi @@ -152,7 +152,7 @@ index 10fabee..9c410ea 100644 return 1 diff --git a/util/grub-rpm-sort.8 b/util/grub-rpm-sort.8 new file mode 100644 -index 0000000..8ce2148 +index 000000000..8ce214884 --- /dev/null +++ b/util/grub-rpm-sort.8 @@ -0,0 +1,12 @@ @@ -170,7 +170,7 @@ index 0000000..8ce2148 +.BR "info grub" diff --git a/util/grub-rpm-sort.c b/util/grub-rpm-sort.c new file mode 100644 -index 0000000..f33bd1e +index 000000000..f33bd1ed5 --- /dev/null +++ b/util/grub-rpm-sort.c @@ -0,0 +1,281 @@ @@ -456,5 +456,5 @@ index 0000000..f33bd1e + return 0; +} -- -2.9.3 +2.14.3 diff --git a/0066-Add-friendly-grub2-password-config-tool-985962.patch b/0082-Add-friendly-grub2-password-config-tool-985962.patch similarity index 94% rename from 0066-Add-friendly-grub2-password-config-tool-985962.patch rename to 0082-Add-friendly-grub2-password-config-tool-985962.patch index 156666c..d5b2e6e 100644 --- a/0066-Add-friendly-grub2-password-config-tool-985962.patch +++ b/0082-Add-friendly-grub2-password-config-tool-985962.patch @@ -1,7 +1,7 @@ From f7574b40f89ded29d82e5cfdb7494f8884bc1cdb Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Thu, 25 Jun 2015 11:13:11 -0400 -Subject: [PATCH 66/90] Add friendly grub2 password config tool (#985962) +Subject: [PATCH 082/123] Add friendly grub2 password config tool (#985962) Provided a tool for users to reset the grub2 root user password without having to alter the grub.cfg. The hashed password now @@ -22,7 +22,7 @@ Resolves: rhbz#985962 create mode 100644 util/grub.d/01_users.in diff --git a/.gitignore b/.gitignore -index 7697877..53a391e 100644 +index 7697877ca..53a391e62 100644 --- a/.gitignore +++ b/.gitignore @@ -127,6 +127,7 @@ grub-render-label @@ -34,38 +34,38 @@ index 7697877..53a391e 100644 grub-shell-tester grub-sparc64-setup diff --git a/Makefile.util.def b/Makefile.util.def -index d846b81..226c46b 100644 +index d846b81b5..226c46b2d 100644 --- a/Makefile.util.def +++ b/Makefile.util.def -@@ -440,6 +440,12 @@ script = { +@@ -439,6 +439,12 @@ script = { + installdir = grubconf; }; - script = { ++script = { + name = '01_users'; + common = util/grub.d/01_users.in; + installdir = grubconf; +}; + -+script = { + script = { name = '10_windows'; common = util/grub.d/10_windows.in; - installdir = grubconf; -@@ -722,6 +728,13 @@ script = { +@@ -721,6 +727,13 @@ script = { + installdir = sbin; }; - script = { ++script = { + name = grub-setpassword; + common = util/grub-setpassword.in; + mansection = 8; + installdir = sbin; +}; + -+script = { + script = { name = grub-mkconfig_lib; common = util/grub-mkconfig_lib.in; - installdir = noinst; diff --git a/configure.ac b/configure.ac -index d5e8d90..67ff20c 100644 +index d5e8d90f3..67ff20cfd 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,7 @@ grub_TRANSFORM([grub-mkrelpath]) @@ -77,7 +77,7 @@ index d5e8d90..67ff20c 100644 grub_TRANSFORM([grub-script-check]) grub_TRANSFORM([grub-set-default]) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 9d595ac..fb87247 100644 +index 9d595ac05..fb8724708 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -263,6 +263,8 @@ for i in "${grub_mkconfig_dir}"/* ; do @@ -91,7 +91,7 @@ index 9d595ac..fb87247 100644 echo diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8 new file mode 100644 -index 0000000..49200a8 +index 000000000..49200a848 --- /dev/null +++ b/util/grub-setpassword.8 @@ -0,0 +1,28 @@ @@ -125,7 +125,7 @@ index 0000000..49200a8 +.BR "info grub2-mkpasswd-pbkdf2" diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in new file mode 100644 -index 0000000..dd76f00 +index 000000000..dd76f00fc --- /dev/null +++ b/util/grub-setpassword.in @@ -0,0 +1,123 @@ @@ -254,7 +254,7 @@ index 0000000..dd76f00 +echo "GRUB2_PASSWORD=${MYPASS}" > "${grubdir}/user.cfg" diff --git a/util/grub.d/01_users.in b/util/grub.d/01_users.in new file mode 100644 -index 0000000..db2f44b +index 000000000..db2f44bfb --- /dev/null +++ b/util/grub.d/01_users.in @@ -0,0 +1,11 @@ @@ -270,5 +270,5 @@ index 0000000..db2f44b +fi +EOF -- -2.9.3 +2.14.3 diff --git a/0067-Fix-race-in-EFI-validation.patch b/0083-Fix-race-in-EFI-validation.patch similarity index 96% rename from 0067-Fix-race-in-EFI-validation.patch rename to 0083-Fix-race-in-EFI-validation.patch index 4667b47..bdf1896 100644 --- a/0067-Fix-race-in-EFI-validation.patch +++ b/0083-Fix-race-in-EFI-validation.patch @@ -1,14 +1,14 @@ From a605e7af01dc697021b96fe6fbaf92ef3fca017c Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 14 Jul 2015 16:58:51 -0700 -Subject: [PATCH 67/90] Fix race in EFI validation +Subject: [PATCH 083/123] Fix race in EFI validation --- grub-core/loader/i386/efi/linux.c | 44 ++++++++++----------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index e5b7785..7ccf32d 100644 +index e5b778577..7ccf32d9d 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -154,7 +154,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), @@ -93,5 +93,5 @@ index e5b7785..7ccf32d 100644 { grub_dl_unref (my_mod); -- -2.9.3 +2.14.3 diff --git a/0068-ppc64le-sync-mkconfig-to-disk-1212114.patch b/0084-ppc64le-sync-mkconfig-to-disk-1212114.patch similarity index 92% rename from 0068-ppc64le-sync-mkconfig-to-disk-1212114.patch rename to 0084-ppc64le-sync-mkconfig-to-disk-1212114.patch index 9af7bc6..978373e 100644 --- a/0068-ppc64le-sync-mkconfig-to-disk-1212114.patch +++ b/0084-ppc64le-sync-mkconfig-to-disk-1212114.patch @@ -1,7 +1,7 @@ From 63efe6a207f59ffa9e55cc10a0aed272f3571227 Mon Sep 17 00:00:00 2001 From: Don Zickus Date: Wed, 22 Jul 2015 13:59:55 -0400 -Subject: [PATCH 68/90] ppc64le sync mkconfig to disk (#1212114) +Subject: [PATCH 084/123] ppc64le sync mkconfig to disk (#1212114) If creating a new grub2 entry using grub2-mkconfig, the entry is not immediately sync'd to disk. If a crash happens before the writeback, @@ -21,7 +21,7 @@ Resolves: rhbz#1212114 1 file changed, 9 insertions(+) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index fb87247..73a18f7 100644 +index fb8724708..73a18f723 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -294,3 +294,12 @@ fi @@ -38,5 +38,5 @@ index fb87247..73a18f7 100644 + sync && mountpoint -q /boot &&fsfreeze -f /boot && fsfreeze -u /boot +fi -- -2.9.3 +2.14.3 diff --git a/0069-Use-device-part-of-chainloader-target-if-present.patch b/0085-Use-device-part-of-chainloader-target-if-present.patch similarity index 90% rename from 0069-Use-device-part-of-chainloader-target-if-present.patch rename to 0085-Use-device-part-of-chainloader-target-if-present.patch index 2b3dcf7..fc4e46f 100644 --- a/0069-Use-device-part-of-chainloader-target-if-present.patch +++ b/0085-Use-device-part-of-chainloader-target-if-present.patch @@ -1,7 +1,7 @@ From 9d47b2c482b6db238c99fe106f4b2e3c612f3a91 Mon Sep 17 00:00:00 2001 From: Raymund Will Date: Fri, 10 Apr 2015 01:45:02 -0400 -Subject: [PATCH 69/90] Use device part of chainloader target, if present. +Subject: [PATCH 085/123] Use device part of chainloader target, if present. Otherwise chainloading is restricted to '$root', which might not even be readable by EFI! @@ -15,7 +15,7 @@ Signed-off-by: Peter Jones 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 522a716..6b47497 100644 +index 522a716e3..6b47497d7 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -219,8 +219,11 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)), @@ -33,5 +33,5 @@ index 522a716..6b47497 100644 goto fail; -- -2.9.3 +2.14.3 diff --git a/0070-Add-secureboot-support-on-efi-chainloader.patch b/0086-Add-secureboot-support-on-efi-chainloader.patch similarity index 99% rename from 0070-Add-secureboot-support-on-efi-chainloader.patch rename to 0086-Add-secureboot-support-on-efi-chainloader.patch index 03fd5ca..7f9f1c4 100644 --- a/0070-Add-secureboot-support-on-efi-chainloader.patch +++ b/0086-Add-secureboot-support-on-efi-chainloader.patch @@ -1,7 +1,7 @@ From 9cbf35d19f4ffafdf2683acf7b6a320b55bbdfca Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 13:04:37 -0400 -Subject: [PATCH 70/90] Add secureboot support on efi chainloader +Subject: [PATCH 086/123] Add secureboot support on efi chainloader Expand the chainloader to be able to verify the image by means of shim lock protocol. The PE/COFF image is loaded and relocated by the @@ -22,7 +22,7 @@ Signed-off-by: Peter Jones 2 files changed, 595 insertions(+), 37 deletions(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 6b47497..3cbb6c5 100644 +index 6b47497d7..3cbb6c5b8 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -32,6 +32,8 @@ @@ -758,7 +758,7 @@ index 6b47497..3cbb6c5 100644 return grub_errno; diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h -index f79c36c..f79782e 100644 +index f79c36c02..f79782e1b 100644 --- a/include/grub/efi/pe32.h +++ b/include/grub/efi/pe32.h @@ -212,7 +212,11 @@ struct grub_pe64_optional_header @@ -796,5 +796,5 @@ index f79c36c..f79782e 100644 { grub_uint32_t page_rva; -- -2.9.3 +2.14.3 diff --git a/0071-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch b/0087-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch similarity index 95% rename from 0071-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch rename to 0087-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch index 5592b97..d76aeda 100644 --- a/0071-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +++ b/0087-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch @@ -1,7 +1,7 @@ From c1d31b6a26e5542142d569c94a70f1dc8e07afd6 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 6 Oct 2015 16:09:25 -0400 -Subject: [PATCH 71/90] Make any of the loaders that link in efi mode honor +Subject: [PATCH 087/123] Make any of the loaders that link in efi mode honor secure boot. And in this case "honor" means "even if somebody does link this in, they @@ -37,7 +37,7 @@ Signed-off-by: Peter Jones create mode 100644 include/grub/sparc64/linux.h diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am -index 04e9395..fd715a8 100644 +index 04e9395fd..fd715a8ea 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h @@ -49,7 +49,7 @@ index 04e9395..fd715a8 100644 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index 7fba196..ac195d1 100644 +index 7fba196b3..ac195d10e 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -178,6 +178,7 @@ kernel = { @@ -61,7 +61,7 @@ index 7fba196..ac195d1 100644 x86 = kern/i386/tsc.c; x86 = kern/i386/tsc_pit.c; diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c -index a0c164e..41a7f3f 100644 +index a0c164e54..41a7f3f04 100644 --- a/grub-core/commands/iorw.c +++ b/grub-core/commands/iorw.c @@ -23,6 +23,7 @@ @@ -93,7 +93,7 @@ index a0c164e..41a7f3f 100644 grub_unregister_extcmd (cmd_read_word); grub_unregister_extcmd (cmd_read_dword); diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c -index 98769ea..088cbe9 100644 +index 98769eadb..088cbe9e2 100644 --- a/grub-core/commands/memrw.c +++ b/grub-core/commands/memrw.c @@ -22,6 +22,7 @@ @@ -125,7 +125,7 @@ index 98769ea..088cbe9 100644 grub_unregister_extcmd (cmd_read_word); grub_unregister_extcmd (cmd_read_dword); diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c -index 0859910..101307f 100644 +index 08599101a..101307fc7 100644 --- a/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c @@ -269,34 +269,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -165,7 +165,7 @@ index 0859910..101307f 100644 /* Search the mods section from the PE32/PE32+ image. This code uses diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c new file mode 100644 -index 0000000..a41b6c5 +index 000000000..a41b6c5b8 --- /dev/null +++ b/grub-core/kern/efi/sb.c @@ -0,0 +1,58 @@ @@ -228,7 +228,7 @@ index 0000000..a41b6c5 +#endif +} diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c -index 74888c4..69c2a10 100644 +index 74888c463..69c2a10d3 100644 --- a/grub-core/loader/efi/appleloader.c +++ b/grub-core/loader/efi/appleloader.c @@ -24,6 +24,7 @@ @@ -259,7 +259,7 @@ index 74888c4..69c2a10 100644 grub_unregister_command (cmd); } diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 3cbb6c5..c4184fa 100644 +index 3cbb6c5b8..c4184fa64 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -34,6 +34,7 @@ @@ -271,7 +271,7 @@ index 3cbb6c5..c4184fa 100644 #include #include diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c -index 7f96515..87709aa 100644 +index 7f96515da..87709aa23 100644 --- a/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c @@ -38,6 +38,7 @@ @@ -303,7 +303,7 @@ index 7f96515..87709aa 100644 grub_unregister_extcmd (cmd_openbsd); grub_unregister_extcmd (cmd_netbsd); diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index fddcc46..b0afcca 100644 +index fddcc461d..b0afccac9 100644 --- a/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c @@ -35,6 +35,7 @@ @@ -335,7 +335,7 @@ index fddcc46..b0afcca 100644 grub_unregister_command (cmd_initrd); } diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index a293b17..9128315 100644 +index a293b17aa..91283157e 100644 --- a/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c @@ -35,6 +35,7 @@ @@ -367,7 +367,7 @@ index a293b17..9128315 100644 grub_unregister_command (cmd_initrd); } diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c -index 73aa0aa..64a6513 100644 +index 73aa0aa12..64a651322 100644 --- a/grub-core/loader/multiboot.c +++ b/grub-core/loader/multiboot.c @@ -42,6 +42,7 @@ @@ -399,7 +399,7 @@ index 73aa0aa..64a6513 100644 grub_unregister_command (cmd_module); } diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c -index c9885b1..df8dfdb 100644 +index c9885b1bc..df8dfdb4b 100644 --- a/grub-core/loader/xnu.c +++ b/grub-core/loader/xnu.c @@ -33,6 +33,7 @@ @@ -431,7 +431,7 @@ index c9885b1..df8dfdb 100644 grub_unregister_command (cmd_resume); #endif diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h -index 2245632..9a2da0e 100644 +index 22456327e..9a2da0eb3 100644 --- a/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h @@ -76,7 +76,6 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var, @@ -444,7 +444,7 @@ index 2245632..9a2da0e 100644 const grub_efi_device_path_t *dp2); diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h new file mode 100644 -index 0000000..9629fbb +index 000000000..9629fbb0f --- /dev/null +++ b/include/grub/efi/sb.h @@ -0,0 +1,29 @@ @@ -479,16 +479,16 @@ index 0000000..9629fbb +#endif /* ! GRUB_EFI_SB_HEADER */ diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h new file mode 100644 -index 0000000..e69de29 +index 000000000..e69de29bb diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h new file mode 100644 -index 0000000..e69de29 +index 000000000..e69de29bb diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h new file mode 100644 -index 0000000..e69de29 +index 000000000..e69de29bb diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h new file mode 100644 -index 0000000..e69de29 +index 000000000..e69de29bb -- -2.9.3 +2.14.3 diff --git a/0072-Fix-security-issue-when-reading-username-and-passwor.patch b/0088-Fix-security-issue-when-reading-username-and-passwor.patch similarity index 87% rename from 0072-Fix-security-issue-when-reading-username-and-passwor.patch rename to 0088-Fix-security-issue-when-reading-username-and-passwor.patch index 7f2b486..39dfa3c 100644 --- a/0072-Fix-security-issue-when-reading-username-and-passwor.patch +++ b/0088-Fix-security-issue-when-reading-username-and-passwor.patch @@ -1,7 +1,7 @@ From 5a0d703884a73f93a68753c6ed64bdf08797c82a Mon Sep 17 00:00:00 2001 From: Hector Marco-Gisbert Date: Fri, 13 Nov 2015 16:21:09 +0100 -Subject: [PATCH 72/90] Fix security issue when reading username and password +Subject: [PATCH 088/123] Fix security issue when reading username and password This patch fixes two integer underflows at: * grub-core/lib/crypto.c @@ -17,7 +17,7 @@ Signed-off-by: Ismael Ripoll-Ripoll 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c -index 683a8aa..c5ab9eb 100644 +index 683a8aaa7..c5ab9eb18 100644 --- a/grub-core/lib/crypto.c +++ b/grub-core/lib/crypto.c @@ -468,7 +468,7 @@ grub_password_get (char buf[], unsigned buf_size) @@ -30,7 +30,7 @@ index 683a8aa..c5ab9eb 100644 if (cur_len) cur_len--; diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c -index 7338f82..6d6dc7d 100644 +index 7338f8245..6d6dc7ded 100644 --- a/grub-core/normal/auth.c +++ b/grub-core/normal/auth.c @@ -172,7 +172,7 @@ grub_username_get (char buf[], unsigned buf_size) @@ -43,5 +43,5 @@ index 7338f82..6d6dc7d 100644 if (cur_len) { -- -2.9.3 +2.14.3 diff --git a/0073-Make-grub_fatal-also-backtrace.patch b/0089-Make-grub_fatal-also-backtrace.patch similarity index 95% rename from 0073-Make-grub_fatal-also-backtrace.patch rename to 0089-Make-grub_fatal-also-backtrace.patch index bac1ecb..d5b1a9c 100644 --- a/0073-Make-grub_fatal-also-backtrace.patch +++ b/0089-Make-grub_fatal-also-backtrace.patch @@ -1,7 +1,7 @@ From c37a4f02e5fd0c3aa5f54baaeaf32eed0e3c110b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 27 Jan 2016 09:22:42 -0500 -Subject: [PATCH 73/90] Make grub_fatal() also backtrace. +Subject: [PATCH 089/123] Make grub_fatal() also backtrace. --- grub-core/Makefile.core.def | 3 ++ @@ -13,7 +13,7 @@ Subject: [PATCH 73/90] Make grub_fatal() also backtrace. create mode 100644 grub-core/lib/arm64/backtrace.c diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index ac195d1..990e41b 100644 +index ac195d10e..990e41b55 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -157,6 +157,9 @@ kernel = { @@ -27,7 +27,7 @@ index ac195d1..990e41b 100644 i386_xen = kern/i386/dl.c; diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c -index 81be344..d7dcd97 100644 +index 81be34424..d7dcd9725 100644 --- a/grub-core/kern/misc.c +++ b/grub-core/kern/misc.c @@ -24,6 +24,7 @@ @@ -55,7 +55,7 @@ index 81be344..d7dcd97 100644 #endif diff --git a/grub-core/lib/arm64/backtrace.c b/grub-core/lib/arm64/backtrace.c new file mode 100644 -index 0000000..1079b53 +index 000000000..1079b5380 --- /dev/null +++ b/grub-core/lib/arm64/backtrace.c @@ -0,0 +1,62 @@ @@ -122,7 +122,7 @@ index 0000000..1079b53 +} + diff --git a/grub-core/lib/backtrace.c b/grub-core/lib/backtrace.c -index 825a880..c0ad6ab 100644 +index 825a8800e..c0ad6ab8b 100644 --- a/grub-core/lib/backtrace.c +++ b/grub-core/lib/backtrace.c @@ -29,6 +29,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); @@ -142,7 +142,7 @@ index 825a880..c0ad6ab 100644 } diff --git a/grub-core/lib/i386/backtrace.c b/grub-core/lib/i386/backtrace.c -index c3e03c7..c67273d 100644 +index c3e03c727..c67273db3 100644 --- a/grub-core/lib/i386/backtrace.c +++ b/grub-core/lib/i386/backtrace.c @@ -15,11 +15,23 @@ @@ -171,5 +171,5 @@ index c3e03c7..c67273d 100644 #include #include -- -2.9.3 +2.14.3 diff --git a/0074-Rework-linux-command.patch b/0090-Rework-linux-command.patch similarity index 97% rename from 0074-Rework-linux-command.patch rename to 0090-Rework-linux-command.patch index 25b3e62..8a80bbe 100644 --- a/0074-Rework-linux-command.patch +++ b/0090-Rework-linux-command.patch @@ -1,7 +1,7 @@ From 33d11870bbc2fa554fa9344c3c180279c258736a Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:12:39 -0700 -Subject: [PATCH 74/90] Rework linux command +Subject: [PATCH 090/123] Rework linux command We want a single buffer that contains the entire kernel image in order to perform a TPM measurement. Allocate one and copy the entire kernel into it @@ -11,7 +11,7 @@ before pulling out the individual blocks later on. 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c -index b0afcca..5eb7d17 100644 +index b0afccac9..5eb7d17db 100644 --- a/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c @@ -681,12 +681,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), @@ -103,5 +103,5 @@ index b0afcca..5eb7d17 100644 grub_file_close (file); -- -2.9.3 +2.14.3 diff --git a/0075-Rework-linux16-command.patch b/0091-Rework-linux16-command.patch similarity index 97% rename from 0075-Rework-linux16-command.patch rename to 0091-Rework-linux16-command.patch index a153932..a33ec32 100644 --- a/0075-Rework-linux16-command.patch +++ b/0091-Rework-linux16-command.patch @@ -1,7 +1,7 @@ From 0b86b309de12b4f3ea920124faa60841ffedf472 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sun, 9 Aug 2015 16:20:58 -0700 -Subject: [PATCH 75/90] Rework linux16 command +Subject: [PATCH 091/123] Rework linux16 command We want a single buffer that contains the entire kernel image in order to perform a TPM measurement. Allocate one and copy the entire kernel int it @@ -11,7 +11,7 @@ before pulling out the individual blocks later on. 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c -index 9128315..b864e54 100644 +index 91283157e..b864e5403 100644 --- a/grub-core/loader/i386/pc/linux.c +++ b/grub-core/loader/i386/pc/linux.c @@ -124,13 +124,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), @@ -97,5 +97,5 @@ index 9128315..b864e54 100644 grub_file_close (file); -- -2.9.3 +2.14.3 diff --git a/0076-Make-grub-editenv-build-again.patch b/0092-Make-grub-editenv-build-again.patch similarity index 90% rename from 0076-Make-grub-editenv-build-again.patch rename to 0092-Make-grub-editenv-build-again.patch index ec632e1..8c82627 100644 --- a/0076-Make-grub-editenv-build-again.patch +++ b/0092-Make-grub-editenv-build-again.patch @@ -1,7 +1,7 @@ From edaa6c877917816d57603e26d660107c82ffbb5d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 4 Mar 2016 16:29:13 -0500 -Subject: [PATCH 76/90] Make grub-editenv build again. +Subject: [PATCH 092/123] Make grub-editenv build again. 36212460d3565b18439a3a8130b28e6c97702c6a split how some of the mkimage utility functions are defined, and they wind up being linked into @@ -13,7 +13,7 @@ Signed-off-by: Peter Jones 1 file changed, 2 insertions(+) diff --git a/Makefile.util.def b/Makefile.util.def -index 226c46b..8007de9 100644 +index 226c46b2d..8007de945 100644 --- a/Makefile.util.def +++ b/Makefile.util.def @@ -236,6 +236,8 @@ program = { @@ -26,5 +26,5 @@ index 226c46b..8007de9 100644 common = util/config.c; common = util/resolve.c; -- -2.9.3 +2.14.3 diff --git a/0077-Fix-locale-issue-in-grub-setpassword-1294243.patch b/0093-Fix-locale-issue-in-grub-setpassword-1294243.patch similarity index 88% rename from 0077-Fix-locale-issue-in-grub-setpassword-1294243.patch rename to 0093-Fix-locale-issue-in-grub-setpassword-1294243.patch index 9070392..dcf35a1 100644 --- a/0077-Fix-locale-issue-in-grub-setpassword-1294243.patch +++ b/0093-Fix-locale-issue-in-grub-setpassword-1294243.patch @@ -1,7 +1,7 @@ From d2f552900d87b62ca0dbc740902d561bc32f32be Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Fri, 29 Jan 2016 17:34:02 -0500 -Subject: [PATCH 77/90] Fix locale issue in grub-setpassword (#1294243) +Subject: [PATCH 093/123] Fix locale issue in grub-setpassword (#1294243) A shell substitution was expecting non-translated output to grab the hashed password and put it in the user.cfg file. Modified code to force @@ -13,7 +13,7 @@ Resolves: rhbz#1294243 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in -index dd76f00..2923f43 100644 +index dd76f00fc..2923f437e 100644 --- a/util/grub-setpassword.in +++ b/util/grub-setpassword.in @@ -105,7 +105,7 @@ getpass() { @@ -26,5 +26,5 @@ index dd76f00..2923f43 100644 sed -e "s/PBKDF2 hash of your password is //" } -- -2.9.3 +2.14.3 diff --git a/0078-Fix-up-some-man-pages-rpmdiff-noticed.patch b/0094-Fix-up-some-man-pages-rpmdiff-noticed.patch similarity index 95% rename from 0078-Fix-up-some-man-pages-rpmdiff-noticed.patch rename to 0094-Fix-up-some-man-pages-rpmdiff-noticed.patch index f0130b3..a070ffc 100644 --- a/0078-Fix-up-some-man-pages-rpmdiff-noticed.patch +++ b/0094-Fix-up-some-man-pages-rpmdiff-noticed.patch @@ -1,7 +1,7 @@ From 216188f920d3ade19626d6e8fe450cea2c427e53 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 23 Sep 2014 09:58:49 -0400 -Subject: [PATCH 78/90] Fix up some man pages rpmdiff noticed. +Subject: [PATCH 094/123] Fix up some man pages rpmdiff noticed. --- configure.ac | 2 ++ @@ -13,7 +13,7 @@ Subject: [PATCH 78/90] Fix up some man pages rpmdiff noticed. create mode 100644 util/grub-syslinux2cfg.1 diff --git a/configure.ac b/configure.ac -index 67ff20c..25de2c1 100644 +index 67ff20cfd..25de2c12a 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,7 @@ grub_TRANSFORM([grub-fstest.3]) @@ -34,7 +34,7 @@ index 67ff20c..25de2c1 100644 if test "x$TARGET_CFLAGS" = x; then diff --git a/util/grub-macbless.8 b/util/grub-macbless.8 new file mode 100644 -index 0000000..ae842f3 +index 000000000..ae842f3a6 --- /dev/null +++ b/util/grub-macbless.8 @@ -0,0 +1,26 @@ @@ -65,7 +65,7 @@ index 0000000..ae842f3 +.SH SEE ALSO +.BR "info grub" diff --git a/util/grub-mkimage.1 b/util/grub-mkimage.1 -index 4dea4f5..0eaaafe 100644 +index 4dea4f545..0eaaafe50 100644 --- a/util/grub-mkimage.1 +++ b/util/grub-mkimage.1 @@ -17,7 +17,7 @@ @@ -79,7 +79,7 @@ index 4dea4f5..0eaaafe 100644 .TP diff --git a/util/grub-syslinux2cfg.1 b/util/grub-syslinux2cfg.1 new file mode 100644 -index 0000000..8530948 +index 000000000..853094827 --- /dev/null +++ b/util/grub-syslinux2cfg.1 @@ -0,0 +1,65 @@ @@ -149,5 +149,5 @@ index 0000000..8530948 +.SH SEE ALSO +.BR "info grub" -- -2.9.3 +2.14.3 diff --git a/0079-Handle-rssd-storage-devices.patch b/0095-Handle-rssd-storage-devices.patch similarity index 91% rename from 0079-Handle-rssd-storage-devices.patch rename to 0095-Handle-rssd-storage-devices.patch index c37338c..c91898a 100644 --- a/0079-Handle-rssd-storage-devices.patch +++ b/0095-Handle-rssd-storage-devices.patch @@ -1,7 +1,7 @@ From 90e2d3fbb161d494cdfc0ad0da740a6a4f651d70 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 Jun 2015 15:50:41 -0400 -Subject: [PATCH 79/90] Handle rssd storage devices. +Subject: [PATCH 095/123] Handle rssd storage devices. Resolves: rhbz#1087962 @@ -11,7 +11,7 @@ Signed-off-by: Peter Jones 1 file changed, 13 insertions(+) diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c -index 09e7e6e..ad7b774 100644 +index 09e7e6e6d..ad7b77411 100644 --- a/grub-core/osdep/linux/getroot.c +++ b/grub-core/osdep/linux/getroot.c @@ -898,6 +898,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st, @@ -35,5 +35,5 @@ index 09e7e6e..ad7b774 100644 if ((strncmp ("loop", p, 4) == 0) && p[4] >= '0' && p[4] <= '9') { -- -2.9.3 +2.14.3 diff --git a/0080-Warn-if-grub-password-will-not-be-read-1290803.patch b/0096-Warn-if-grub-password-will-not-be-read-1290803.patch similarity index 90% rename from 0080-Warn-if-grub-password-will-not-be-read-1290803.patch rename to 0096-Warn-if-grub-password-will-not-be-read-1290803.patch index 44c210d..4c690d6 100644 --- a/0080-Warn-if-grub-password-will-not-be-read-1290803.patch +++ b/0096-Warn-if-grub-password-will-not-be-read-1290803.patch @@ -1,7 +1,7 @@ From f46e9b0378cfaced22f0de5e8061ddb0c6829ee8 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Mon, 22 Feb 2016 15:30:05 -0500 -Subject: [PATCH 80/90] Warn if grub password will not be read (#1290803) +Subject: [PATCH 096/123] Warn if grub password will not be read (#1290803) It is possible for a system to have never run grub-mkconfig and add the section that reads the user.cfg file which contains a user set GRUB @@ -14,7 +14,7 @@ Resolves: rhbz#1290803 1 file changed, 5 insertions(+) diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in -index 2923f43..dd7b793 100644 +index 2923f437e..dd7b79326 100644 --- a/util/grub-setpassword.in +++ b/util/grub-setpassword.in @@ -121,3 +121,8 @@ fi @@ -27,5 +27,5 @@ index 2923f43..dd7b793 100644 + echo "Update your configuration with @grub_mkconfig@ to support this feature." +fi -- -2.9.3 +2.14.3 diff --git a/0081-Clean-up-grub-setpassword-documentation-1290799.patch b/0097-Clean-up-grub-setpassword-documentation-1290799.patch similarity index 92% rename from 0081-Clean-up-grub-setpassword-documentation-1290799.patch rename to 0097-Clean-up-grub-setpassword-documentation-1290799.patch index aa217ae..b385a5a 100644 --- a/0081-Clean-up-grub-setpassword-documentation-1290799.patch +++ b/0097-Clean-up-grub-setpassword-documentation-1290799.patch @@ -1,7 +1,7 @@ From f41adcd85164ef8a0d0918f0508f29dcf3c7467d Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Tue, 26 Jan 2016 10:28:35 -0500 -Subject: [PATCH 81/90] Clean up grub-setpassword documentation (#1290799) +Subject: [PATCH 097/123] Clean up grub-setpassword documentation (#1290799) The output for --help had some errors. Corrected those and polished the text to be a little easier to follow. Carried verbage over to man page @@ -14,7 +14,7 @@ Resolves: rhbz#1290799 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/util/grub-setpassword.8 b/util/grub-setpassword.8 -index 49200a8..dc91dd6 100644 +index 49200a848..dc91dd669 100644 --- a/util/grub-setpassword.8 +++ b/util/grub-setpassword.8 @@ -19,7 +19,7 @@ Display program usage and exit. @@ -27,7 +27,7 @@ index 49200a8..dc91dd6 100644 .SH SEE ALSO diff --git a/util/grub-setpassword.in b/util/grub-setpassword.in -index dd7b793..d7924af 100644 +index dd7b79326..d7924af51 100644 --- a/util/grub-setpassword.in +++ b/util/grub-setpassword.in @@ -16,15 +16,14 @@ grub_mkpasswd="${bindir}/@grub_mkpasswd_pbkdf2@" @@ -54,5 +54,5 @@ index dd7b793..d7924af 100644 Report bugs at https://bugzilla.redhat.com. EOF -- -2.9.3 +2.14.3 diff --git a/0082-Re-work-some-intricacies-of-PE-loading.patch b/0098-Re-work-some-intricacies-of-PE-loading.patch similarity index 98% rename from 0082-Re-work-some-intricacies-of-PE-loading.patch rename to 0098-Re-work-some-intricacies-of-PE-loading.patch index 094b519..38964f9 100644 --- a/0082-Re-work-some-intricacies-of-PE-loading.patch +++ b/0098-Re-work-some-intricacies-of-PE-loading.patch @@ -1,7 +1,7 @@ From e2b22111a8ec58091603fc785f54b1b998888735 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 9 Jun 2016 12:22:29 -0400 -Subject: [PATCH 82/90] Re-work some intricacies of PE loading. +Subject: [PATCH 098/123] Re-work some intricacies of PE loading. The PE spec is not a well written document, and awesomely every place where there's an ambiguous way to read something, Windows' bootmgfw.efi @@ -12,7 +12,7 @@ takes a different read than either of them. 2 files changed, 152 insertions(+), 36 deletions(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index c4184fa..323f873 100644 +index c4184fa64..323f8738b 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -297,7 +297,7 @@ image_is_64_bit (grub_pe_header_t *pe_hdr) @@ -293,7 +293,7 @@ index c4184fa..323f873 100644 efi_call_1 (b->free_pool, buffer); diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h -index f79782e..8396bde 100644 +index f79782e1b..8396bde49 100644 --- a/include/grub/efi/pe32.h +++ b/include/grub/efi/pe32.h @@ -227,12 +227,18 @@ struct grub_pe32_section_table @@ -349,5 +349,5 @@ index f79782e..8396bde 100644 struct grub_pe32_header -- -2.9.3 +2.14.3 diff --git a/0083-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch b/0099-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch similarity index 96% rename from 0083-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch rename to 0099-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch index c0458e9..46a1895 100644 --- a/0083-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +++ b/0099-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch @@ -1,8 +1,8 @@ From 8b4deb97529ba7ff689a11639f2a5bfdb29ad2ea Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 10 Jun 2016 14:06:15 -0400 -Subject: [PATCH 83/90] Rework even more of efi chainload so non-sb cases work - right. +Subject: [PATCH 099/123] 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 is disabled, we will fall back to a correct load method for the efi @@ -51,7 +51,7 @@ Signed-off-by: Peter Jones 6 files changed, 99 insertions(+), 59 deletions(-) diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c -index a41b6c5..d74778b 100644 +index a41b6c5b8..d74778b0c 100644 --- a/grub-core/kern/efi/sb.c +++ b/grub-core/kern/efi/sb.c @@ -36,14 +36,20 @@ grub_efi_secure_boot (void) @@ -80,7 +80,7 @@ index a41b6c5..d74778b 100644 if (*secure_boot && !*setup_mode) ret = 1; diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c -index 4756ef7..f83820e 100644 +index 4756ef71f..f83820e61 100644 --- a/grub-core/loader/arm64/linux.c +++ b/grub-core/loader/arm64/linux.c @@ -251,6 +251,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), @@ -102,7 +102,7 @@ index 4756ef7..f83820e 100644 grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]); goto fail; diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 323f873..49a7662 100644 +index 323f8738b..49a7662fa 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -178,7 +178,6 @@ make_file_path (grub_efi_device_path_t *dp, const char *filename) @@ -163,10 +163,11 @@ index 323f873..49a7662 100644 } /* -@@ -793,9 +798,55 @@ grub_secureboot_chainloader_unload (void) +@@ -792,10 +797,56 @@ grub_secureboot_chainloader_unload (void) + return GRUB_ERR_NONE; } - static grub_err_t ++static grub_err_t +grub_load_and_start_image(void *boot_image) +{ + grub_efi_boot_services_t *b; @@ -206,7 +207,7 @@ index 323f873..49a7662 100644 + return 0; +} + -+static grub_err_t + static grub_err_t grub_secureboot_chainloader_boot (void) { - handle_image ((void *)address, fsize); @@ -303,7 +304,7 @@ index 323f873..49a7662 100644 grub_device_close (dev); diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c -index aea378a..8890bdf 100644 +index aea378adf..8890bdf05 100644 --- a/grub-core/loader/efi/linux.c +++ b/grub-core/loader/efi/linux.c @@ -33,21 +33,24 @@ struct grub_efi_shim_lock @@ -337,7 +338,7 @@ index aea378a..8890bdf 100644 typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *); diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 7ccf32d..82f75b7 100644 +index 7ccf32d9d..82f75b7f3 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -155,6 +155,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), @@ -369,7 +370,7 @@ index 7ccf32d..82f75b7 100644 goto fail; } diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h -index d9ede36..0033d93 100644 +index d9ede3677..0033d9305 100644 --- a/include/grub/efi/linux.h +++ b/include/grub/efi/linux.h @@ -22,7 +22,7 @@ @@ -382,5 +383,5 @@ index d9ede36..0033d93 100644 grub_err_t EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset, -- -2.9.3 +2.14.3 diff --git a/0084-linuxefi-fix-double-free-on-verification-failure.patch b/0100-linuxefi-fix-double-free-on-verification-failure.patch similarity index 85% rename from 0084-linuxefi-fix-double-free-on-verification-failure.patch rename to 0100-linuxefi-fix-double-free-on-verification-failure.patch index e783733..5d629f8 100644 --- a/0084-linuxefi-fix-double-free-on-verification-failure.patch +++ b/0100-linuxefi-fix-double-free-on-verification-failure.patch @@ -1,7 +1,7 @@ From 0a3a4d0b69b5d68f3e4b6b74fe2e6b5d4dcace4f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jun 2016 09:50:25 -0400 -Subject: [PATCH 84/90] linuxefi: fix double free on verification failure. +Subject: [PATCH 100/123] linuxefi: fix double free on verification failure. Signed-off-by: Peter Jones --- @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones 1 file changed, 1 deletion(-) diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c -index 82f75b7..010bf98 100644 +index 82f75b7f3..010bf982d 100644 --- a/grub-core/loader/i386/efi/linux.c +++ b/grub-core/loader/i386/efi/linux.c @@ -191,7 +191,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), @@ -21,5 +21,5 @@ index 82f75b7..010bf98 100644 } -- -2.9.3 +2.14.3 diff --git a/0085-fix-machine-type-test-in-30_os-prober.in.patch b/0101-fix-machine-type-test-in-30_os-prober.in.patch similarity index 84% rename from 0085-fix-machine-type-test-in-30_os-prober.in.patch rename to 0101-fix-machine-type-test-in-30_os-prober.in.patch index fa2b435..c059652 100644 --- a/0085-fix-machine-type-test-in-30_os-prober.in.patch +++ b/0101-fix-machine-type-test-in-30_os-prober.in.patch @@ -1,7 +1,7 @@ From be4d338b0c086e9cbbd2d353cd88abad67c000c9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 11 Jul 2016 13:36:45 -0400 -Subject: [PATCH 85/90] fix machine type test in 30_os-prober.in +Subject: [PATCH 101/123] fix machine type test in 30_os-prober.in Signed-off-by: Peter Jones --- @@ -9,7 +9,7 @@ Signed-off-by: Peter Jones 1 file changed, 1 insertion(+) diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in -index dc98eac..e40274f 100644 +index dc98eace9..e40274fc0 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -144,6 +144,7 @@ for OS in ${OSPROBED} ; do @@ -21,5 +21,5 @@ index dc98eac..e40274f 100644 i?86|x86_64) sixteenbit="16" -- -2.9.3 +2.14.3 diff --git a/0086-ppc64le-has-no-separate-boot-mount-1261926.patch b/0102-ppc64le-has-no-separate-boot-mount-1261926.patch similarity index 92% rename from 0086-ppc64le-has-no-separate-boot-mount-1261926.patch rename to 0102-ppc64le-has-no-separate-boot-mount-1261926.patch index 2b04641..fbae65d 100644 --- a/0086-ppc64le-has-no-separate-boot-mount-1261926.patch +++ b/0102-ppc64le-has-no-separate-boot-mount-1261926.patch @@ -1,7 +1,7 @@ From 12a2215a6f13f2503a9e38d84fff64789c6a34b7 Mon Sep 17 00:00:00 2001 From: Robert Marshall Date: Fri, 17 Jun 2016 11:47:34 -0400 -Subject: [PATCH 86/90] ppc64le has no separate /boot mount (#1261926) +Subject: [PATCH 102/123] ppc64le has no separate /boot mount (#1261926) The patch for rhbz#1212114 ensures that ppc64le systems sync grub config changes to disk prior to grub-mkconfig completion and a reboot. @@ -23,7 +23,7 @@ Resolves: rhbz#1261926 1 file changed, 9 deletions(-) diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 73a18f7..fb87247 100644 +index 73a18f723..fb8724708 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -294,12 +294,3 @@ fi @@ -40,5 +40,5 @@ index 73a18f7..fb87247 100644 - sync && mountpoint -q /boot &&fsfreeze -f /boot && fsfreeze -u /boot -fi -- -2.9.3 +2.14.3 diff --git a/0087-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch b/0103-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch similarity index 94% rename from 0087-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch rename to 0103-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch index 5297ac6..7a0af44 100644 --- a/0087-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +++ b/0103-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch @@ -1,7 +1,7 @@ From d3d42740661dce4df12330e57a1681a3b296622e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 23 Jun 2016 11:01:39 -0400 -Subject: [PATCH 87/90] Add grub-get-kernel-settings and use it in 10_linux +Subject: [PATCH 103/123] Add grub-get-kernel-settings and use it in 10_linux This patch adds grub-get-kernel-settings, which reads the system kernel installation configuration from /etc/sysconfig/kernel, and outputs @@ -24,7 +24,7 @@ Resolves: rhbz#1226325 create mode 100644 util/grub-get-kernel-settings.in diff --git a/.gitignore b/.gitignore -index 53a391e..f2f1ef5 100644 +index 53a391e62..f2f1ef59c 100644 --- a/.gitignore +++ b/.gitignore @@ -112,6 +112,7 @@ grub-emu-lite @@ -36,25 +36,25 @@ index 53a391e..f2f1ef5 100644 grub-install grub-kbdcomp diff --git a/Makefile.util.def b/Makefile.util.def -index 8007de9..38cdf4c 100644 +index 8007de945..38cdf4ccc 100644 --- a/Makefile.util.def +++ b/Makefile.util.def -@@ -716,6 +716,13 @@ script = { +@@ -715,6 +715,13 @@ script = { + installdir = sbin; }; - script = { ++script = { + name = grub-get-kernel-settings; + common = util/grub-get-kernel-settings.in; + mansection = 3; + installdir = sbin; +}; + -+script = { + script = { name = grub-set-default; common = util/grub-set-default.in; - mansection = 8; diff --git a/configure.ac b/configure.ac -index 25de2c1..1d8f7e7 100644 +index 25de2c12a..1d8f7e745 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,7 @@ grub_TRANSFORM([grub-install]) @@ -74,13 +74,14 @@ index 25de2c1..1d8f7e7 100644 grub_TRANSFORM([grub-install.1]) grub_TRANSFORM([grub-kbdcomp.3]) diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in -index 44bf135..5c4acd4 100644 +index 44bf135b9..5c4acd496 100644 --- a/util/bash-completion.d/grub-completion.bash.in +++ b/util/bash-completion.d/grub-completion.bash.in -@@ -265,6 +265,28 @@ unset __grub_sparc64_setup_program +@@ -264,6 +264,28 @@ have ${__grub_sparc64_setup_program} && \ + unset __grub_sparc64_setup_program - # ++# +# grub-get-kernel-settings +# +_grub_get_kernel_settings () { @@ -102,13 +103,12 @@ index 44bf135..5c4acd4 100644 +unset __grub_get_kernel_settings_program + + -+# + # # grub-install # - _grub_install () { diff --git a/util/grub-get-kernel-settings.3 b/util/grub-get-kernel-settings.3 new file mode 100644 -index 0000000..ba33330 +index 000000000..ba33330e2 --- /dev/null +++ b/util/grub-get-kernel-settings.3 @@ -0,0 +1,20 @@ @@ -134,7 +134,7 @@ index 0000000..ba33330 +.BR "info grub" diff --git a/util/grub-get-kernel-settings.in b/util/grub-get-kernel-settings.in new file mode 100644 -index 0000000..1204621 +index 000000000..120462198 --- /dev/null +++ b/util/grub-get-kernel-settings.in @@ -0,0 +1,78 @@ @@ -217,7 +217,7 @@ index 0000000..1204621 + echo export GRUB_LINUX_DEBUG_TITLE_POSTFIX +fi diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index fb87247..e32de5e 100644 +index fb8724708..e32de5ef3 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -45,6 +45,7 @@ grub_probe="${sbindir}/@grub_probe@" @@ -238,7 +238,7 @@ index fb87247..e32de5e 100644 GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED" fi diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 1215241..0c5b227 100644 +index 121524185..0c5b227a4 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -84,7 +84,8 @@ linux_entry () @@ -298,5 +298,5 @@ index 1215241..0c5b227 100644 fi -- -2.9.3 +2.14.3 diff --git a/0088-Normalize-slashes-in-tftp-paths.patch b/0104-Normalize-slashes-in-tftp-paths.patch similarity index 94% rename from 0088-Normalize-slashes-in-tftp-paths.patch rename to 0104-Normalize-slashes-in-tftp-paths.patch index ffaaf81..4592753 100644 --- a/0088-Normalize-slashes-in-tftp-paths.patch +++ b/0104-Normalize-slashes-in-tftp-paths.patch @@ -1,7 +1,7 @@ From 22d26153c1d92b8a42d1ec823b7f7c77c1cc0a8c Mon Sep 17 00:00:00 2001 From: Lenny Szubowicz Date: Mon, 29 Aug 2016 11:04:48 -0400 -Subject: [PATCH 88/90] Normalize slashes in tftp paths. +Subject: [PATCH 104/123] Normalize slashes in tftp paths. Some tftp servers do not handle multiple consecutive slashes correctly; this patch avoids sending tftp requests with non-normalized paths. @@ -12,7 +12,7 @@ Signed-off-by: Peter Jones 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c -index 7d90bf6..63bbc28 100644 +index 7d90bf66e..63bbc28ef 100644 --- a/grub-core/net/tftp.c +++ b/grub-core/net/tftp.c @@ -300,6 +300,25 @@ destroy_pq (tftp_data_t data) @@ -54,5 +54,5 @@ index 7d90bf6..63bbc28 100644 rrq += grub_strlen (filename) + 1; -- -2.9.3 +2.14.3 diff --git a/0089-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch b/0105-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch similarity index 92% rename from 0089-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch rename to 0105-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch index 05d297a..8222fda 100644 --- a/0089-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +++ b/0105-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch @@ -1,7 +1,7 @@ From 54d9b46779dab340984dde1077c4f2b685caf0b1 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 21 Nov 2016 15:34:00 +0100 -Subject: [PATCH 89/90] efi/chainloader: fix wrong sanity check in +Subject: [PATCH 105/123] efi/chainloader: fix wrong sanity check in relocate_coff() In relocate_coff(), the relocation entries are parsed from the original @@ -22,7 +22,7 @@ Tested-by: Juan Orti 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 49a7662..1bd7ffb 100644 +index 49a7662fa..1bd7ffb31 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -397,7 +397,7 @@ relocate_coff (pe_coff_loader_image_context_t *context, @@ -35,5 +35,5 @@ index 49a7662..1bd7ffb 100644 grub_error (GRUB_ERR_BAD_ARGUMENT, "Reloc entry %d overflows binary", n); -- -2.9.3 +2.14.3 diff --git a/0090-efi-chainloader-truncate-overlong-relocation-section.patch b/0106-efi-chainloader-truncate-overlong-relocation-section.patch similarity index 97% rename from 0090-efi-chainloader-truncate-overlong-relocation-section.patch rename to 0106-efi-chainloader-truncate-overlong-relocation-section.patch index 372c069..c45658e 100644 --- a/0090-efi-chainloader-truncate-overlong-relocation-section.patch +++ b/0106-efi-chainloader-truncate-overlong-relocation-section.patch @@ -1,7 +1,7 @@ From e85054f3b65bdb2afe2a71062f8145d9fef63051 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 23 Nov 2016 06:27:09 +0100 -Subject: [PATCH 90/90] efi/chainloader: truncate overlong relocation section +Subject: [PATCH 106/123] efi/chainloader: truncate overlong relocation section The UEFI Windows 7 boot loader ("EFI/Microsoft/Boot/bootmgfw.efi", SHA1 31b410e029bba87d2068c65a80b88882f9f8ea25) has inconsistent headers. @@ -63,7 +63,7 @@ Signed-off-by: Laszlo Ersek 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c -index 1bd7ffb..70c95ee 100644 +index 1bd7ffb31..70c95ee35 100644 --- a/grub-core/loader/efi/chainloader.c +++ b/grub-core/loader/efi/chainloader.c @@ -592,7 +592,7 @@ handle_image (void *data, grub_efi_uint32_t datasize) @@ -109,5 +109,5 @@ index 1bd7ffb..70c95ee 100644 grub_dprintf ("chain", " section is not reloc section?\n"); grub_dprintf ("chain", " rds: 0x%08x, vs: %08x\n", -- -2.9.3 +2.14.3 diff --git a/0091-Fix-malformed-tftp-packets.patch b/0107-Fix-malformed-tftp-packets.patch similarity index 95% rename from 0091-Fix-malformed-tftp-packets.patch rename to 0107-Fix-malformed-tftp-packets.patch index d6fc8c9..e7e3071 100644 --- a/0091-Fix-malformed-tftp-packets.patch +++ b/0107-Fix-malformed-tftp-packets.patch @@ -1,7 +1,7 @@ From 20e077f4b5be64518b8ff996c11973132e8a9ff3 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Tue, 7 Mar 2017 18:26:17 -0500 -Subject: [PATCH 091/105] Fix malformed tftp packets +Subject: [PATCH 107/123] 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. @@ -31,5 +31,5 @@ index 63bbc28ef..c4b5205d0 100644 grub_strcpy (rrq, "octet"); rrqlen += grub_strlen ("octet") + 1; -- -2.13.0 +2.14.3 diff --git a/0092-bz1374141-fix-incorrect-mask-for-ppc64.patch b/0108-bz1374141-fix-incorrect-mask-for-ppc64.patch similarity index 97% rename from 0092-bz1374141-fix-incorrect-mask-for-ppc64.patch rename to 0108-bz1374141-fix-incorrect-mask-for-ppc64.patch index dc77074..f07f50d 100644 --- a/0092-bz1374141-fix-incorrect-mask-for-ppc64.patch +++ b/0108-bz1374141-fix-incorrect-mask-for-ppc64.patch @@ -1,7 +1,7 @@ From 3c49ce8c64b74f535891dd0caa420f1b9dfd9b60 Mon Sep 17 00:00:00 2001 From: Masahiro Matsuya Date: Sat, 29 Oct 2016 08:35:26 +0900 -Subject: [PATCH 092/105] bz1374141 fix incorrect mask for ppc64 +Subject: [PATCH 108/123] 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,5 +43,5 @@ index 6bd3b922e..efc4e175a 100644 if (gateway_addr.ipv4 != 0) -- -2.13.0 +2.14.3 diff --git a/0093-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch b/0109-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch similarity index 99% rename from 0093-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch rename to 0109-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch index 27d7d65..0ce5b21 100644 --- a/0093-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch +++ b/0109-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch @@ -1,7 +1,7 @@ From a159c349f05b21f4d3d7c876200f94481ae1a081 Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Tue, 4 Apr 2017 19:23:55 +0300 -Subject: [PATCH 093/105] i386, x86_64, ppc: fix switch fallthrough cases with +Subject: [PATCH 109/123] i386, x86_64, ppc: fix switch fallthrough cases with GCC7 In util/getroot and efidisk slightly modify exitsing comment to mostly @@ -310,5 +310,5 @@ index aca5f82e3..a25db8a71 100644 if (!arg) return 0; -- -2.13.0 +2.14.3 diff --git a/0094-Work-around-autoconf-2.69-having-a-terrible-AC_HEADE.patch b/0110-Work-around-autoconf-2.69-having-a-terrible-AC_HEADE.patch similarity index 96% rename from 0094-Work-around-autoconf-2.69-having-a-terrible-AC_HEADE.patch rename to 0110-Work-around-autoconf-2.69-having-a-terrible-AC_HEADE.patch index c167995..65f400c 100644 --- a/0094-Work-around-autoconf-2.69-having-a-terrible-AC_HEADE.patch +++ b/0110-Work-around-autoconf-2.69-having-a-terrible-AC_HEADE.patch @@ -1,7 +1,7 @@ From bc96a64f7947ef8c09f59392ec63ddf0937d20f9 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:31:46 -0400 -Subject: [PATCH 094/105] Work around autoconf 2.69 having a terrible +Subject: [PATCH 110/123] Work around autoconf 2.69 having a terrible AC_HEADER_MAJOR --- @@ -61,5 +61,5 @@ index 1d8f7e745..70204bbf0 100644 AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$ac_includes_default #include -- -2.13.0 +2.14.3 diff --git a/0095-Fix-a-btrfs-read-before-init-bug.patch b/0111-Fix-a-btrfs-read-before-init-bug.patch similarity index 95% rename from 0095-Fix-a-btrfs-read-before-init-bug.patch rename to 0111-Fix-a-btrfs-read-before-init-bug.patch index fdad7f1..7133dbc 100644 --- a/0095-Fix-a-btrfs-read-before-init-bug.patch +++ b/0111-Fix-a-btrfs-read-before-init-bug.patch @@ -1,7 +1,7 @@ From de37bf80fed16a991a9218ca5fb73008f59cd689 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:35:47 -0400 -Subject: [PATCH 095/105] Fix a btrfs read-before-init bug +Subject: [PATCH 111/123] Fix a btrfs read-before-init bug --- grub-core/fs/btrfs.c | 9 +++++---- @@ -35,5 +35,5 @@ index 9cffa91fa..cb25b9ddd 100644 if ((err == GRUB_ERR_OUT_OF_RANGE || !err) && i == 0) -- -2.13.0 +2.14.3 diff --git a/0096-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch b/0112-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch similarity index 95% rename from 0096-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch rename to 0112-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch index b28346a..a6f60de 100644 --- a/0096-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +++ b/0112-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch @@ -1,7 +1,7 @@ From e26bdce564d529852f8f3d27874dc15467839033 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:42:57 -0400 -Subject: [PATCH 096/105] Don't use dynamic sized arrays since we don't build +Subject: [PATCH 112/123] Don't use dynamic sized arrays since we don't build with -std=c99 --- @@ -42,5 +42,5 @@ index 16d2ce06d..b4325750f 100644 { grub_strcpy (suffix, client_uuid); -- -2.13.0 +2.14.3 diff --git a/0097-don-t-ignore-const.patch b/0113-don-t-ignore-const.patch similarity index 92% rename from 0097-don-t-ignore-const.patch rename to 0113-don-t-ignore-const.patch index 14a65f3..6e0a983 100644 --- a/0097-don-t-ignore-const.patch +++ b/0113-don-t-ignore-const.patch @@ -1,7 +1,7 @@ From f2b28326d5aa2cdcaa56def8a806fbcc23962c03 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:43:22 -0400 -Subject: [PATCH 097/105] don't ignore const +Subject: [PATCH 113/123] don't ignore const --- grub-core/net/tftp.c | 2 +- @@ -21,5 +21,5 @@ index c4b5205d0..dd4ce6b23 100644 while (*src != '\0') { -- -2.13.0 +2.14.3 diff --git a/0098-don-t-use-int-for-efi-status.patch b/0114-don-t-use-int-for-efi-status.patch similarity index 91% rename from 0098-don-t-use-int-for-efi-status.patch rename to 0114-don-t-use-int-for-efi-status.patch index b5eaeda..1a27b3d 100644 --- a/0098-don-t-use-int-for-efi-status.patch +++ b/0114-don-t-use-int-for-efi-status.patch @@ -1,7 +1,7 @@ From c694f0875585ed90c1429c7ea28be55613c5e817 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:44:59 -0400 -Subject: [PATCH 098/105] don't use int for efi status +Subject: [PATCH 114/123] don't use int for efi status --- grub-core/kern/efi/efi.c | 2 +- @@ -21,5 +21,5 @@ index 101307fc7..e22c97675 100644 if (retval == 0) rc = GRUB_EFI_SUCCESS; -- -2.13.0 +2.14.3 diff --git a/0099-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch b/0115-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch similarity index 92% rename from 0099-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch rename to 0115-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch index 0fc88d2..2a6c612 100644 --- a/0099-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +++ b/0115-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch @@ -1,7 +1,7 @@ From cd15c392fb277ea7a98fe9cc25e12b8bea703aaf Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 26 Jun 2017 12:46:23 -0400 -Subject: [PATCH 099/105] make GRUB_MOD_INIT() declare its function prototypes. +Subject: [PATCH 115/123] make GRUB_MOD_INIT() declare its function prototypes. --- include/grub/dl.h | 2 ++ @@ -28,5 +28,5 @@ index 9562fa663..5ed58858e 100644 grub_##name##_fini (void) { grub_mod_fini (); } \ static void \ -- -2.13.0 +2.14.3 diff --git a/0100-Add-some-grub_dprintf-in-the-linuxefi-path.patch b/0116-Add-some-grub_dprintf-in-the-linuxefi-path.patch similarity index 97% rename from 0100-Add-some-grub_dprintf-in-the-linuxefi-path.patch rename to 0116-Add-some-grub_dprintf-in-the-linuxefi-path.patch index 754bb54..1f8ec57 100644 --- a/0100-Add-some-grub_dprintf-in-the-linuxefi-path.patch +++ b/0116-Add-some-grub_dprintf-in-the-linuxefi-path.patch @@ -1,7 +1,7 @@ From 9fb8798e6c8a2241e157de414460f1d7dab89c00 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 9 May 2016 14:15:17 -0400 -Subject: [PATCH 100/105] Add some grub_dprintf() in the linuxefi path. +Subject: [PATCH 116/123] Add some grub_dprintf() in the linuxefi path. Signed-off-by: Peter Jones --- @@ -84,5 +84,5 @@ index 010bf982d..a95e29700 100644 grub_file_close (file); -- -2.13.0 +2.14.3 diff --git a/0101-linuxefi-minor-cleanups.patch b/0117-linuxefi-minor-cleanups.patch similarity index 98% rename from 0101-linuxefi-minor-cleanups.patch rename to 0117-linuxefi-minor-cleanups.patch index df59162..cf37779 100644 --- a/0101-linuxefi-minor-cleanups.patch +++ b/0117-linuxefi-minor-cleanups.patch @@ -1,7 +1,7 @@ From 5678a5ad6b2560a293f757c0c74b3da45619bb9f Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:31:52 -0500 -Subject: [PATCH 101/105] linuxefi: minor cleanups +Subject: [PATCH 117/123] linuxefi: minor cleanups Signed-off-by: Peter Jones --- @@ -85,5 +85,5 @@ index a95e29700..806031838 100644 return grub_errno; } -- -2.13.0 +2.14.3 diff --git a/0102-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch b/0118-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch similarity index 99% rename from 0102-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch rename to 0118-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch index 5681b37..07cd757 100644 --- a/0102-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +++ b/0118-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch @@ -1,7 +1,7 @@ From a6a55b951426419d5db76916b97bfeb2a505fff5 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Feb 2017 16:18:54 -0500 -Subject: [PATCH 102/105] Handle multi-arch (64-on-32) boot in linuxefi loader. +Subject: [PATCH 118/123] Handle multi-arch (64-on-32) boot in linuxefi loader. Allow booting 64-bit kernels on 32-bit EFI on x86. @@ -257,5 +257,5 @@ index fc36bdaf3..110ecf806 100644 grub_uint32_t hardware_subarch; grub_uint64_t hardware_subarch_data; -- -2.13.0 +2.14.3 diff --git a/0103-Clean-up-some-errors-in-the-linuxefi-loader.patch b/0119-Clean-up-some-errors-in-the-linuxefi-loader.patch similarity index 97% rename from 0103-Clean-up-some-errors-in-the-linuxefi-loader.patch rename to 0119-Clean-up-some-errors-in-the-linuxefi-loader.patch index 6cde434..05ec225 100644 --- a/0103-Clean-up-some-errors-in-the-linuxefi-loader.patch +++ b/0119-Clean-up-some-errors-in-the-linuxefi-loader.patch @@ -1,7 +1,7 @@ From 266bbbe624274a0eb174bb294c70e197848f3991 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 24 May 2017 15:58:18 -0400 -Subject: [PATCH 103/105] Clean up some errors in the linuxefi loader +Subject: [PATCH 119/123] Clean up some errors in the linuxefi loader Signed-off-by: Peter Jones --- @@ -74,5 +74,5 @@ index 52dc71903..19950d2f2 100644 linux_cmdline, BYTES_TO_PAGES(lh->cmdline_size + 1)); -- -2.13.0 +2.14.3 diff --git a/0104-Fix-up-linux-params-usage.patch b/0120-Fix-up-linux-params-usage.patch similarity index 96% rename from 0104-Fix-up-linux-params-usage.patch rename to 0120-Fix-up-linux-params-usage.patch index d744ea5..98e6713 100644 --- a/0104-Fix-up-linux-params-usage.patch +++ b/0120-Fix-up-linux-params-usage.patch @@ -1,7 +1,7 @@ From 3019712d45a7934a2bf21de8e2745c03701b05cc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 30 May 2017 14:16:07 -0400 -Subject: [PATCH 104/105] Fix up linux params usage... +Subject: [PATCH 120/123] Fix up linux params usage... Related: rhbz#1310763 @@ -41,5 +41,5 @@ index b1335f9ed..763863abe 100644 linux_params.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE; -- -2.13.0 +2.14.3 diff --git a/0105-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch b/0121-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch similarity index 95% rename from 0105-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch rename to 0121-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch index 69cabc4..ddb9057 100644 --- a/0105-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +++ b/0121-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch @@ -1,7 +1,7 @@ From c38aad7b173cbe4e84fb52efbd4ef6a03503a3b1 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Mon, 17 Apr 2017 08:44:29 -0400 -Subject: [PATCH 105/105] arm64: make sure fdt has #address-cells and +Subject: [PATCH 121/123] arm64: make sure fdt has #address-cells and #size-cells properties Recent upstream changes to kexec-tools relies on #address-cells @@ -41,5 +41,5 @@ index f83820e61..f32151f3b 100644 if (node < 1) goto failure; -- -2.13.0 +2.14.3 diff --git a/0122-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch b/0122-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch new file mode 100644 index 0000000..92a5b56 --- /dev/null +++ b/0122-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch @@ -0,0 +1,32 @@ +From 8a8023951ccdf08035a58cefe6ff98098e2c4029 Mon Sep 17 00:00:00 2001 +From: "David E. Box" +Date: Fri, 15 Sep 2017 15:37:05 -0700 +Subject: [PATCH 122/123] 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 +the pit. + +Signed-off-by: David E. Box +Reviewed-by: Daniel Kiper +--- + grub-core/kern/i386/tsc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c +index 2e85289d8..f266eb131 100644 +--- a/grub-core/kern/i386/tsc.c ++++ b/grub-core/kern/i386/tsc.c +@@ -68,7 +68,7 @@ grub_tsc_init (void) + #ifdef GRUB_MACHINE_XEN + (void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode()); + #elif defined (GRUB_MACHINE_EFI) +- (void) (grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode()); ++ (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode()); + #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/0123-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch b/0123-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch new file mode 100644 index 0000000..c3716f7 --- /dev/null +++ b/0123-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch @@ -0,0 +1,96 @@ +From 1b536bd5c774e5ce9ff5fcefff141eebf6d4ce07 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Tue, 7 Nov 2017 17:12:17 -0500 +Subject: [PATCH 123/123] 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 +using pmtimer will fail presuming a broken pmtimer, it takes ~51 seconds +to do so (as measured with the stopwatch on my phone), with a tsc delta +of 0x1cd1c85300, or around 125 billion cycles. + +If instead of trying to wait for 5-200ms to show up on the pmtimer, we try +to wait for 5-200us, it decides it's broken in ~0x7998f9e TSCs, aka ~2 +million cycles, or more or less instantly. + +Additionally, this reading the pmtimer was returning 0xffffffff anyway, +and that's obviously an invalid return. I've added a check for that and +0 so we don't bother waiting for the test if what we're seeing is dead +pins with no response at all. + +Signed-off-by: Peter Jones +--- + grub-core/kern/i386/tsc_pmtimer.c | 43 ++++++++++++++++++++++++++++++--------- + 1 file changed, 33 insertions(+), 10 deletions(-) + +diff --git a/grub-core/kern/i386/tsc_pmtimer.c b/grub-core/kern/i386/tsc_pmtimer.c +index c9c361699..609402b83 100644 +--- a/grub-core/kern/i386/tsc_pmtimer.c ++++ b/grub-core/kern/i386/tsc_pmtimer.c +@@ -38,30 +38,53 @@ grub_pmtimer_wait_count_tsc (grub_port_t pmtimer, + grub_uint64_t start_tsc; + grub_uint64_t end_tsc; + int num_iter = 0; ++ int bad_reads = 0; + +- start = grub_inl (pmtimer) & 0xffffff; ++ start = grub_inl (pmtimer) & 0x3fff; + last = start; + end = start + num_pm_ticks; + start_tsc = grub_get_tsc (); + while (1) + { +- cur = grub_inl (pmtimer) & 0xffffff; ++ cur = grub_inl (pmtimer); ++ ++ /* If we get 10 reads in a row that are obviously dead pins, there's no ++ reason to do this thousands of times. ++ */ ++ if (cur == 0xffffffff || cur == 0) ++ { ++ bad_reads++; ++ grub_dprintf ("pmtimer", "cur: 0x%08x bad_reads: %d\n", cur, bad_reads); ++ ++ if (bad_reads == 10) ++ return 0; ++ } ++ else if (bad_reads) ++ bad_reads = 0; ++ ++ cur &= 0x3fff; ++ + if (cur < last) +- cur |= 0x1000000; ++ cur |= 0x4000; + num_iter++; + if (cur >= end) + { + end_tsc = grub_get_tsc (); ++ grub_dprintf ("pmtimer", "tsc delta is 0x%016lx\n", ++ end_tsc - start_tsc); + return end_tsc - start_tsc; + } +- /* Check for broken PM timer. +- 50000000 TSCs is between 5 ms (10GHz) and 200 ms (250 MHz) +- if after this time we still don't have 1 ms on pmtimer, then +- pmtimer is broken. ++ /* Check for broken PM timer. 5000 TSCs is between 5us (10GHz) and ++ 200us (250 MHz). If after this time we still don't have 1us on ++ pmtimer, then pmtimer is broken. + */ +- if ((num_iter & 0xffffff) == 0 && grub_get_tsc () - start_tsc > 5000000) { +- return 0; +- } ++ end_tsc = grub_get_tsc(); ++ if ((num_iter & 0x3fff) == 0 && end_tsc - start_tsc > 5000) ++ { ++ grub_dprintf ("pmtimer", "tsc delta is 0x%016lx\n", ++ end_tsc - start_tsc); ++ return 0; ++ } + } + } + +-- +2.14.3 + diff --git a/grub.patches b/grub.patches index 2c5c610..edb55a5 100644 --- a/grub.patches +++ b/grub.patches @@ -1,106 +1,123 @@ -Patch0000: grub-2.02-beta3-to-origin-master.patch -Patch0001: 0001-IBM-client-architecture-CAS-reboot-support.patch -Patch0002: 0002-for-ppc-reset-console-display-attr-when-clear-screen.patch -Patch0003: 0003-Disable-GRUB-video-support-for-IBM-power-machines.patch -Patch0004: 0004-Fix-bzr-s-ignore-artificats-in-.gitignore.patch -Patch0005: 0005-Honor-a-symlink-when-generating-configuration-by-gru.patch -Patch0006: 0006-Move-bash-completion-script-922997.patch -Patch0007: 0007-Update-to-minilzo-2.08.patch -Patch0008: 0008-Add-vlan-tag-support-on-IBM-PPC-machines.patch -Patch0009: 0009-Allow-fallback-to-include-entries-by-title-not-just-.patch -Patch0010: 0010-Add-GRUB_DISABLE_UUID.patch -Patch0011: 0011-Make-exit-take-a-return-code.patch -Patch0012: 0012-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch -Patch0013: 0013-Make-efi-machines-load-an-env-block-from-a-variable.patch -Patch0014: 0014-DHCP-client-ID-and-UUID-options-added.patch -Patch0015: 0015-trim-arp-packets-with-abnormal-size.patch -Patch0016: 0016-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch -Patch0017: 0017-Add-support-for-UEFI-operating-systems-returned-by-o.patch -Patch0018: 0018-Migrate-PPC-from-Yaboot-to-Grub2.patch -Patch0019: 0019-Add-fw_path-variable-revised.patch -Patch0020: 0020-Add-support-for-linuxefi.patch -Patch0021: 0021-Use-linuxefi-and-initrdefi-where-appropriate.patch -Patch0022: 0022-Don-t-allow-insmod-when-secure-boot-is-enabled.patch -Patch0023: 0023-Pass-x-hex-hex-straight-through-unmolested.patch -Patch0024: 0024-Add-X-option-to-printf-functions.patch -Patch0025: 0025-Search-for-specific-config-file-for-netboot.patch -Patch0026: 0026-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch -Patch0027: 0027-Don-t-write-messages-to-the-screen.patch -Patch0028: 0028-Don-t-print-GNU-GRUB-header.patch -Patch0029: 0029-Don-t-add-to-highlighted-row.patch -Patch0030: 0030-Message-string-cleanups.patch -Patch0031: 0031-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch -Patch0032: 0032-Use-the-correct-indentation-for-the-term-help-text.patch -Patch0033: 0033-Indent-menu-entries.patch -Patch0034: 0034-Fix-margins.patch -Patch0035: 0035-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch -Patch0036: 0036-Use-linux16-when-appropriate-880840.patch -Patch0037: 0037-Enable-pager-by-default.-985860.patch -Patch0038: 0038-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch -Patch0039: 0039-Don-t-say-GNU-Linux-in-generated-menus.patch -Patch0040: 0040-Don-t-draw-a-border-around-the-menu.patch -Patch0041: 0041-Use-the-standard-margin-for-the-timeout-string.patch -Patch0042: 0042-Add-.eh_frame-to-list-of-relocations-stripped.patch -Patch0043: 0043-Make-10_linux-work-with-our-changes-for-linux16-and-.patch -Patch0044: 0044-Don-t-print-during-fdt-loading-method.patch -Patch0045: 0045-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch -Patch0046: 0046-Don-t-require-a-password-to-boot-entries-generated-b.patch -Patch0047: 0047-Don-t-emit-Booting-.-message.patch -Patch0048: 0048-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch -Patch0049: 0049-use-fw_path-prefix-when-fallback-searching-for-grub-.patch -Patch0050: 0050-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch -Patch0051: 0051-Fix-convert-function-to-support-NVMe-devices.patch -Patch0052: 0052-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch -Patch0053: 0053-Use-the-default-device-tree-from-the-grub-default-fi.patch -Patch0054: 0054-reopen-SNP-protocol-for-exclusive-use-by-grub.patch -Patch0055: 0055-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch -Patch0056: 0056-Add-grub_util_readlink.patch -Patch0057: 0057-Make-editenv-chase-symlinks-including-those-across-d.patch -Patch0058: 0058-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch -Patch0059: 0059-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch -Patch0060: 0060-Load-arm-with-SB-enabled.patch -Patch0061: 0061-Try-prefix-if-fw_path-doesn-t-work.patch -Patch0062: 0062-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch -Patch0063: 0063-Make-grub2-mkconfig-construct-titles-that-look-like-.patch -Patch0064: 0064-Update-info-with-grub.cfg-netboot-selection-order-11.patch -Patch0065: 0065-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch -Patch0066: 0066-Add-friendly-grub2-password-config-tool-985962.patch -Patch0067: 0067-Fix-race-in-EFI-validation.patch -Patch0068: 0068-ppc64le-sync-mkconfig-to-disk-1212114.patch -Patch0069: 0069-Use-device-part-of-chainloader-target-if-present.patch -Patch0070: 0070-Add-secureboot-support-on-efi-chainloader.patch -Patch0071: 0071-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch -Patch0072: 0072-Fix-security-issue-when-reading-username-and-passwor.patch -Patch0073: 0073-Make-grub_fatal-also-backtrace.patch -Patch0074: 0074-Rework-linux-command.patch -Patch0075: 0075-Rework-linux16-command.patch -Patch0076: 0076-Make-grub-editenv-build-again.patch -Patch0077: 0077-Fix-locale-issue-in-grub-setpassword-1294243.patch -Patch0078: 0078-Fix-up-some-man-pages-rpmdiff-noticed.patch -Patch0079: 0079-Handle-rssd-storage-devices.patch -Patch0080: 0080-Warn-if-grub-password-will-not-be-read-1290803.patch -Patch0081: 0081-Clean-up-grub-setpassword-documentation-1290799.patch -Patch0082: 0082-Re-work-some-intricacies-of-PE-loading.patch -Patch0083: 0083-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch -Patch0084: 0084-linuxefi-fix-double-free-on-verification-failure.patch -Patch0085: 0085-fix-machine-type-test-in-30_os-prober.in.patch -Patch0086: 0086-ppc64le-has-no-separate-boot-mount-1261926.patch -Patch0087: 0087-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch -Patch0088: 0088-Normalize-slashes-in-tftp-paths.patch -Patch0089: 0089-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch -Patch0090: 0090-efi-chainloader-truncate-overlong-relocation-section.patch -Patch0091: 0091-Fix-malformed-tftp-packets.patch -Patch0092: 0092-bz1374141-fix-incorrect-mask-for-ppc64.patch -Patch0093: 0093-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch -Patch0094: 0094-Work-around-autoconf-2.69-having-a-terrible-AC_HEADE.patch -Patch0095: 0095-Fix-a-btrfs-read-before-init-bug.patch -Patch0096: 0096-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch -Patch0097: 0097-don-t-ignore-const.patch -Patch0098: 0098-don-t-use-int-for-efi-status.patch -Patch0099: 0099-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch -Patch0100: 0100-Add-some-grub_dprintf-in-the-linuxefi-path.patch -Patch0101: 0101-linuxefi-minor-cleanups.patch -Patch0102: 0102-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch -Patch0103: 0103-Clean-up-some-errors-in-the-linuxefi-loader.patch -Patch0104: 0104-Fix-up-linux-params-usage.patch -Patch0105: 0105-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +Patch0001: 0001-NEWS-update.patch +Patch0002: 0002-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch +Patch0003: 0003-20_linux_xen-fix-test-for-GRUB_DEVICE.patch +Patch0004: 0004-multiboot2-Remove-useless-GRUB_PACKED.patch +Patch0005: 0005-xen_file-Fix-invalid-payload-size.patch +Patch0006: 0006-Failed-config-now-returns-exit-code-1252311.patch +Patch0007: 0007-Makefile.util.def-add-LIBINTL-to-grub-macbless-flags.patch +Patch0008: 0008-Remove-the-variable-oldname-which-is-attempting-to-f.patch +Patch0009: 0009-bootp-fix-memory-leak-in-grub_cmd_dhcpopt.patch +Patch0010: 0010-bootp-check-that-interface-is-not-NULL-in-configure_.patch +Patch0011: 0011-configure-set-fno-pie-together-with-fno-PIE.patch +Patch0012: 0012-http-fix-superfluous-null-line-in-range-request-head.patch +Patch0013: 0013-build-Use-AC_HEADER_MAJOR-to-find-device-macros.patch +Patch0014: 0014-http-reset-EOF-indication-in-http_seek.patch +Patch0015: 0015-net-reset-net-stall-in-grub_net_seek_real.patch +Patch0016: 0016-net-translate-pxe-prefix-to-tftp-when-checking-for-s.patch +Patch0017: 0017-IBM-client-architecture-CAS-reboot-support.patch +Patch0018: 0018-for-ppc-reset-console-display-attr-when-clear-screen.patch +Patch0019: 0019-Disable-GRUB-video-support-for-IBM-power-machines.patch +Patch0020: 0020-Fix-bzr-s-ignore-artificats-in-.gitignore.patch +Patch0021: 0021-Honor-a-symlink-when-generating-configuration-by-gru.patch +Patch0022: 0022-Move-bash-completion-script-922997.patch +Patch0023: 0023-Update-to-minilzo-2.08.patch +Patch0024: 0024-Add-vlan-tag-support-on-IBM-PPC-machines.patch +Patch0025: 0025-Allow-fallback-to-include-entries-by-title-not-just-.patch +Patch0026: 0026-Add-GRUB_DISABLE_UUID.patch +Patch0027: 0027-Make-exit-take-a-return-code.patch +Patch0028: 0028-Mark-po-exclude.pot-as-binary-so-git-won-t-try-to-di.patch +Patch0029: 0029-Make-efi-machines-load-an-env-block-from-a-variable.patch +Patch0030: 0030-DHCP-client-ID-and-UUID-options-added.patch +Patch0031: 0031-trim-arp-packets-with-abnormal-size.patch +Patch0032: 0032-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch +Patch0033: 0033-Add-support-for-UEFI-operating-systems-returned-by-o.patch +Patch0034: 0034-Migrate-PPC-from-Yaboot-to-Grub2.patch +Patch0035: 0035-Add-fw_path-variable-revised.patch +Patch0036: 0036-Add-support-for-linuxefi.patch +Patch0037: 0037-Use-linuxefi-and-initrdefi-where-appropriate.patch +Patch0038: 0038-Don-t-allow-insmod-when-secure-boot-is-enabled.patch +Patch0039: 0039-Pass-x-hex-hex-straight-through-unmolested.patch +Patch0040: 0040-Add-X-option-to-printf-functions.patch +Patch0041: 0041-Search-for-specific-config-file-for-netboot.patch +Patch0042: 0042-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +Patch0043: 0043-Don-t-write-messages-to-the-screen.patch +Patch0044: 0044-Don-t-print-GNU-GRUB-header.patch +Patch0045: 0045-Don-t-add-to-highlighted-row.patch +Patch0046: 0046-Message-string-cleanups.patch +Patch0047: 0047-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch +Patch0048: 0048-Use-the-correct-indentation-for-the-term-help-text.patch +Patch0049: 0049-Indent-menu-entries.patch +Patch0050: 0050-Fix-margins.patch +Patch0051: 0051-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch +Patch0052: 0052-Use-linux16-when-appropriate-880840.patch +Patch0053: 0053-Enable-pager-by-default.-985860.patch +Patch0054: 0054-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch +Patch0055: 0055-Don-t-say-GNU-Linux-in-generated-menus.patch +Patch0056: 0056-Don-t-draw-a-border-around-the-menu.patch +Patch0057: 0057-Use-the-standard-margin-for-the-timeout-string.patch +Patch0058: 0058-Add-.eh_frame-to-list-of-relocations-stripped.patch +Patch0059: 0059-Make-10_linux-work-with-our-changes-for-linux16-and-.patch +Patch0060: 0060-Don-t-print-during-fdt-loading-method.patch +Patch0061: 0061-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch +Patch0062: 0062-Don-t-require-a-password-to-boot-entries-generated-b.patch +Patch0063: 0063-Don-t-emit-Booting-.-message.patch +Patch0064: 0064-Replace-a-lot-of-man-pages-with-slightly-nicer-ones.patch +Patch0065: 0065-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +Patch0066: 0066-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +Patch0067: 0067-Fix-convert-function-to-support-NVMe-devices.patch +Patch0068: 0068-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch +Patch0069: 0069-Use-the-default-device-tree-from-the-grub-default-fi.patch +Patch0070: 0070-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +Patch0071: 0071-Revert-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +Patch0072: 0072-Add-grub_util_readlink.patch +Patch0073: 0073-Make-editenv-chase-symlinks-including-those-across-d.patch +Patch0074: 0074-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +Patch0075: 0075-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +Patch0076: 0076-Load-arm-with-SB-enabled.patch +Patch0077: 0077-Try-prefix-if-fw_path-doesn-t-work.patch +Patch0078: 0078-Try-to-emit-linux16-initrd16-and-linuxefi-initrdefi-.patch +Patch0079: 0079-Make-grub2-mkconfig-construct-titles-that-look-like-.patch +Patch0080: 0080-Update-info-with-grub.cfg-netboot-selection-order-11.patch +Patch0081: 0081-Use-Distribution-Package-Sort-for-grub2-mkconfig-112.patch +Patch0082: 0082-Add-friendly-grub2-password-config-tool-985962.patch +Patch0083: 0083-Fix-race-in-EFI-validation.patch +Patch0084: 0084-ppc64le-sync-mkconfig-to-disk-1212114.patch +Patch0085: 0085-Use-device-part-of-chainloader-target-if-present.patch +Patch0086: 0086-Add-secureboot-support-on-efi-chainloader.patch +Patch0087: 0087-Make-any-of-the-loaders-that-link-in-efi-mode-honor-.patch +Patch0088: 0088-Fix-security-issue-when-reading-username-and-passwor.patch +Patch0089: 0089-Make-grub_fatal-also-backtrace.patch +Patch0090: 0090-Rework-linux-command.patch +Patch0091: 0091-Rework-linux16-command.patch +Patch0092: 0092-Make-grub-editenv-build-again.patch +Patch0093: 0093-Fix-locale-issue-in-grub-setpassword-1294243.patch +Patch0094: 0094-Fix-up-some-man-pages-rpmdiff-noticed.patch +Patch0095: 0095-Handle-rssd-storage-devices.patch +Patch0096: 0096-Warn-if-grub-password-will-not-be-read-1290803.patch +Patch0097: 0097-Clean-up-grub-setpassword-documentation-1290799.patch +Patch0098: 0098-Re-work-some-intricacies-of-PE-loading.patch +Patch0099: 0099-Rework-even-more-of-efi-chainload-so-non-sb-cases-wo.patch +Patch0100: 0100-linuxefi-fix-double-free-on-verification-failure.patch +Patch0101: 0101-fix-machine-type-test-in-30_os-prober.in.patch +Patch0102: 0102-ppc64le-has-no-separate-boot-mount-1261926.patch +Patch0103: 0103-Add-grub-get-kernel-settings-and-use-it-in-10_linux.patch +Patch0104: 0104-Normalize-slashes-in-tftp-paths.patch +Patch0105: 0105-efi-chainloader-fix-wrong-sanity-check-in-relocate_c.patch +Patch0106: 0106-efi-chainloader-truncate-overlong-relocation-section.patch +Patch0107: 0107-Fix-malformed-tftp-packets.patch +Patch0108: 0108-bz1374141-fix-incorrect-mask-for-ppc64.patch +Patch0109: 0109-i386-x86_64-ppc-fix-switch-fallthrough-cases-with-GC.patch +Patch0110: 0110-Work-around-autoconf-2.69-having-a-terrible-AC_HEADE.patch +Patch0111: 0111-Fix-a-btrfs-read-before-init-bug.patch +Patch0112: 0112-Don-t-use-dynamic-sized-arrays-since-we-don-t-build-.patch +Patch0113: 0113-don-t-ignore-const.patch +Patch0114: 0114-don-t-use-int-for-efi-status.patch +Patch0115: 0115-make-GRUB_MOD_INIT-declare-its-function-prototypes.patch +Patch0116: 0116-Add-some-grub_dprintf-in-the-linuxefi-path.patch +Patch0117: 0117-linuxefi-minor-cleanups.patch +Patch0118: 0118-Handle-multi-arch-64-on-32-boot-in-linuxefi-loader.patch +Patch0119: 0119-Clean-up-some-errors-in-the-linuxefi-loader.patch +Patch0120: 0120-Fix-up-linux-params-usage.patch +Patch0121: 0121-arm64-make-sure-fdt-has-address-cells-and-size-cells.patch +Patch0122: 0122-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch +Patch0123: 0123-Make-pmtimer-tsc-calibration-not-take-51-seconds-to-.patch diff --git a/grub2.spec b/grub2.spec index 87e6cea..438bc1a 100644 --- a/grub2.spec +++ b/grub2.spec @@ -45,7 +45,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 0.42%{?dist} +Release: 0.43%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -546,6 +546,10 @@ fi %{_datarootdir}/grub/themes/starfield %changelog +* Wed Jan 17 2018 Peter Jones - 2.02-0.43 +- Pull in patches for Apollo Lake hardware + Resolves: rhbz#1519311 + * Thu Aug 03 2017 Peter Jones - 2.02-0.42 - Rebuild this so it gets SB signed correctly. Related: rhbz#1335533