From 58fe9aa736812ab9a714f07487f6a1a0040353cd Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 29 Sep 2014 11:48:01 -0400 Subject: [PATCH] Various updates that came from rhel 7.1 work. - Clean up the build a bit to make it faster - Make grubenv work right on UEFI machines Related: rhbz#1119943 - Sort debug and rescue kernels later than normal ones Related: rhbz#1065360 - Allow "fallback" to include entries by title as well as number. Related: rhbz#1026084 - Fix a segfault on aarch64. - Load arm with SB enabled if available. - Add some serial port options to GRUB_MODULES. Signed-off-by: Peter Jones --- 0001-fix-EFI-detection-on-Windows.patch | 2 +- ...rm-cache_armv6.S-Remove-.arch-direct.patch | 2 +- ...mpiling-the-GRUB-Fix-some-spelling-m.patch | 2 +- 0004-NEWS-First-draft-of-2.02-entry.patch | 2 +- ...aster-of-git.sv.gnu.org-srv-git-grub.patch | 2 +- ...an-command-in-fact-dates-back-to-1.9.patch | 2 +- ...-unused-error.h-from-kern-emu-misc.c.patch | 2 +- ...navailable-coreboot-tables-if-not-ru.patch | 2 +- ...ssing-entries.-Correct-existing-ones.patch | 2 +- ..._frame-section-from-arm64-efi-kernel.patch | 2 +- ...-aa64.efi-for-boot-images-on-AArch64.patch | 2 +- ...-fix-32-bit-compilation-on-MinGW-w64.patch | 2 +- ...rub-mkrescue-to-use-bootaa64.efi-too.patch | 2 +- ...rect-length-of-device-path-end-entry.patch | 2 +- ...f-grub-macbless-Change-mansection-to.patch | 2 +- ...o-EFI-rescue-image-to-fix-missing-pr.patch | 2 +- ...k.c-is-only-ever-compiled-on-FreeBSD.patch | 2 +- ...efer-more-portable-test-1-constructs.patch | 2 +- 0019-NEWS-Add-few-missing-entries.patch | 2 +- ...fi-efi.c-Ensure-that-the-result-star.patch | 2 +- ...c-Extend-GCC-warning-workaround-to-g.patch | 2 +- ...D_LDFLAGS-for-the-cross-compile-case.patch | 2 +- ...erm-terminfo.c-Recognize-keys-F1-F12.patch | 2 +- 0024-Fix-ChangeLog-date.patch | 2 +- ...ct-MinGW-W64-32-instead-of-_FILE_OFF.patch | 2 +- ...-support-to-fix-make-clean-on-Window.patch | 2 +- ...-on-MinGW-due-to-libintl.h-pulling-s.patch | 2 +- ...ds-macbless.c-Rename-FILE-and-DIR-to.patch | 2 +- ...f-Link-grub-ofpathname-with-zfs-libs.patch | 2 +- ...e.am-default_payload.elf-Add-modules.patch | 2 +- ...l-of-cpu-machine-links-on-mingw-msys.patch | 2 +- ...-main.c-read_config_file-Buffer-conf.patch | 2 +- 0033-util-grub-install.c-Fix-a-typo.patch | 2 +- ...-for-genemuinit-instead-of-MOD_FILES.patch | 2 +- ...-when-modifying-kern.geom.debugflags.patch | 2 +- ...op-condition-to-avoid-infinite-loops.patch | 2 +- ...rease-network-try-interval-gradually.patch | 2 +- ...aVu-also-in-usr-share-fonts-truetype.patch | 2 +- ...th-to-DejaVuSans-in-configure-summar.patch | 2 +- ..._EXTRA_DIST-to-allow-shipping-runtim.patch | 2 +- ...l.c-write_to_disk-Add-an-info-messag.patch | 2 +- ...rub-install.c-List-available-targets.patch | 2 +- 0043-Fix-several-translatable-strings.patch | 2 +- ...t-set-default-prefix-in-grub-mkimage.patch | 2 +- ...-cross-compile-failure-due-to-printf.patch | 2 +- ...erial.c-grub_serial_register-Fix-inv.patch | 2 +- ...port-for-partitioned-partx-loop-devi.patch | 2 +- ...t_keyboard.c-Tolerate-missing-keyboa.patch | 2 +- ...-add-missing-files-and-.exe-variants.patch | 2 +- ....c-Downgrade-warnings-about-unhandle.patch | 2 +- ...hci.c-Do-not-enable-I-O-decoding-and.patch | 2 +- ...hci.c-Allocate-and-clean-space-for-a.patch | 2 +- ...core-disk-ahci.c-Add-safety-cleanups.patch | 2 +- ...hci.c-Properly-handle-transactions-w.patch | 2 +- ...hci.c-Increase-timeout.-Some-SSDs-ta.patch | 2 +- ....c-Build-fix-for-argp.h-with-older-g.patch | 2 +- ...ue.c-Build-fix-for-argp.h-with-older.patch | 2 +- ...d-grub_env_set_net_property-function.patch | 2 +- ...dd-bootpath-parser-for-open-firmware.patch | 2 +- ...hci.c-Ignore-NPORTS-field-and-rely-o.patch | 2 +- ...386-coreboot-mmap.c-Filter-out-0xa00.patch | 2 +- ...-i386-multiboot_mbi.c-grub_multiboot.patch | 2 +- ...386-uppermem.c-lower_hook-COREBOOT-I.patch | 2 +- ...386-pc-mmap.c-Fallback-to-EISA-memor.patch | 2 +- ...6-openbsd_bootarg.h-Add-addr-and-fre.patch | 2 +- ...eck-for-IBM-pseries-emulated-machine.patch | 2 +- ...er-arm64-linux.c-Remove-redundant-0x.patch | 2 +- ...locator.c-Fix-the-case-when-end-of-l.patch | 2 +- 0069-Fix-grub-probe-0-option.patch | 2 +- ...todisk-and-abstraction-handling-in-g.patch | 2 +- ...ot-key-comparison-failures-due-to-en.patch | 2 +- ...linux-getroot.c-grub_util_part_to_di.patch | 2 +- ...ances-of-memcmp-memcpy-in-the-code-t.patch | 2 +- ...gcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch | 2 +- 0075-Add-missing-endif.patch | 2 +- ...syslinux_parse.c-Fix-timeout-quoting.patch | 2 +- ...-LVM-logical_volumes-string-matching.patch | 2 +- ...-with-no-filesystem-UUID-returned-by.patch | 2 +- ...d-kernels-by-placing-GDT-in-conventi.patch | 2 +- ...isc.c-__bzero-Don-t-compile-in-GRUB_.patch | 2 +- ...ds-verify.c-grub_pubkey_open-Fix-mem.patch | 2 +- ...ds-verify.c-grub_pubkey_open-Trust-p.patch | 2 +- ...ciih.c-add_glyph-Fix-uninitialised-v.patch | 2 +- ...ds-efi-lsefisystab.c-grub_cmd_lsefis.patch | 2 +- ...-i386-bsd.c-grub_netbsd_boot-Pass-po.patch | 2 +- ...nstall.c-Fix-handling-of-disk-module.patch | 2 +- ...ds-loadenv.c-check_blocklists-Fix-ov.patch | 2 +- ...an-command-in-fact-dates-back-to-1.9.patch | 2 +- 0089-Migrate-PPC-from-Yaboot-to-Grub2.patch | 2 +- 0090-Add-fw_path-variable-revised.patch | 2 +- 0091-Add-support-for-linuxefi.patch | 2 +- ...xefi-and-initrdefi-where-appropriate.patch | 2 +- ...w-insmod-when-secure-boot-is-enabled.patch | 2 +- ...-hex-hex-straight-through-unmolested.patch | 2 +- 0095-Fix-crash-on-http.patch | 2 +- ...ient-architecture-CAS-reboot-support.patch | 2 +- 0097-Add-vlan-tag-support.patch | 2 +- 0098-Add-X-option-to-printf-functions.patch | 2 +- ...HCP-client-ID-and-UUID-options-added.patch | 2 +- ...for-specific-config-file-for-netboot.patch | 2 +- ...g-module-to-parse-Boot-Loader-Specif.patch | 2 +- 0102-Move-bash-completion-script-922997.patch | 2 +- ...nsole-display-attr-when-clear-screen.patch | 2 +- 0104-Don-t-write-messages-to-the-screen.patch | 2 +- 0105-Don-t-print-GNU-GRUB-header.patch | 2 +- 0106-Don-t-add-to-highlighted-row.patch | 2 +- 0107-Message-string-cleanups.patch | 2 +- ...ing-now-that-we-aren-t-displaying-it.patch | 2 +- ...t-indentation-for-the-term-help-text.patch | 2 +- 0110-Indent-menu-entries.patch | 2 +- 0111-Fix-margins.patch | 2 +- ...UEFI-operating-systems-returned-by-o.patch | 2 +- ...video-support-for-IBM-power-machines.patch | 2 +- ...-1-for-our-right-hand-margin-so-line.patch | 2 +- ...-Use-linux16-when-appropriate-880840.patch | 2 +- 0116-Enable-pager-by-default.-985860.patch | 2 +- ...-on-serial-so-don-t-tell-the-user-to.patch | 2 +- ...n-t-say-GNU-Linux-in-generated-menus.patch | 2 +- ...-Don-t-draw-a-border-around-the-menu.patch | 2 +- ...andard-margin-for-the-timeout-string.patch | 2 +- ...ript_execute_sourcecode-usage-on-ppc.patch | 2 +- ...rame-to-list-of-relocations-stripped.patch | 2 +- ...rk-with-our-changes-for-linux16-and-.patch | 2 +- ...on-t-print-during-fdt-loading-method.patch | 2 +- ...when-generating-configuration-by-gru.patch | 2 +- ...spaces-when-we-re-doing-our-cmdline-.patch | 2 +- ...password-to-boot-entries-generated-b.patch | 2 +- 0128-Don-t-emit-Booting-.-message.patch | 2 +- ...T-keys-work-as-expected-on-EFI-syste.patch | 2 +- 0130-May-as-well-try-it.patch | 2 +- ...ix-when-fallback-searching-for-grub-.patch | 2 +- ...-before-grub.cfg-on-tftp-config-file.patch | 2 +- ...-trim-arp-packets-with-abnormal-size.patch | 2 +- ...ert-function-to-support-NVMe-devices.patch | 2 +- ...Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch | 2 +- ...M-Mustang-device-tree-for-hardware-t.patch | 2 +- ...device-tree-from-the-grub-default-fi.patch | 2 +- ...P-protocol-for-exclusive-use-by-grub.patch | 2 +- 0139-Reduce-timer-event-frequency-by-10.patch | 2 +- 0140-always-return-error-to-UEFI.patch | 2 +- ...-powerpc-little-endian-ppc64le-flags.patch | 4 +- ...tion-and-include-some-libgcc-fuction.patch | 4 +- ...-Suport-for-bi-endianess-in-elf-file.patch | 4 +- 0144-Add-grub_util_readlink.patch | 2 +- ...se-symlinks-including-those-across-d.patch | 2 +- ...CLASS-in-10_linux-from-etc-os-releas.patch | 33 ++ ...x-GRUB_DISABLE_SUBMENU-one-more-time.patch | 30 ++ ...t-ordering-for-.debug-and-rescue-ker.patch | 34 ++ 0149-Add-GRUB_DISABLE_UUID.patch | 101 ++++ ...o-include-entries-by-title-not-just-.patch | 131 ++++++ ...rd_ctx-so-we-don-t-free-a-random-poi.patch | 134 ++++++ 0152-Load-arm-with-SB-enabled.patch | 437 ++++++++++++++++++ grub2.spec | 41 +- sources | 2 +- 154 files changed, 1080 insertions(+), 159 deletions(-) create mode 100644 0146-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch create mode 100644 0147-Fix-GRUB_DISABLE_SUBMENU-one-more-time.patch create mode 100644 0148-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch create mode 100644 0149-Add-GRUB_DISABLE_UUID.patch create mode 100644 0150-Allow-fallback-to-include-entries-by-title-not-just-.patch create mode 100644 0151-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch create mode 100644 0152-Load-arm-with-SB-enabled.patch diff --git a/0001-fix-EFI-detection-on-Windows.patch b/0001-fix-EFI-detection-on-Windows.patch index 0a6daba..9886abf 100644 --- a/0001-fix-EFI-detection-on-Windows.patch +++ b/0001-fix-EFI-detection-on-Windows.patch @@ -1,7 +1,7 @@ From a6e7719bbe05993613a8de69dba14fa092144925 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Wed, 25 Dec 2013 22:36:28 +0400 -Subject: [PATCH 001/143] fix EFI detection on Windows +Subject: [PATCH 001/152] fix EFI detection on Windows We are on legacy BIOS if GetFirmwareEnvironmentVariable fails (returns zero) *and* extended error information is ERROR_INVALID_FUNCTION. diff --git a/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch b/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch index f1371c2..3457a78 100644 --- a/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch +++ b/0002-grub-core-kern-arm-cache_armv6.S-Remove-.arch-direct.patch @@ -1,7 +1,7 @@ From 5bda44d7f98c36f87144869ec58b518f80a69b56 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 25 Dec 2013 23:31:42 +0100 -Subject: [PATCH 002/143] * grub-core/kern/arm/cache_armv6.S: Remove +Subject: [PATCH 002/152] * grub-core/kern/arm/cache_armv6.S: Remove .arch directive. As these functions are used on pre-ARMv6 CPUs as well we don't want diff --git a/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch b/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch index 3e99253..52aa300 100644 --- a/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch +++ b/0003-INSTALL-Cross-compiling-the-GRUB-Fix-some-spelling-m.patch @@ -1,7 +1,7 @@ From 8ebe593c564edc8ae62086df8a1448e898ef259b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 27 Dec 2013 03:03:32 +0000 -Subject: [PATCH 003/143] * INSTALL (Cross-compiling the GRUB): Fix some +Subject: [PATCH 003/152] * INSTALL (Cross-compiling the GRUB): Fix some spelling mistakes. * docs/grub.texi (Getting the source code): Likewise. --- diff --git a/0004-NEWS-First-draft-of-2.02-entry.patch b/0004-NEWS-First-draft-of-2.02-entry.patch index 8da2fba..a9f6448 100644 --- a/0004-NEWS-First-draft-of-2.02-entry.patch +++ b/0004-NEWS-First-draft-of-2.02-entry.patch @@ -1,7 +1,7 @@ From c0e2febef52139e0e580e52f553bf3aa521e390c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 27 Dec 2013 03:05:38 +0000 -Subject: [PATCH 004/143] * NEWS: First draft of 2.02 entry. +Subject: [PATCH 004/152] * NEWS: First draft of 2.02 entry. --- ChangeLog | 4 +++ diff --git a/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch b/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch index 8c4bf80..2cea0c9 100644 --- a/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch +++ b/0005-Merge-branch-master-of-git.sv.gnu.org-srv-git-grub.patch @@ -1,7 +1,7 @@ From 9ee79da5bf54babe11178ced48470b5f09d3dda3 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 27 Dec 2013 11:20:37 +0100 -Subject: [PATCH 005/143] Merge branch 'master' of git.sv.gnu.org:/srv/git/grub +Subject: [PATCH 005/152] Merge branch 'master' of git.sv.gnu.org:/srv/git/grub Conflicts: ChangeLog diff --git a/0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch b/0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch index c9fb0c3..401987b 100644 --- a/0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch +++ b/0006-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch @@ -1,7 +1,7 @@ From 94763697f5f33614b7bd6da91707a27b6872b750 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 28 Dec 2013 02:20:27 +0000 -Subject: [PATCH 006/143] * NEWS: The cmosclean command in fact dates back to +Subject: [PATCH 006/152] * NEWS: The cmosclean command in fact dates back to 1.99. Remove mention of it from 2.02. --- diff --git a/0007-remove-unused-error.h-from-kern-emu-misc.c.patch b/0007-remove-unused-error.h-from-kern-emu-misc.c.patch index 51973fa..589bd16 100644 --- a/0007-remove-unused-error.h-from-kern-emu-misc.c.patch +++ b/0007-remove-unused-error.h-from-kern-emu-misc.c.patch @@ -1,7 +1,7 @@ From 904bd6b3cb12977def4f940e90aca3fe557c3bb5 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 28 Dec 2013 09:01:20 +0400 -Subject: [PATCH 007/143] remove unused error.h from kern/emu/misc.c +Subject: [PATCH 007/152] remove unused error.h from kern/emu/misc.c Fixes compilation on mingw32, where include is apparently missing. --- diff --git a/0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch b/0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch index 0cc4a19..bb4dcc1 100644 --- a/0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch +++ b/0008-Don-t-abort-on-unavailable-coreboot-tables-if-not-ru.patch @@ -1,7 +1,7 @@ From 23cd074c57ee6f35776fd5122a050bcef6c9eef5 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 28 Dec 2013 17:25:14 +0100 -Subject: [PATCH 008/143] Don't abort() on unavailable coreboot tables +Subject: [PATCH 008/152] Don't abort() on unavailable coreboot tables if not running on coreboot. --- diff --git a/0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch b/0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch index 5d4fbd5..ca774cd 100644 --- a/0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch +++ b/0009-NEWS-Add-few-missing-entries.-Correct-existing-ones.patch @@ -1,7 +1,7 @@ From 3eff91e86e4df2cf8a5e1b26f98e96bf4731f526 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 30 Dec 2013 06:49:15 +0100 -Subject: [PATCH 009/143] * NEWS: Add few missing entries. Correct +Subject: [PATCH 009/152] * NEWS: Add few missing entries. Correct existing ones. --- diff --git a/0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch b/0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch index 991cf81..0928178 100644 --- a/0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch +++ b/0010-strip-.eh_frame-section-from-arm64-efi-kernel.patch @@ -1,7 +1,7 @@ From 9e9507d2e1eaed4fc2ebe2959c5405687485f613 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Mon, 30 Dec 2013 12:56:19 +0000 -Subject: [PATCH 010/143] strip .eh_frame section from arm64-efi kernel +Subject: [PATCH 010/152] strip .eh_frame section from arm64-efi kernel Fixes grub-mkimage error "relocation 0x105 is not implemented yet." --- diff --git a/0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch b/0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch index d48f82e..d800f7a 100644 --- a/0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch +++ b/0011-use-grub-boot-aa64.efi-for-boot-images-on-AArch64.patch @@ -1,7 +1,7 @@ From 7e782c6996ee433c94fb378cbc8db0fa0f663c84 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Tue, 7 Jan 2014 10:38:54 +0400 -Subject: [PATCH 011/143] use {grub,boot}aa64.efi for boot images on AArch64 +Subject: [PATCH 011/152] use {grub,boot}aa64.efi for boot images on AArch64 According to UEFI 2.4 specification, default boot file name on AArch64 is BOOTAA64.EFI (3.4.1.1 Removable Media Boot Behavior). Also set default diff --git a/0012-fix-32-bit-compilation-on-MinGW-w64.patch b/0012-fix-32-bit-compilation-on-MinGW-w64.patch index 7a9bb92..17c5a03 100644 --- a/0012-fix-32-bit-compilation-on-MinGW-w64.patch +++ b/0012-fix-32-bit-compilation-on-MinGW-w64.patch @@ -1,7 +1,7 @@ From afda7f47601f36a98074d8d21ffb640256f02267 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Tue, 7 Jan 2014 18:43:02 +0400 -Subject: [PATCH 012/143] fix 32 bit compilation on MinGW-w64 +Subject: [PATCH 012/152] fix 32 bit compilation on MinGW-w64 Use _FILE_OFFSET_BITS macro to distinguish between native MinGW and 32 bit under MinGW-64. The latter does not require fseeko/ftello diff --git a/0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch b/0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch index 059475c..b1ca8f8 100644 --- a/0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch +++ b/0013-Change-grub-mkrescue-to-use-bootaa64.efi-too.patch @@ -1,7 +1,7 @@ From 9981c4e3f366b4795655368a78baa058b18711c6 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Tue, 7 Jan 2014 20:34:25 +0400 -Subject: [PATCH 013/143] Change grub-mkrescue to use bootaa64.efi too +Subject: [PATCH 013/152] Change grub-mkrescue to use bootaa64.efi too Also add ChangeLog entry for previous change. --- diff --git a/0014-arm64-set-correct-length-of-device-path-end-entry.patch b/0014-arm64-set-correct-length-of-device-path-end-entry.patch index d75c4d5..06df30b 100644 --- a/0014-arm64-set-correct-length-of-device-path-end-entry.patch +++ b/0014-arm64-set-correct-length-of-device-path-end-entry.patch @@ -1,7 +1,7 @@ From f493e0d352e1e8ff8cbafee69878d00487a04808 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Tue, 7 Jan 2014 17:52:50 +0000 -Subject: [PATCH 014/143] arm64: set correct length of device path end entry +Subject: [PATCH 014/152] arm64: set correct length of device path end entry The length of the Device Path End entry in the grub_linux_boot() function was incorrectly set to 0. This triggers an assert failure diff --git a/0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch b/0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch index 01bee9d..74c5bae 100644 --- a/0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch +++ b/0015-Makefile.util.def-grub-macbless-Change-mansection-to.patch @@ -1,7 +1,7 @@ From 1c0db34a9597ecccb3ad4899892fb6ff6e22304d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 8 Jan 2014 11:05:20 +0000 -Subject: [PATCH 015/143] * Makefile.util.def (grub-macbless): Change +Subject: [PATCH 015/152] * Makefile.util.def (grub-macbless): Change mansection to 8. --- diff --git a/0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch b/0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch index 8e6278f..194a36a 100644 --- a/0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch +++ b/0016-add-part_apple-to-EFI-rescue-image-to-fix-missing-pr.patch @@ -1,7 +1,7 @@ From 3aea6cc46177a90056ba60381e6387377fe40c99 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sun, 12 Jan 2014 15:29:21 +0400 -Subject: [PATCH 016/143] add part_apple to EFI rescue image to fix missing +Subject: [PATCH 016/152] add part_apple to EFI rescue image to fix missing prefix On Mac rescue image is booted from HFS+ partition, so bootpath looks like diff --git a/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch b/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch index 232b518..07161ae 100644 --- a/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch +++ b/0017-freebsd-hostdisk.c-is-only-ever-compiled-on-FreeBSD.patch @@ -1,7 +1,7 @@ From a433d177585c8355c6ede67469a521d05cf1e9d7 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 17 Jan 2014 02:30:52 +0000 -Subject: [PATCH 017/143] freebsd/hostdisk.c is only ever compiled on FreeBSD +Subject: [PATCH 017/152] freebsd/hostdisk.c is only ever compiled on FreeBSD * grub-core/osdep/freebsd/hostdisk.c (grub_util_fd_open): Remove redundant preprocessor conditional. diff --git a/0018-Prefer-more-portable-test-1-constructs.patch b/0018-Prefer-more-portable-test-1-constructs.patch index dc4fc53..7b15632 100644 --- a/0018-Prefer-more-portable-test-1-constructs.patch +++ b/0018-Prefer-more-portable-test-1-constructs.patch @@ -1,7 +1,7 @@ From 4ec08b960f6de1190dea9fe7e6ab3b4b249840e5 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 17 Jan 2014 15:24:50 +0000 -Subject: [PATCH 018/143] Prefer more portable test(1) constructs +Subject: [PATCH 018/152] Prefer more portable test(1) constructs * util/grub.d/00_header.in (make_timeout): Use && rather than test -a. diff --git a/0019-NEWS-Add-few-missing-entries.patch b/0019-NEWS-Add-few-missing-entries.patch index 260d72b..3b34f96 100644 --- a/0019-NEWS-Add-few-missing-entries.patch +++ b/0019-NEWS-Add-few-missing-entries.patch @@ -1,7 +1,7 @@ From e18da008f74a3c5f27a191e4f7be80c02a49f2fe Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 18 Jan 2014 16:31:10 +0100 -Subject: [PATCH 019/143] * NEWS: Add few missing entries. +Subject: [PATCH 019/152] * NEWS: Add few missing entries. --- ChangeLog | 4 ++++ diff --git a/0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch b/0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch index 92794b8..443639b 100644 --- a/0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch +++ b/0020-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch @@ -1,7 +1,7 @@ From 29c96f00677e1dd2a9df4de645a7f5fab7b736a1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 18 Jan 2014 16:41:47 +0100 -Subject: [PATCH 020/143] * grub-core/kern/efi/efi.c: Ensure that the +Subject: [PATCH 020/152] * grub-core/kern/efi/efi.c: Ensure that the result starts with / and has no //. --- diff --git a/0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch b/0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch index b62d429..63c5477 100644 --- a/0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch +++ b/0021-util-grub-mount.c-Extend-GCC-warning-workaround-to-g.patch @@ -1,7 +1,7 @@ From fa9e3a9aa30988c2339e9d05c81b5d91534f4049 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 18 Jan 2014 16:43:29 +0100 -Subject: [PATCH 021/143] * util/grub-mount.c: Extend GCC warning +Subject: [PATCH 021/152] * util/grub-mount.c: Extend GCC warning workaround to grub-mount. --- diff --git a/0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch b/0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch index d46ca9d..5ccfcca 100644 --- a/0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch +++ b/0022-reintroduce-BUILD_LDFLAGS-for-the-cross-compile-case.patch @@ -1,7 +1,7 @@ From 3bea802b45b9c98f70753370522fa6e47ba8966b Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 18 Jan 2014 19:50:54 +0400 -Subject: [PATCH 022/143] reintroduce BUILD_LDFLAGS for the cross-compile case +Subject: [PATCH 022/152] reintroduce BUILD_LDFLAGS for the cross-compile case This allows providing separate LDFLAGS for build and host environments, which are not necessary the same for cross-compile case. In particular, it allows diff --git a/0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch b/0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch index ecd6686..ba33f13 100644 --- a/0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch +++ b/0023-grub-core-term-terminfo.c-Recognize-keys-F1-F12.patch @@ -1,7 +1,7 @@ From ac660e42875162e599f50c085cb646c633cf376d Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 18 Jan 2014 16:57:35 +0100 -Subject: [PATCH 023/143] * grub-core/term/terminfo.c: Recognize keys +Subject: [PATCH 023/152] * grub-core/term/terminfo.c: Recognize keys F1-F12. --- diff --git a/0024-Fix-ChangeLog-date.patch b/0024-Fix-ChangeLog-date.patch index 7663147..277c34f 100644 --- a/0024-Fix-ChangeLog-date.patch +++ b/0024-Fix-ChangeLog-date.patch @@ -1,7 +1,7 @@ From 6e5cf6b00fa82e5a02135ea5e21230ee44c72087 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 18 Jan 2014 20:01:16 +0400 -Subject: [PATCH 024/143] Fix ChangeLog date +Subject: [PATCH 024/152] Fix ChangeLog date --- ChangeLog | 2 +- diff --git a/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch b/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch index 04f7e73..55a8472 100644 --- a/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch +++ b/0025-Use-_W64-to-detect-MinGW-W64-32-instead-of-_FILE_OFF.patch @@ -1,7 +1,7 @@ From bb3e1a1e8448f3ea9489b5ebfcec799196bc862f Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 18 Jan 2014 20:04:11 +0400 -Subject: [PATCH 025/143] Use _W64 to detect MinGW W64-32 instead of +Subject: [PATCH 025/152] Use _W64 to detect MinGW W64-32 instead of _FILE_OFFSET_BITS In 94cee4a4c201bb506377b2c26e072eee8cb19d6f I overlooked that config.h diff --git a/0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch b/0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch index 744c2a8..3814c94 100644 --- a/0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch +++ b/0026-add-BUILD_EXEEXT-support-to-fix-make-clean-on-Window.patch @@ -1,7 +1,7 @@ From 5ac7afd762d11b4c91d5756222c3abf5862203de Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 18 Jan 2014 20:41:24 +0400 -Subject: [PATCH 026/143] add BUILD_EXEEXT support to fix make clean on Windows +Subject: [PATCH 026/152] add BUILD_EXEEXT support to fix make clean on Windows Add $(BUILD_EXEEXT) to ensure files are removed. Also add CLEANFILES where appropriate. diff --git a/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch b/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch index 76918fd..3075cf2 100644 --- a/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch +++ b/0027-fix-include-loop-on-MinGW-due-to-libintl.h-pulling-s.patch @@ -1,7 +1,7 @@ From 09194ac15b3c348cbf147e8ea27b982b57a7a778 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 18 Jan 2014 21:22:57 +0400 -Subject: [PATCH 027/143] fix include loop on MinGW due to libintl.h pulling +Subject: [PATCH 027/152] fix include loop on MinGW due to libintl.h pulling stdio.h In file included from ./include/grub/dl.h:23:0, diff --git a/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch b/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch index 8180ce2..4ba0214 100644 --- a/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch +++ b/0028-grub-core-commands-macbless.c-Rename-FILE-and-DIR-to.patch @@ -1,7 +1,7 @@ From 9cbb9fc3d79e449affe7ed5e104aa828b72ad2cd Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 18 Jan 2014 19:26:40 +0100 -Subject: [PATCH 028/143] * grub-core/commands/macbless.c: Rename FILE +Subject: [PATCH 028/152] * grub-core/commands/macbless.c: Rename FILE and DIR to avoid conflicts. Reported by: Andrey Borzenkov. diff --git a/0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch b/0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch index fcc5013..0c25a18 100644 --- a/0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch +++ b/0029-Makefile.util.def-Link-grub-ofpathname-with-zfs-libs.patch @@ -1,7 +1,7 @@ From 6c3fa2da4fd22c3ebda0c6cf69f97d578c04e704 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 18 Jan 2014 19:41:15 +0100 -Subject: [PATCH 029/143] * Makefile.util.def: Link grub-ofpathname with +Subject: [PATCH 029/152] * Makefile.util.def: Link grub-ofpathname with zfs libs. --- diff --git a/0030-Makefile.am-default_payload.elf-Add-modules.patch b/0030-Makefile.am-default_payload.elf-Add-modules.patch index 1f6c382..10f8209 100644 --- a/0030-Makefile.am-default_payload.elf-Add-modules.patch +++ b/0030-Makefile.am-default_payload.elf-Add-modules.patch @@ -1,7 +1,7 @@ From 3f6bd432acbf2244e6f4b83dd3a259392b10afb6 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 18 Jan 2014 19:43:19 +0100 -Subject: [PATCH 030/143] * Makefile.am (default_payload.elf): Add +Subject: [PATCH 030/152] * Makefile.am (default_payload.elf): Add modules multiboot cbmemc linux16 gzio echo help. --- diff --git a/0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch b/0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch index 3b1a8c0..25cc7f2 100644 --- a/0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch +++ b/0031-fix-removal-of-cpu-machine-links-on-mingw-msys.patch @@ -1,7 +1,7 @@ From d0cf0d7dcd4813a168d2bd94ec77ee0ae8ff860e Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 18 Jan 2014 22:48:04 +0400 -Subject: [PATCH 031/143] fix removal of {cpu,machine} links on mingw/msys +Subject: [PATCH 031/152] fix removal of {cpu,machine} links on mingw/msys At least on Windows 2003 using "ln -s dir1 dir2" in msys shell succeeds, but results in what looks like hard link. Subsequent "rm -f dir2" (e.g. diff --git a/0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch b/0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch index a11f833..c81d2b2 100644 --- a/0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch +++ b/0032-grub-core-normal-main.c-read_config_file-Buffer-conf.patch @@ -1,7 +1,7 @@ From 221f6e1ac22f66881276d4cb012d588ecfb17e47 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 18 Jan 2014 19:54:09 +0100 -Subject: [PATCH 032/143] * grub-core/normal/main.c (read_config_file): +Subject: [PATCH 032/152] * grub-core/normal/main.c (read_config_file): Buffer config file. Reduces boot time. --- diff --git a/0033-util-grub-install.c-Fix-a-typo.patch b/0033-util-grub-install.c-Fix-a-typo.patch index 7e69b96..d75d75a 100644 --- a/0033-util-grub-install.c-Fix-a-typo.patch +++ b/0033-util-grub-install.c-Fix-a-typo.patch @@ -1,7 +1,7 @@ From d353b169aa6b2a9cd03d0c2987da7da059aa6f99 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 18 Jan 2014 20:02:51 +0100 -Subject: [PATCH 033/143] * util/grub-install.c: Fix a typo. +Subject: [PATCH 033/152] * util/grub-install.c: Fix a typo. --- ChangeLog | 4 ++++ diff --git a/0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch b/0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch index 4a33b6c..541eeac 100644 --- a/0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch +++ b/0034-use-MODULE_FILES-for-genemuinit-instead-of-MOD_FILES.patch @@ -1,7 +1,7 @@ From 85cc4b1abfed85fd8504da4acc391d5936de2812 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 18 Jan 2014 23:15:40 +0400 -Subject: [PATCH 034/143] use MODULE_FILES for genemuinit* instead of MOD_FILES +Subject: [PATCH 034/152] use MODULE_FILES for genemuinit* instead of MOD_FILES MinGW native nm does not support ELF binaries. --- diff --git a/0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch b/0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch index 4bb4ccd..22b52e0 100644 --- a/0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch +++ b/0035-Ignore-EPERM-when-modifying-kern.geom.debugflags.patch @@ -1,7 +1,7 @@ From 97fca4331e317b0491912c3cf3d02a9fac96c419 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 17 Jan 2014 02:28:46 +0000 -Subject: [PATCH 035/143] Ignore EPERM when modifying kern.geom.debugflags +Subject: [PATCH 035/152] Ignore EPERM when modifying kern.geom.debugflags Many tests fail when run as a non-root user on FreeBSD. The failures all amount to an inability to open files using grub_util_fd_open, diff --git a/0036-change-stop-condition-to-avoid-infinite-loops.patch b/0036-change-stop-condition-to-avoid-infinite-loops.patch index a065485..9a1c0e3 100644 --- a/0036-change-stop-condition-to-avoid-infinite-loops.patch +++ b/0036-change-stop-condition-to-avoid-infinite-loops.patch @@ -1,7 +1,7 @@ From 547d1e84df5d57c7600ead4556d43d5dbbe33c4b Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 21 Jan 2014 10:49:39 -0200 -Subject: [PATCH 036/143] change stop condition to avoid infinite loops +Subject: [PATCH 036/152] change stop condition to avoid infinite loops In net/net.c there is a while (1) that only exits if there is a stop condition and more then 10 packages or if there is no package received. diff --git a/0037-increase-network-try-interval-gradually.patch b/0037-increase-network-try-interval-gradually.patch index d85b797..adbd75e 100644 --- a/0037-increase-network-try-interval-gradually.patch +++ b/0037-increase-network-try-interval-gradually.patch @@ -1,7 +1,7 @@ From d3652ff33623d842fc4422ffd98e4303795e9519 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 21 Jan 2014 11:03:51 -0200 -Subject: [PATCH 037/143] increase network try interval gradually +Subject: [PATCH 037/152] increase network try interval gradually * grub-core/net/arp.c (grub_net_arp_send_request): Increase network try interval gradually. diff --git a/0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch b/0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch index 8599034..ca93d1e 100644 --- a/0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch +++ b/0038-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch @@ -1,7 +1,7 @@ From 90d83cda679fef485f7bb1a318bd682c4eb86cb4 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Tue, 21 Jan 2014 19:29:33 +0400 -Subject: [PATCH 038/143] look for DejaVu also in /usr/share/fonts/truetype +Subject: [PATCH 038/152] look for DejaVu also in /usr/share/fonts/truetype It is installed in this path on openSUSE. --- diff --git a/0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch b/0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch index 7abb266..4c6c275 100644 --- a/0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch +++ b/0039-Show-detected-path-to-DejaVuSans-in-configure-summar.patch @@ -1,7 +1,7 @@ From 3e02e2fbd2089645ac2c482dad59318394b62252 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Tue, 21 Jan 2014 19:41:11 +0400 -Subject: [PATCH 039/143] Show detected path to DejaVuSans in configure summary +Subject: [PATCH 039/152] Show detected path to DejaVuSans in configure summary --- ChangeLog | 1 + diff --git a/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch b/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch index 573b3b2..6883573 100644 --- a/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch +++ b/0040-add-GRUB_WINDOWS_EXTRA_DIST-to-allow-shipping-runtim.patch @@ -1,7 +1,7 @@ From 6e9483ee94033f4bb7b9a17bd032c4af4479abc0 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Tue, 21 Jan 2014 20:54:09 +0400 -Subject: [PATCH 040/143] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime +Subject: [PATCH 040/152] add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime files Not all toolkits provide static libraries. This patch enables creation of self diff --git a/0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch b/0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch index e89d938..9f76928 100644 --- a/0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch +++ b/0041-util-grub-install.c-write_to_disk-Add-an-info-messag.patch @@ -1,7 +1,7 @@ From 100e7015f7dcf2cee0c4ddbbd7498a67bac695d0 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 23 Jan 2014 12:05:36 +0000 -Subject: [PATCH 041/143] * util/grub-install.c (write_to_disk): Add an info +Subject: [PATCH 041/152] * util/grub-install.c (write_to_disk): Add an info message. --- diff --git a/0042-util-grub-install.c-List-available-targets.patch b/0042-util-grub-install.c-List-available-targets.patch index c12e35d..87fe952 100644 --- a/0042-util-grub-install.c-List-available-targets.patch +++ b/0042-util-grub-install.c-List-available-targets.patch @@ -1,7 +1,7 @@ From d25ddbcafa537525f606938df0e500c50a5e93e1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 24 Jan 2014 18:09:25 +0100 -Subject: [PATCH 042/143] * util/grub-install.c: List available targets. +Subject: [PATCH 042/152] * util/grub-install.c: List available targets. --- ChangeLog | 4 ++++ diff --git a/0043-Fix-several-translatable-strings.patch b/0043-Fix-several-translatable-strings.patch index 3c25967..7becc47 100644 --- a/0043-Fix-several-translatable-strings.patch +++ b/0043-Fix-several-translatable-strings.patch @@ -1,7 +1,7 @@ From 2cd73ec6b2efeaff2bdcd40cce0cd3145d9e07d0 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 24 Jan 2014 18:20:27 +0100 -Subject: [PATCH 043/143] Fix several translatable strings. +Subject: [PATCH 043/152] Fix several translatable strings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit diff --git a/0044-do-not-set-default-prefix-in-grub-mkimage.patch b/0044-do-not-set-default-prefix-in-grub-mkimage.patch index 2caa0c9..8e0a1c6 100644 --- a/0044-do-not-set-default-prefix-in-grub-mkimage.patch +++ b/0044-do-not-set-default-prefix-in-grub-mkimage.patch @@ -1,7 +1,7 @@ From 2b2a550c14e70d17af4140e64d08022ed170f0c8 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 25 Jan 2014 19:54:51 +0400 -Subject: [PATCH 044/143] do not set default prefix in grub-mkimage +Subject: [PATCH 044/152] do not set default prefix in grub-mkimage Default prefix is likely wrong on Unix and completely wrong on Windows. Let caller set it explicitly to avoid any ambiguity. diff --git a/0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch b/0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch index daf6702..b53e03c 100644 --- a/0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch +++ b/0045-fix-Mingw-W64-32-cross-compile-failure-due-to-printf.patch @@ -1,7 +1,7 @@ From 90efd351fa4f81df97473e1bb8c8234a801f8ebe Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 25 Jan 2014 21:49:41 +0400 -Subject: [PATCH 045/143] fix Mingw W64-32 cross compile failure due to printf +Subject: [PATCH 045/152] fix Mingw W64-32 cross compile failure due to printf redefinition in libintl.h In file included from util/misc.c:36:0: diff --git a/0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch b/0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch index 2d0824d..eecd076 100644 --- a/0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch +++ b/0046-grub-core-term-serial.c-grub_serial_register-Fix-inv.patch @@ -1,7 +1,7 @@ From c18e39b667adb11624f3f4162c1342b76712d655 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 26 Jan 2014 02:36:05 +0100 -Subject: [PATCH 046/143] * grub-core/term/serial.c +Subject: [PATCH 046/152] * grub-core/term/serial.c (grub_serial_register): Fix invalid free. Ensure that pointers are inited to NULL and that pointers are not accessed after free. diff --git a/0047-grub-install-support-for-partitioned-partx-loop-devi.patch b/0047-grub-install-support-for-partitioned-partx-loop-devi.patch index 5a4df90..a530b8c 100644 --- a/0047-grub-install-support-for-partitioned-partx-loop-devi.patch +++ b/0047-grub-install-support-for-partitioned-partx-loop-devi.patch @@ -1,7 +1,7 @@ From c889057e089d69bd187c8ba134c9669247744628 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 26 Jan 2014 02:56:04 +0100 -Subject: [PATCH 047/143] grub-install: support for partitioned partx +Subject: [PATCH 047/152] grub-install: support for partitioned partx loop devices. * grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Detect diff --git a/0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch b/0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch index 2e2fe1a..c086429 100644 --- a/0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch +++ b/0048-grub-core-term-at_keyboard.c-Tolerate-missing-keyboa.patch @@ -1,7 +1,7 @@ From 379cbd6233fe227544ff3073b60b295fe841b654 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 26 Jan 2014 03:31:10 +0100 -Subject: [PATCH 048/143] * grub-core/term/at_keyboard.c: Tolerate +Subject: [PATCH 048/152] * grub-core/term/at_keyboard.c: Tolerate missing keyboard. --- diff --git a/0049-.gitignore-add-missing-files-and-.exe-variants.patch b/0049-.gitignore-add-missing-files-and-.exe-variants.patch index 71bc474..f592363 100644 --- a/0049-.gitignore-add-missing-files-and-.exe-variants.patch +++ b/0049-.gitignore-add-missing-files-and-.exe-variants.patch @@ -1,7 +1,7 @@ From 58ca3abc65a64d950d6da8b473e91f16d410f1ac Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 29 Jan 2014 13:26:00 -0200 -Subject: [PATCH 049/143] .gitignore: add missing files and .exe variants. +Subject: [PATCH 049/152] .gitignore: add missing files and .exe variants. --- .gitignore | 7 +++++++ diff --git a/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch b/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch index d67ef51..3b56b73 100644 --- a/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch +++ b/0050-util-grub-mkfont.c-Downgrade-warnings-about-unhandle.patch @@ -1,7 +1,7 @@ From f21c40f33c95d908cee32a5063f285d22574a507 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 29 Jan 2014 23:41:48 +0100 -Subject: [PATCH 050/143] * util/grub-mkfont.c: Downgrade warnings about +Subject: [PATCH 050/152] * util/grub-mkfont.c: Downgrade warnings about unhandled features to debug. --- diff --git a/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch b/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch index ca6c86d..07315a8 100644 --- a/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch +++ b/0051-grub-core-disk-ahci.c-Do-not-enable-I-O-decoding-and.patch @@ -1,7 +1,7 @@ From 5795341bb64a4e101d7c067d688b19a41dd50662 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 29 Jan 2014 23:43:25 +0100 -Subject: [PATCH 051/143] * grub-core/disk/ahci.c: Do not enable I/O +Subject: [PATCH 051/152] * grub-core/disk/ahci.c: Do not enable I/O decoding and keep enabling busmaster for the end. --- diff --git a/0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch b/0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch index 8236481..62dc26f 100644 --- a/0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch +++ b/0052-grub-core-disk-ahci.c-Allocate-and-clean-space-for-a.patch @@ -1,7 +1,7 @@ From 50cb0018044359180aa57e6aa7ec944def83bbcc Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 29 Jan 2014 23:45:18 +0100 -Subject: [PATCH 052/143] * grub-core/disk/ahci.c: Allocate and clean +Subject: [PATCH 052/152] * grub-core/disk/ahci.c: Allocate and clean space for all possible 32 slots to avoid pointing to uninited area. --- diff --git a/0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch b/0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch index 1c26b0b..6f8d8ca 100644 --- a/0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch +++ b/0053-grub-core-disk-ahci.c-Add-safety-cleanups.patch @@ -1,7 +1,7 @@ From 3f00de9c207fb4b3f9e45fd775650404ce087aac Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 29 Jan 2014 23:46:17 +0100 -Subject: [PATCH 053/143] * grub-core/disk/ahci.c: Add safety cleanups. +Subject: [PATCH 053/152] * grub-core/disk/ahci.c: Add safety cleanups. --- ChangeLog | 4 ++++ diff --git a/0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch b/0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch index 1dbe706..dceb20e 100644 --- a/0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch +++ b/0054-grub-core-disk-ahci.c-Properly-handle-transactions-w.patch @@ -1,7 +1,7 @@ From 5e8c619b17cdf70b30d37412738b149d80874c28 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 29 Jan 2014 23:49:51 +0100 -Subject: [PATCH 054/143] * grub-core/disk/ahci.c: Properly handle +Subject: [PATCH 054/152] * grub-core/disk/ahci.c: Properly handle transactions with no transferred data. --- diff --git a/0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch b/0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch index 0e135a8..843513e 100644 --- a/0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch +++ b/0055-grub-core-disk-ahci.c-Increase-timeout.-Some-SSDs-ta.patch @@ -1,7 +1,7 @@ From 45dd39fb467d061a550113fd5e5431209f0db73c Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 29 Jan 2014 23:50:49 +0100 -Subject: [PATCH 055/143] * grub-core/disk/ahci.c: Increase timeout. +Subject: [PATCH 055/152] * grub-core/disk/ahci.c: Increase timeout. Some SSDs take up to 7 seconds to recover if last poweroff was bad. --- diff --git a/0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch b/0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch index b2dbf4f..4fc8f1b 100644 --- a/0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch +++ b/0056-util-grub-mkfont.c-Build-fix-for-argp.h-with-older-g.patch @@ -1,7 +1,7 @@ From 767cf43a2e5c738df50155cc8729ad0f57d6ab47 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 3 Feb 2014 14:34:27 +0100 -Subject: [PATCH 056/143] * util/grub-mkfont.c: Build fix for argp.h +Subject: [PATCH 056/152] * util/grub-mkfont.c: Build fix for argp.h with older gcc. --- diff --git a/0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch b/0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch index 20ed6af..59a32cf 100644 --- a/0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch +++ b/0057-util-grub-mkrescue.c-Build-fix-for-argp.h-with-older.patch @@ -1,7 +1,7 @@ From 3365d3eb4062cee9581f3560ec3e93f8c8ababb2 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 3 Feb 2014 14:35:51 +0100 -Subject: [PATCH 057/143] * util/grub-mkrescue.c: Build fix for argp.h +Subject: [PATCH 057/152] * util/grub-mkrescue.c: Build fix for argp.h with older gcc. --- diff --git a/0058-add-grub_env_set_net_property-function.patch b/0058-add-grub_env_set_net_property-function.patch index 18e1201..7256e06 100644 --- a/0058-add-grub_env_set_net_property-function.patch +++ b/0058-add-grub_env_set_net_property-function.patch @@ -1,7 +1,7 @@ From 533058df7c164a4d3498dfaa626923904597f162 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 4 Feb 2014 18:41:38 -0200 -Subject: [PATCH 058/143] add grub_env_set_net_property function +Subject: [PATCH 058/152] add grub_env_set_net_property function * grub-core/net/bootp.c: Remove set_env_limn_ro. * grub-core/net/net.c: Add grub_env_set_net_property. diff --git a/0059-add-bootpath-parser-for-open-firmware.patch b/0059-add-bootpath-parser-for-open-firmware.patch index b2bd212..a4af3b6 100644 --- a/0059-add-bootpath-parser-for-open-firmware.patch +++ b/0059-add-bootpath-parser-for-open-firmware.patch @@ -1,7 +1,7 @@ From 1a768cc5a65094e19c216caf92dd190317df25fc Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 4 Feb 2014 19:00:55 -0200 -Subject: [PATCH 059/143] add bootpath parser for open firmware +Subject: [PATCH 059/152] add bootpath parser for open firmware It enables net boot even when there is no bootp/dhcp server. diff --git a/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch b/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch index 52d68c3..c03e1d1 100644 --- a/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch +++ b/0060-grub-core-disk-ahci.c-Ignore-NPORTS-field-and-rely-o.patch @@ -1,7 +1,7 @@ From 7f4e3839c9b872f0981e1ecdecfa2bd91065f99c Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 20 Feb 2014 10:11:43 +0100 -Subject: [PATCH 060/143] * grub-core/disk/ahci.c: Ignore NPORTS field +Subject: [PATCH 060/152] * grub-core/disk/ahci.c: Ignore NPORTS field and rely on PI exclusively. --- diff --git a/0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch b/0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch index 11deb12..f8c2180 100644 --- a/0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch +++ b/0061-grub-core-kern-i386-coreboot-mmap.c-Filter-out-0xa00.patch @@ -1,7 +1,7 @@ From c65d7e05498edecd560753768114b574f7c3543d Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 28 Feb 2014 09:47:57 +0100 -Subject: [PATCH 061/143] * grub-core/kern/i386/coreboot/mmap.c: Filter +Subject: [PATCH 061/152] * grub-core/kern/i386/coreboot/mmap.c: Filter out 0xa0000-0x100000 region. --- diff --git a/0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch b/0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch index b98968e..74d7442 100644 --- a/0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch +++ b/0062-grub-core-loader-i386-multiboot_mbi.c-grub_multiboot.patch @@ -1,7 +1,7 @@ From 4530afc725782bbb92d4681fc338acebc4604b45 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 28 Feb 2014 09:48:57 +0100 -Subject: [PATCH 062/143] * grub-core/loader/i386/multiboot_mbi.c +Subject: [PATCH 062/152] * grub-core/loader/i386/multiboot_mbi.c (grub_multiboot_make_mbi): Limit location to 640K. --- diff --git a/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch b/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch index a2820a8..cb3de42 100644 --- a/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch +++ b/0063-grub-core-mmap-i386-uppermem.c-lower_hook-COREBOOT-I.patch @@ -1,7 +1,7 @@ From e85cc7078e669509d3a22c4e76f94cdd53335fff Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 28 Feb 2014 09:50:47 +0100 -Subject: [PATCH 063/143] * grub-core/mmap/i386/uppermem.c (lower_hook) +Subject: [PATCH 063/152] * grub-core/mmap/i386/uppermem.c (lower_hook) [COREBOOT]: Ignore low tables for low memory calculations. --- diff --git a/0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch b/0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch index 4c0dac1..b0a6310 100644 --- a/0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch +++ b/0064-grub-core-kern-i386-pc-mmap.c-Fallback-to-EISA-memor.patch @@ -1,7 +1,7 @@ From 37e3b5e42930e8cd4e801e4203dc2fde335b4b10 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 28 Feb 2014 10:07:11 +0100 -Subject: [PATCH 064/143] * grub-core/kern/i386/pc/mmap.c: Fallback to +Subject: [PATCH 064/152] * grub-core/kern/i386/pc/mmap.c: Fallback to EISA memory map if E820 failed to return any regions. --- diff --git a/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch b/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch index ba1192e..6fcca74 100644 --- a/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch +++ b/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch @@ -1,7 +1,7 @@ From 1cdf2c717c0f4a2efac0e5dc8b5c564f930c537a Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 28 Feb 2014 10:50:05 +0100 -Subject: [PATCH 065/143] * include/grub/i386/openbsd_bootarg.h: Add +Subject: [PATCH 065/152] * include/grub/i386/openbsd_bootarg.h: Add addr and frequency fields. * grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Fill addr field. MIME-Version: 1.0 diff --git a/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch b/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch index 4dc5ad3..127c56b 100644 --- a/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch +++ b/0066-ieee1275-check-for-IBM-pseries-emulated-machine.patch @@ -1,7 +1,7 @@ From 2a20b05871d51635060ab58c1b63ac2ee9f8a359 Mon Sep 17 00:00:00 2001 From: Nikunj A Dadhania Date: Thu, 20 Mar 2014 16:57:12 +0530 -Subject: [PATCH 066/143] ieee1275: check for IBM pseries emulated machine +Subject: [PATCH 066/152] ieee1275: check for IBM pseries emulated machine is_qemu is not being set lead to disabling of feature like GRUB_IEEE1275_FLAG_HAS_CURSORONOFF. This resulted in cursor not being diff --git a/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch b/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch index 65614f5..183c570 100644 --- a/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch +++ b/0067-grub-core-loader-arm64-linux.c-Remove-redundant-0x.patch @@ -1,7 +1,7 @@ From 530b22a1c04a08fbdb4dcbc3d34bc610af17cc68 Mon Sep 17 00:00:00 2001 From: Fu Wei Date: Wed, 26 Mar 2014 08:13:07 +0100 -Subject: [PATCH 067/143] * grub-core/loader/arm64/linux.c: Remove +Subject: [PATCH 067/152] * grub-core/loader/arm64/linux.c: Remove redundant "0x". --- diff --git a/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch b/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch index d5cb1d1..aaab022 100644 --- a/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch +++ b/0068-grub-core-lib-relocator.c-Fix-the-case-when-end-of-l.patch @@ -1,7 +1,7 @@ From 5d1749ea5730be5c9c32228461b784317a500f4b Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Wed, 26 Mar 2014 08:48:30 +0100 -Subject: [PATCH 068/143] * grub-core/lib/relocator.c: Fix the case when +Subject: [PATCH 068/152] * grub-core/lib/relocator.c: Fix the case when end of leftover is used. --- diff --git a/0069-Fix-grub-probe-0-option.patch b/0069-Fix-grub-probe-0-option.patch index d85fa3a..a18d82c 100644 --- a/0069-Fix-grub-probe-0-option.patch +++ b/0069-Fix-grub-probe-0-option.patch @@ -1,7 +1,7 @@ From fdf24f98bc9e4632bfe7f280872cbbf40942ae7b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 31 Mar 2014 13:51:17 +0100 -Subject: [PATCH 069/143] Fix grub-probe -0 option +Subject: [PATCH 069/152] Fix grub-probe -0 option * util/grub-probe,c (options): Make -0 work again (broken by conversion to argp). diff --git a/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch b/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch index 64e8ab2..795da7e 100644 --- a/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch +++ b/0070-Fix-partmap-cryptodisk-and-abstraction-handling-in-g.patch @@ -1,7 +1,7 @@ From 0a65563c2b355c0eb7412b46f015556691f1b5d1 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 31 Mar 2014 14:48:33 +0100 -Subject: [PATCH 070/143] Fix partmap, cryptodisk, and abstraction handling in +Subject: [PATCH 070/152] Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig. Commit 588744d0dc655177d5883bdcb8f72ff5160109ed caused grub-mkconfig diff --git a/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch b/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch index 7cd3384..12d71f0 100644 --- a/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch +++ b/0071-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch @@ -1,7 +1,7 @@ From bd2125649cbeae60a5caff05d5a39c88a4e6eff6 Mon Sep 17 00:00:00 2001 From: Thomas Falcon Date: Mon, 31 Mar 2014 15:32:30 +0100 -Subject: [PATCH 071/143] btrfs: fix get_root key comparison failures due to +Subject: [PATCH 071/152] btrfs: fix get_root key comparison failures due to endianness * grub-core/fs/btrfs.c (get_root): Convert diff --git a/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch b/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch index e8af09a..86e5abd 100644 --- a/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch +++ b/0072-grub-core-osdep-linux-getroot.c-grub_util_part_to_di.patch @@ -1,7 +1,7 @@ From c3d9e64a61d17e57ef941a6a46e5a148c51c8519 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 3 Apr 2014 21:31:12 +0200 -Subject: [PATCH 072/143] * grub-core/osdep/linux/getroot.c +Subject: [PATCH 072/152] * grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Support NVMe device names. --- diff --git a/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch b/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch index 8846511..34271a4 100644 --- a/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch +++ b/0073-Replace-few-instances-of-memcmp-memcpy-in-the-code-t.patch @@ -1,7 +1,7 @@ From cb2cfc87fad111a539e9645f6a96d0a89a28c8ab Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 4 Apr 2014 07:58:42 +0200 -Subject: [PATCH 073/143] Replace few instances of memcmp/memcpy in the code +Subject: [PATCH 073/152] Replace few instances of memcmp/memcpy in the code that should be grub_memcmp/grub_memcpy. --- diff --git a/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch b/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch index 564f09e..b8f821e 100644 --- a/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch +++ b/0074-include-grub-libgcc.h-Remove-ctzsi2-and-ctzdi2.-They.patch @@ -1,7 +1,7 @@ From 91152c6e2944e9ad3583482140f8991b972fec08 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 4 Apr 2014 08:02:38 +0200 -Subject: [PATCH 074/143] * include/grub/libgcc.h: Remove ctzsi2 and ctzdi2. +Subject: [PATCH 074/152] * include/grub/libgcc.h: Remove ctzsi2 and ctzdi2. They're no longer pulled from libgcc. --- diff --git a/0075-Add-missing-endif.patch b/0075-Add-missing-endif.patch index df7aa60..84b1629 100644 --- a/0075-Add-missing-endif.patch +++ b/0075-Add-missing-endif.patch @@ -1,7 +1,7 @@ From fb1b02802aa368f43c8d0a871e017c14cb39b180 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 4 Apr 2014 08:11:15 +0200 -Subject: [PATCH 075/143] Add missing #endif +Subject: [PATCH 075/152] Add missing #endif --- include/grub/libgcc.h | 1 + diff --git a/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch b/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch index c1037c8..6a8431a 100644 --- a/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch +++ b/0076-grub-core-lib-syslinux_parse.c-Fix-timeout-quoting.patch @@ -1,7 +1,7 @@ From fb62186fefaca6b302eb61081bb6281042ff7283 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 6 Apr 2014 00:44:44 +0200 -Subject: [PATCH 076/143] * grub-core/lib/syslinux_parse.c: Fix timeout +Subject: [PATCH 076/152] * grub-core/lib/syslinux_parse.c: Fix timeout quoting. --- diff --git a/0077-Improve-LVM-logical_volumes-string-matching.patch b/0077-Improve-LVM-logical_volumes-string-matching.patch index 3b774c9..b8723cf 100644 --- a/0077-Improve-LVM-logical_volumes-string-matching.patch +++ b/0077-Improve-LVM-logical_volumes-string-matching.patch @@ -1,7 +1,7 @@ From d576e05a7bfe25413f70b54f671f305397bacf5e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 10 Apr 2014 14:42:41 +0100 -Subject: [PATCH 077/143] Improve LVM "logical_volumes" string matching +Subject: [PATCH 077/152] Improve LVM "logical_volumes" string matching * grub-core/disk/lvm.c (grub_lvm_detect): Search for "logical_volumes" block a little more accurately. diff --git a/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch b/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch index f512a75..8badef7 100644 --- a/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch +++ b/0078-Tolerate-devices-with-no-filesystem-UUID-returned-by.patch @@ -1,7 +1,7 @@ From 0942ce33c5b88d85a6b81f4b3dd75c32fdf21978 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 10 Apr 2014 16:54:33 +0100 -Subject: [PATCH 078/143] Tolerate devices with no filesystem UUID returned by +Subject: [PATCH 078/152] Tolerate devices with no filesystem UUID returned by os-prober * util/grub.d/30_os-prober.in: Tolerate devices with no filesystem diff --git a/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch b/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch index 0efba39..e664213 100644 --- a/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch +++ b/0079-Allow-loading-old-kernels-by-placing-GDT-in-conventi.patch @@ -1,7 +1,7 @@ From 42c1756fd0ff7d94dcc8e9be2e429a2a976f6d41 Mon Sep 17 00:00:00 2001 From: Piotr Krysiuk Date: Sun, 20 Apr 2014 15:58:45 +0200 -Subject: [PATCH 079/143] Allow loading old kernels by placing GDT in +Subject: [PATCH 079/152] Allow loading old kernels by placing GDT in conventional memory. --- diff --git a/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch b/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch index aaa2228..584fa1b 100644 --- a/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch +++ b/0080-grub-core-kern-misc.c-__bzero-Don-t-compile-in-GRUB_.patch @@ -1,7 +1,7 @@ From ec4609b70a7deebf6381297aae95dd4bf05bd008 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 20 Apr 2014 16:12:41 +0200 -Subject: [PATCH 080/143] * grub-core/kern/misc.c (__bzero): Don't +Subject: [PATCH 080/152] * grub-core/kern/misc.c (__bzero): Don't compile in GRUB_UTIL. Reported by: Yves Blusseau . diff --git a/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch b/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch index 67e8193..2be9e72 100644 --- a/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch +++ b/0081-grub-core-commands-verify.c-grub_pubkey_open-Fix-mem.patch @@ -1,7 +1,7 @@ From 4a307e8fe1298f88641a40c8a8008363aa4b9c17 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Mon, 12 May 2014 10:01:48 +0200 -Subject: [PATCH 081/143] * grub-core/commands/verify.c +Subject: [PATCH 081/152] * grub-core/commands/verify.c (grub_pubkey_open): Fix memdisk check. --- diff --git a/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch b/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch index 5ad0e40..c50cb1f 100644 --- a/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch +++ b/0082-grub-core-commands-verify.c-grub_pubkey_open-Trust-p.patch @@ -1,7 +1,7 @@ From 61fdf8bebdeaed4b601f0eca847282780380191f Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 15 May 2014 14:36:48 +0200 -Subject: [PATCH 082/143] * grub-core/commands/verify.c +Subject: [PATCH 082/152] * grub-core/commands/verify.c (grub_pubkey_open): Trust procfs. --- diff --git a/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch b/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch index 0189af4..2f6681e 100644 --- a/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch +++ b/0083-util-grub-gen-asciih.c-add_glyph-Fix-uninitialised-v.patch @@ -1,7 +1,7 @@ From 473348e663de53939fc077a1e1ef262405712dd8 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Sat, 21 Jun 2014 20:26:47 +0200 -Subject: [PATCH 083/143] * util/grub-gen-asciih.c (add_glyph): Fix +Subject: [PATCH 083/152] * util/grub-gen-asciih.c (add_glyph): Fix uninitialised variable. --- diff --git a/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch b/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch index 5dc0249..635ac9b 100644 --- a/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch +++ b/0084-grub-core-commands-efi-lsefisystab.c-grub_cmd_lsefis.patch @@ -1,7 +1,7 @@ From 9de53cc99ce4c8e404e645443d07324bd9cfc157 Mon Sep 17 00:00:00 2001 From: Stephane Rochoy Date: Sun, 22 Jun 2014 01:34:57 +0200 -Subject: [PATCH 084/143] * grub-core/commands/efi/lsefisystab.c +Subject: [PATCH 084/152] * grub-core/commands/efi/lsefisystab.c (grub_cmd_lsefisystab): Show EFI system table physical address. --- diff --git a/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch b/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch index 5b06a4e..8182d92 100644 --- a/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch +++ b/0085-grub-core-loader-i386-bsd.c-grub_netbsd_boot-Pass-po.patch @@ -1,7 +1,7 @@ From 3be166827cecb977ad47ac4d3d89ec92688307a4 Mon Sep 17 00:00:00 2001 From: Stephane Rochoy Date: Sun, 22 Jun 2014 01:35:52 +0200 -Subject: [PATCH 085/143] * grub-core/loader/i386/bsd.c +Subject: [PATCH 085/152] * grub-core/loader/i386/bsd.c (grub_netbsd_boot): Pass pointer to EFI system table. --- diff --git a/0086-util-grub-install.c-Fix-handling-of-disk-module.patch b/0086-util-grub-install.c-Fix-handling-of-disk-module.patch index 26c86f6..203967d 100644 --- a/0086-util-grub-install.c-Fix-handling-of-disk-module.patch +++ b/0086-util-grub-install.c-Fix-handling-of-disk-module.patch @@ -1,7 +1,7 @@ From d45ed8a6bf7c0c0abacb268da1f6d569743f16a0 Mon Sep 17 00:00:00 2001 From: Glenn Washburn Date: Sun, 22 Jun 2014 01:45:11 +0200 -Subject: [PATCH 086/143] * util/grub-install.c: Fix handling of +Subject: [PATCH 086/152] * util/grub-install.c: Fix handling of --disk-module. --- diff --git a/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch b/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch index 57e46ef..07c5419 100644 --- a/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch +++ b/0087-grub-core-commands-loadenv.c-check_blocklists-Fix-ov.patch @@ -2,7 +2,7 @@ From a9c472a7eeec6816868dbccce6decaef3b3c62bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9F=D0=B5=D1=85=D0=BE?= =?UTF-8?q?=D0=B2?= Date: Sun, 22 Jun 2014 03:51:50 +0400 -Subject: [PATCH 087/143] * grub-core/commands/loadenv.c +Subject: [PATCH 087/152] * grub-core/commands/loadenv.c (check_blocklists): Fix overlap check. --- diff --git a/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch b/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch index 4df5517..9e99379 100644 --- a/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch +++ b/0088-NEWS-The-cmosclean-command-in-fact-dates-back-to-1.9.patch @@ -1,7 +1,7 @@ From e4ecf3a1f8eef683feae27ed84c85eb8aeb79e11 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 28 Dec 2013 02:20:27 +0000 -Subject: [PATCH 088/143] * NEWS: The cmosclean command in fact dates back to +Subject: [PATCH 088/152] * NEWS: The cmosclean command in fact dates back to 1.99. Remove mention of it from 2.02. --- diff --git a/0089-Migrate-PPC-from-Yaboot-to-Grub2.patch b/0089-Migrate-PPC-from-Yaboot-to-Grub2.patch index 0065544..bcd3f45 100644 --- a/0089-Migrate-PPC-from-Yaboot-to-Grub2.patch +++ b/0089-Migrate-PPC-from-Yaboot-to-Grub2.patch @@ -1,7 +1,7 @@ From f01392a68f7f20bcc064a7d28e10805509701c4d Mon Sep 17 00:00:00 2001 From: Mark Hamzy Date: Wed, 28 Mar 2012 14:46:41 -0500 -Subject: [PATCH 089/143] Migrate PPC from Yaboot to Grub2 +Subject: [PATCH 089/152] 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. diff --git a/0090-Add-fw_path-variable-revised.patch b/0090-Add-fw_path-variable-revised.patch index 5caff3f..96eb202 100644 --- a/0090-Add-fw_path-variable-revised.patch +++ b/0090-Add-fw_path-variable-revised.patch @@ -1,7 +1,7 @@ From 5bd3e1f888eeddc2575608516220ffa7b8270c7a Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 19 Sep 2012 21:22:55 -0300 -Subject: [PATCH 090/143] Add fw_path variable (revised) +Subject: [PATCH 090/152] 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 diff --git a/0091-Add-support-for-linuxefi.patch b/0091-Add-support-for-linuxefi.patch index d3f4172..348c517 100644 --- a/0091-Add-support-for-linuxefi.patch +++ b/0091-Add-support-for-linuxefi.patch @@ -1,7 +1,7 @@ From 70e7bfb2caa9d0f52187b4f6e84762c6459c5903 Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 10 Jul 2012 11:58:52 -0400 -Subject: [PATCH 091/143] Add support for linuxefi +Subject: [PATCH 091/152] Add support for linuxefi --- grub-core/Makefile.core.def | 8 + diff --git a/0092-Use-linuxefi-and-initrdefi-where-appropriate.patch b/0092-Use-linuxefi-and-initrdefi-where-appropriate.patch index e0e1cf2..8ac647c 100644 --- a/0092-Use-linuxefi-and-initrdefi-where-appropriate.patch +++ b/0092-Use-linuxefi-and-initrdefi-where-appropriate.patch @@ -1,7 +1,7 @@ From acc83cfa76a6457be73b1e748a80deb3967e2364 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 16 Jul 2012 18:57:11 -0400 -Subject: [PATCH 092/143] Use "linuxefi" and "initrdefi" where appropriate. +Subject: [PATCH 092/152] Use "linuxefi" and "initrdefi" where appropriate. --- util/grub.d/10_linux.in | 18 ++++++++++++++++-- diff --git a/0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch b/0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch index 79eea04..6de4437 100644 --- a/0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch +++ b/0093-Don-t-allow-insmod-when-secure-boot-is-enabled.patch @@ -1,7 +1,7 @@ From fe7b32ab9e58470fdf930d8efc7c9ebcd69e6ef3 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 23 Oct 2012 10:40:49 -0400 -Subject: [PATCH 093/143] Don't allow insmod when secure boot is enabled. +Subject: [PATCH 093/152] Don't allow insmod when secure boot is enabled. Hi, diff --git a/0094-Pass-x-hex-hex-straight-through-unmolested.patch b/0094-Pass-x-hex-hex-straight-through-unmolested.patch index 83cf483..80b5fd0 100644 --- a/0094-Pass-x-hex-hex-straight-through-unmolested.patch +++ b/0094-Pass-x-hex-hex-straight-through-unmolested.patch @@ -1,7 +1,7 @@ From a4f335a93d417c7f51f715d55ae59621fc9772ad Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 1 Oct 2012 13:24:37 -0400 -Subject: [PATCH 094/143] Pass "\x[[:hex:]][[:hex:]]" straight through +Subject: [PATCH 094/152] Pass "\x[[:hex:]][[:hex:]]" straight through unmolested. --- diff --git a/0095-Fix-crash-on-http.patch b/0095-Fix-crash-on-http.patch index cf87c9e..399384e 100644 --- a/0095-Fix-crash-on-http.patch +++ b/0095-Fix-crash-on-http.patch @@ -1,7 +1,7 @@ From e5a51c7c96d347cd6cbb7a2aa11f5dd7358c802a Mon Sep 17 00:00:00 2001 From: Gustavo Luiz Duarte Date: Tue, 25 Sep 2012 18:40:55 -0400 -Subject: [PATCH 095/143] Fix crash on http +Subject: [PATCH 095/152] Fix crash on http Don't free file->data on receiving FIN flag since it is used all over without checking. http_close() will be called later to free that memory. diff --git a/0096-IBM-client-architecture-CAS-reboot-support.patch b/0096-IBM-client-architecture-CAS-reboot-support.patch index 93bb525..133896b 100644 --- a/0096-IBM-client-architecture-CAS-reboot-support.patch +++ b/0096-IBM-client-architecture-CAS-reboot-support.patch @@ -1,7 +1,7 @@ From 9d1411ffa7290c1cbdc9ee95bb5fcc5506e63e0f Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Thu, 20 Sep 2012 18:07:39 -0300 -Subject: [PATCH 096/143] IBM client architecture (CAS) reboot support +Subject: [PATCH 096/152] IBM client architecture (CAS) reboot support This is an implementation of IBM client architecture (CAS) reboot for GRUB. diff --git a/0097-Add-vlan-tag-support.patch b/0097-Add-vlan-tag-support.patch index dad2d5d..20c6ed0 100644 --- a/0097-Add-vlan-tag-support.patch +++ b/0097-Add-vlan-tag-support.patch @@ -1,7 +1,7 @@ From c987623113e2d03e80f0ba1e108bf0a800628f85 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 30 Oct 2012 15:19:39 -0200 -Subject: [PATCH 097/143] Add vlan-tag support +Subject: [PATCH 097/152] Add vlan-tag support This patch adds support for virtual LAN (VLAN) tagging. VLAN tagging allows multiple VLANs in a bridged network to share the same physical network link but diff --git a/0098-Add-X-option-to-printf-functions.patch b/0098-Add-X-option-to-printf-functions.patch index 8865950..f753e07 100644 --- a/0098-Add-X-option-to-printf-functions.patch +++ b/0098-Add-X-option-to-printf-functions.patch @@ -1,7 +1,7 @@ From d7aaf1651f4b36721f73331753d017d33d7879b4 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 16:58:39 -0200 -Subject: [PATCH 098/143] Add %X option to printf functions. +Subject: [PATCH 098/152] Add %X option to printf functions. --- grub-core/kern/misc.c | 7 +++++-- diff --git a/0099-DHCP-client-ID-and-UUID-options-added.patch b/0099-DHCP-client-ID-and-UUID-options-added.patch index 1699024..62451ff 100644 --- a/0099-DHCP-client-ID-and-UUID-options-added.patch +++ b/0099-DHCP-client-ID-and-UUID-options-added.patch @@ -1,7 +1,7 @@ From 2f3846a557e4ddf83f44e166d959ee460bedf8e1 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:18:53 -0200 -Subject: [PATCH 099/143] DHCP client ID and UUID options added. +Subject: [PATCH 099/152] DHCP client ID and UUID options added. --- grub-core/net/bootp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++----- diff --git a/0100-Search-for-specific-config-file-for-netboot.patch b/0100-Search-for-specific-config-file-for-netboot.patch index 2616383..274d16e 100644 --- a/0100-Search-for-specific-config-file-for-netboot.patch +++ b/0100-Search-for-specific-config-file-for-netboot.patch @@ -1,7 +1,7 @@ From bf19a1e123fd09552165bd0d2b19ccf438c0a46c Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 27 Nov 2012 17:22:07 -0200 -Subject: [PATCH 100/143] Search for specific config file for netboot +Subject: [PATCH 100/152] 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: diff --git a/0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch b/0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch index b7dc5dc..407e832 100644 --- a/0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch +++ b/0101-blscfg-add-blscfg-module-to-parse-Boot-Loader-Specif.patch @@ -1,7 +1,7 @@ From ddfb160353df14e9f88affe7498512a553146872 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Tue, 22 Jan 2013 06:31:38 +0100 -Subject: [PATCH 101/143] blscfg: add blscfg module to parse Boot Loader +Subject: [PATCH 101/152] blscfg: add blscfg module to parse Boot Loader Specification snippets http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec diff --git a/0102-Move-bash-completion-script-922997.patch b/0102-Move-bash-completion-script-922997.patch index 97d882b..a8d703c 100644 --- a/0102-Move-bash-completion-script-922997.patch +++ b/0102-Move-bash-completion-script-922997.patch @@ -1,7 +1,7 @@ From f60046d87e55646d36c21520c5f6391c184ec8ad Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Apr 2013 14:35:34 -0400 -Subject: [PATCH 102/143] Move bash completion script (#922997) +Subject: [PATCH 102/152] Move bash completion script (#922997) Apparently these go in a new place now. --- diff --git a/0103-for-ppc-reset-console-display-attr-when-clear-screen.patch b/0103-for-ppc-reset-console-display-attr-when-clear-screen.patch index 0bbfabc..2a37af3 100644 --- a/0103-for-ppc-reset-console-display-attr-when-clear-screen.patch +++ b/0103-for-ppc-reset-console-display-attr-when-clear-screen.patch @@ -1,7 +1,7 @@ From e52a5b66e765740deea4dbd201ab802c408184b9 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 24 Apr 2013 10:51:48 -0300 -Subject: [PATCH 103/143] for ppc, reset console display attr when clear screen +Subject: [PATCH 103/152] for ppc, reset console display attr when clear screen This should fix this bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=908519 diff --git a/0104-Don-t-write-messages-to-the-screen.patch b/0104-Don-t-write-messages-to-the-screen.patch index c3bb21c..688e66e 100644 --- a/0104-Don-t-write-messages-to-the-screen.patch +++ b/0104-Don-t-write-messages-to-the-screen.patch @@ -1,7 +1,7 @@ From 0ee337319fc8c21da04bca1cabb51b3445dba3fd Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:30:20 -0400 -Subject: [PATCH 104/143] Don't write messages to the screen +Subject: [PATCH 104/152] 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 diff --git a/0105-Don-t-print-GNU-GRUB-header.patch b/0105-Don-t-print-GNU-GRUB-header.patch index 5ae2b7e..1b16ad4 100644 --- a/0105-Don-t-print-GNU-GRUB-header.patch +++ b/0105-Don-t-print-GNU-GRUB-header.patch @@ -1,7 +1,7 @@ From e3cabcd95237fadbad8e6a0e36222d97d16b5365 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:53:48 -0400 -Subject: [PATCH 105/143] Don't print GNU GRUB header +Subject: [PATCH 105/152] Don't print GNU GRUB header No one cares. --- diff --git a/0106-Don-t-add-to-highlighted-row.patch b/0106-Don-t-add-to-highlighted-row.patch index e1bcb39..3046550 100644 --- a/0106-Don-t-add-to-highlighted-row.patch +++ b/0106-Don-t-add-to-highlighted-row.patch @@ -1,7 +1,7 @@ From c89f05d148a1a1416513d22f62d23504b35dd230 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 17:49:45 -0400 -Subject: [PATCH 106/143] Don't add '*' to highlighted row +Subject: [PATCH 106/152] Don't add '*' to highlighted row It is already highlighted. --- diff --git a/0107-Message-string-cleanups.patch b/0107-Message-string-cleanups.patch index 2c71592..9ee9ab7 100644 --- a/0107-Message-string-cleanups.patch +++ b/0107-Message-string-cleanups.patch @@ -1,7 +1,7 @@ From 6c33a9b3a96a5e8c782a8eef97f5d95a3a542921 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 11:09:04 -0400 -Subject: [PATCH 107/143] Message string cleanups +Subject: [PATCH 107/152] Message string cleanups Make use of terminology consistent. Remove jargon. --- diff --git a/0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch b/0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch index 7d1da28..3496c9e 100644 --- a/0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch +++ b/0108-Fix-border-spacing-now-that-we-aren-t-displaying-it.patch @@ -1,7 +1,7 @@ From 6227514ebbfcf1744060eb4bf1b39b669221809d Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:23 -0400 -Subject: [PATCH 108/143] Fix border spacing now that we aren't displaying it +Subject: [PATCH 108/152] Fix border spacing now that we aren't displaying it --- grub-core/normal/menu_text.c | 6 +++--- diff --git a/0109-Use-the-correct-indentation-for-the-term-help-text.patch b/0109-Use-the-correct-indentation-for-the-term-help-text.patch index 6911db2..4efaa43 100644 --- a/0109-Use-the-correct-indentation-for-the-term-help-text.patch +++ b/0109-Use-the-correct-indentation-for-the-term-help-text.patch @@ -1,7 +1,7 @@ From 9cc9edb600ad1acc1598910ed95a8482ff3de6e2 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:08:49 -0400 -Subject: [PATCH 109/143] Use the correct indentation for the term help text +Subject: [PATCH 109/152] Use the correct indentation for the term help text That is consistent with the menu help text --- diff --git a/0110-Indent-menu-entries.patch b/0110-Indent-menu-entries.patch index 7930d76..2e77880 100644 --- a/0110-Indent-menu-entries.patch +++ b/0110-Indent-menu-entries.patch @@ -1,7 +1,7 @@ From e52c695e09447f6fbc51c23f1745d50c6db5c7b8 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:30:55 -0400 -Subject: [PATCH 110/143] Indent menu entries +Subject: [PATCH 110/152] Indent menu entries --- grub-core/normal/menu_text.c | 3 ++- diff --git a/0111-Fix-margins.patch b/0111-Fix-margins.patch index 3c7c493..d5d40e4 100644 --- a/0111-Fix-margins.patch +++ b/0111-Fix-margins.patch @@ -1,7 +1,7 @@ From a623d490ea6a94cc7db68400d3fea5b0c25ccb9c Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 14:59:36 -0400 -Subject: [PATCH 111/143] Fix margins +Subject: [PATCH 111/152] Fix margins --- grub-core/normal/menu_text.c | 8 +++----- diff --git a/0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch b/0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch index c8dd53a..19465af 100644 --- a/0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch +++ b/0112-Add-support-for-UEFI-operating-systems-returned-by-o.patch @@ -1,7 +1,7 @@ From 5980cac9e0320a3eb65e7fb73487a565d21361da Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Wed, 12 Jun 2013 11:51:49 -0400 -Subject: [PATCH 112/143] Add support for UEFI operating systems returned by +Subject: [PATCH 112/152] Add support for UEFI operating systems returned by os-prober os-prober returns UEFI operating systems in the form: diff --git a/0113-Disable-GRUB-video-support-for-IBM-power-machines.patch b/0113-Disable-GRUB-video-support-for-IBM-power-machines.patch index 664682f..de6ff53 100644 --- a/0113-Disable-GRUB-video-support-for-IBM-power-machines.patch +++ b/0113-Disable-GRUB-video-support-for-IBM-power-machines.patch @@ -1,7 +1,7 @@ From 3fd909cbba26f1f76a64aa095937b00cd1785570 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 11 Jun 2013 15:14:05 -0300 -Subject: [PATCH 113/143] Disable GRUB video support for IBM power machines +Subject: [PATCH 113/152] Disable GRUB video support for IBM power machines Should fix the problem in bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=973205 diff --git a/0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch b/0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch index c734740..3dc6736 100644 --- a/0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch +++ b/0114-Use-2-instead-of-1-for-our-right-hand-margin-so-line.patch @@ -1,7 +1,7 @@ From 6550cd89b1dee8c9ad866cbf10bf72dc2ff8a8bc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 21 Jun 2013 14:44:08 -0400 -Subject: [PATCH 114/143] Use -2 instead of -1 for our right-hand margin, so +Subject: [PATCH 114/152] Use -2 instead of -1 for our right-hand margin, so linewrapping works (#976643). Signed-off-by: Peter Jones diff --git a/0115-Use-linux16-when-appropriate-880840.patch b/0115-Use-linux16-when-appropriate-880840.patch index 6cef47e..e4b486c 100644 --- a/0115-Use-linux16-when-appropriate-880840.patch +++ b/0115-Use-linux16-when-appropriate-880840.patch @@ -1,7 +1,7 @@ From ba749818b7a53df63d887cb17497f82c78ca934c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:05:07 -0400 -Subject: [PATCH 115/143] Use linux16 when appropriate (#880840) +Subject: [PATCH 115/152] Use linux16 when appropriate (#880840) The kernel group really would prefer that we use the 16 bit entry point on x86 bios machines. diff --git a/0116-Enable-pager-by-default.-985860.patch b/0116-Enable-pager-by-default.-985860.patch index f300fb8..b66712c 100644 --- a/0116-Enable-pager-by-default.-985860.patch +++ b/0116-Enable-pager-by-default.-985860.patch @@ -1,7 +1,7 @@ From 26f2fbd4fb424ad097ea99578864ae526b79f732 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:09:27 -0400 -Subject: [PATCH 116/143] Enable pager by default. (#985860) +Subject: [PATCH 116/152] Enable pager by default. (#985860) Signed-off-by: Peter Jones --- diff --git a/0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch b/0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch index 0baa67a..a4309a0 100644 --- a/0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch +++ b/0117-F10-doesn-t-work-on-serial-so-don-t-tell-the-user-to.patch @@ -1,7 +1,7 @@ From 3e8fad7dba63db810a9626d472de5270b2d1bb75 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 28 Oct 2013 10:13:27 -0400 -Subject: [PATCH 117/143] F10 doesn't work on serial, so don't tell the user to +Subject: [PATCH 117/152] F10 doesn't work on serial, so don't tell the user to hit it (#987443) Signed-off-by: Peter Jones diff --git a/0118-Don-t-say-GNU-Linux-in-generated-menus.patch b/0118-Don-t-say-GNU-Linux-in-generated-menus.patch index ba22a7f..9521673 100644 --- a/0118-Don-t-say-GNU-Linux-in-generated-menus.patch +++ b/0118-Don-t-say-GNU-Linux-in-generated-menus.patch @@ -1,7 +1,7 @@ From 03d405d9b503c435f3a975c5789a0bda9650a753 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 14 Mar 2011 14:27:42 -0400 -Subject: [PATCH 118/143] Don't say "GNU/Linux" in generated menus. +Subject: [PATCH 118/152] Don't say "GNU/Linux" in generated menus. --- util/grub.d/10_linux.in | 4 ++-- diff --git a/0119-Don-t-draw-a-border-around-the-menu.patch b/0119-Don-t-draw-a-border-around-the-menu.patch index 34e0d66..44df1f5 100644 --- a/0119-Don-t-draw-a-border-around-the-menu.patch +++ b/0119-Don-t-draw-a-border-around-the-menu.patch @@ -1,7 +1,7 @@ From 6bf4deb61df3ecb1e2d108195efa5ac980baa961 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 16:47:33 -0400 -Subject: [PATCH 119/143] Don't draw a border around the menu +Subject: [PATCH 119/152] Don't draw a border around the menu It looks cleaner without it. --- diff --git a/0120-Use-the-standard-margin-for-the-timeout-string.patch b/0120-Use-the-standard-margin-for-the-timeout-string.patch index 4d3af1e..10fb895 100644 --- a/0120-Use-the-standard-margin-for-the-timeout-string.patch +++ b/0120-Use-the-standard-margin-for-the-timeout-string.patch @@ -1,7 +1,7 @@ From a3e6964bd3242bd042489bb510e63fc0224fede4 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 7 Jun 2013 10:52:32 -0400 -Subject: [PATCH 120/143] Use the standard margin for the timeout string +Subject: [PATCH 120/152] Use the standard margin for the timeout string So that it aligns with the other messages --- diff --git a/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch b/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch index 37e91be..d6ee4b4 100644 --- a/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch +++ b/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch @@ -1,7 +1,7 @@ From a7a033ed92a55dd44314ed20f720a3d32fa9c684 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Fri, 10 Jan 2014 09:36:24 -0500 -Subject: [PATCH 121/143] Fix grub_script_execute_sourcecode() usage on ppc. +Subject: [PATCH 121/152] Fix grub_script_execute_sourcecode() usage on ppc. 593e430c made it not take the extra argc/argv that this code still passes it. diff --git a/0122-Add-.eh_frame-to-list-of-relocations-stripped.patch b/0122-Add-.eh_frame-to-list-of-relocations-stripped.patch index cfc5ec3..fd4544c 100644 --- a/0122-Add-.eh_frame-to-list-of-relocations-stripped.patch +++ b/0122-Add-.eh_frame-to-list-of-relocations-stripped.patch @@ -1,7 +1,7 @@ From 9120cc5592d26a945ead586b71820fb9708f5062 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 13 Jan 2014 21:50:59 -0500 -Subject: [PATCH 122/143] Add .eh_frame to list of relocations stripped +Subject: [PATCH 122/152] Add .eh_frame to list of relocations stripped --- conf/Makefile.common | 2 +- diff --git a/0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch b/0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch index 0d77e70..b7907a7 100644 --- a/0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch +++ b/0123-Make-10_linux-work-with-our-changes-for-linux16-and-.patch @@ -1,7 +1,7 @@ From 1c9518bb506f8f4fa6b388571c76797705e7b566 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 13:12:23 -0500 -Subject: [PATCH 123/143] Make 10_linux work with our changes for linux16 and +Subject: [PATCH 123/152] Make 10_linux work with our changes for linux16 and linuxefi on aarch64 Signed-off-by: Peter Jones diff --git a/0124-Don-t-print-during-fdt-loading-method.patch b/0124-Don-t-print-during-fdt-loading-method.patch index 8bf4191..4173e34 100644 --- a/0124-Don-t-print-during-fdt-loading-method.patch +++ b/0124-Don-t-print-during-fdt-loading-method.patch @@ -1,7 +1,7 @@ From aa8c71086da3a28382b8bd958bac1c5d3b2b2be3 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 14 Jan 2014 16:15:46 -0500 -Subject: [PATCH 124/143] Don't print during fdt loading method. +Subject: [PATCH 124/152] Don't print during fdt loading method. Signed-off-by: Peter Jones --- diff --git a/0125-Honor-a-symlink-when-generating-configuration-by-gru.patch b/0125-Honor-a-symlink-when-generating-configuration-by-gru.patch index 1958333..140245b 100644 --- a/0125-Honor-a-symlink-when-generating-configuration-by-gru.patch +++ b/0125-Honor-a-symlink-when-generating-configuration-by-gru.patch @@ -1,7 +1,7 @@ From 37ad82c4f11e293e30eea26302624691e80f19b8 Mon Sep 17 00:00:00 2001 From: Marcel Kolaja Date: Tue, 21 Jan 2014 10:57:08 -0500 -Subject: [PATCH 125/143] Honor a symlink when generating configuration by +Subject: [PATCH 125/152] Honor a symlink when generating configuration by grub2-mkconfig Honor a symlink when generating configuration by grub2-mkconfig, so that diff --git a/0126-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch b/0126-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch index ea0ac8e..ab67c92 100644 --- a/0126-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch +++ b/0126-Don-t-munge-raw-spaces-when-we-re-doing-our-cmdline-.patch @@ -1,7 +1,7 @@ From ee6df3680adbe2bb8165c98ed0e39f6258cd873e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 30 Jun 2014 14:16:46 -0400 -Subject: [PATCH 126/143] Don't munge raw spaces when we're doing our cmdline +Subject: [PATCH 126/152] Don't munge raw spaces when we're doing our cmdline escaping (#923374) Signed-off-by: Peter Jones diff --git a/0127-Don-t-require-a-password-to-boot-entries-generated-b.patch b/0127-Don-t-require-a-password-to-boot-entries-generated-b.patch index 94ed88d..7fe5ae5 100644 --- a/0127-Don-t-require-a-password-to-boot-entries-generated-b.patch +++ b/0127-Don-t-require-a-password-to-boot-entries-generated-b.patch @@ -1,7 +1,7 @@ From 0ce7596ab544955073318a4ed650d7d0615b933e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 11 Feb 2014 11:14:50 -0500 -Subject: [PATCH 127/143] Don't require a password to boot entries generated by +Subject: [PATCH 127/152] 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. diff --git a/0128-Don-t-emit-Booting-.-message.patch b/0128-Don-t-emit-Booting-.-message.patch index c7b26c6..42860f4 100644 --- a/0128-Don-t-emit-Booting-.-message.patch +++ b/0128-Don-t-emit-Booting-.-message.patch @@ -1,7 +1,7 @@ From 34f60bd4d04b142667c5fc0a4287b118834e71bb Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 09:37:49 -0500 -Subject: [PATCH 128/143] Don't emit "Booting ..." message. +Subject: [PATCH 128/152] Don't emit "Booting ..." message. UI team still hates this stuff, so we're disabling it for RHEL 7. diff --git a/0129-Make-CTRL-and-ALT-keys-work-as-expected-on-EFI-syste.patch b/0129-Make-CTRL-and-ALT-keys-work-as-expected-on-EFI-syste.patch index cb00dcc..c3bb0b3 100644 --- a/0129-Make-CTRL-and-ALT-keys-work-as-expected-on-EFI-syste.patch +++ b/0129-Make-CTRL-and-ALT-keys-work-as-expected-on-EFI-syste.patch @@ -1,7 +1,7 @@ From fe42ce5fc9eec355027a533861dfe7f2eeefc63c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 3 Feb 2014 15:21:46 -0500 -Subject: [PATCH 129/143] Make CTRL and ALT keys work as expected on EFI +Subject: [PATCH 129/152] Make CTRL and ALT keys work as expected on EFI systems (version 5). This is version 4. diff --git a/0130-May-as-well-try-it.patch b/0130-May-as-well-try-it.patch index f8b611d..50ec392 100644 --- a/0130-May-as-well-try-it.patch +++ b/0130-May-as-well-try-it.patch @@ -1,7 +1,7 @@ From bd4b1ae40c743174fc0236851855dfaf6094f875 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 4 Mar 2014 11:00:23 -0500 -Subject: [PATCH 130/143] May as well try it. +Subject: [PATCH 130/152] May as well try it. --- conf/Makefile.extra-dist | 1 - diff --git a/0131-use-fw_path-prefix-when-fallback-searching-for-grub-.patch b/0131-use-fw_path-prefix-when-fallback-searching-for-grub-.patch index 20f0dae..6c72384 100644 --- a/0131-use-fw_path-prefix-when-fallback-searching-for-grub-.patch +++ b/0131-use-fw_path-prefix-when-fallback-searching-for-grub-.patch @@ -1,7 +1,7 @@ From d60083bf794914c4f26f561adcdd107abe80cd7e Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 19 Feb 2014 15:58:43 -0500 -Subject: [PATCH 131/143] use fw_path prefix when fallback searching for grub +Subject: [PATCH 131/152] use fw_path prefix when fallback searching for grub config When PXE booting via UEFI firmware, grub was searching for grub.cfg diff --git a/0132-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch b/0132-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch index 23874fc..18b9fd6 100644 --- a/0132-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch +++ b/0132-Try-mac-guid-etc-before-grub.cfg-on-tftp-config-file.patch @@ -1,7 +1,7 @@ From 2927c4943326f09bd626744b8a46fc8ee16fea1c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 6 Mar 2014 11:51:33 -0500 -Subject: [PATCH 132/143] Try mac/guid/etc before grub.cfg on tftp config +Subject: [PATCH 132/152] Try mac/guid/etc before grub.cfg on tftp config files. Signed-off-by: Peter Jones diff --git a/0133-trim-arp-packets-with-abnormal-size.patch b/0133-trim-arp-packets-with-abnormal-size.patch index 8887866..90ffcfc 100644 --- a/0133-trim-arp-packets-with-abnormal-size.patch +++ b/0133-trim-arp-packets-with-abnormal-size.patch @@ -1,7 +1,7 @@ From cf2e819b7059f199075b099260983e8108eea74a Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 5 Feb 2014 09:42:42 -0200 -Subject: [PATCH 133/143] trim arp packets with abnormal size +Subject: [PATCH 133/152] 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. diff --git a/0134-Fix-convert-function-to-support-NVMe-devices.patch b/0134-Fix-convert-function-to-support-NVMe-devices.patch index a5b9f8d..abc2a3f 100644 --- a/0134-Fix-convert-function-to-support-NVMe-devices.patch +++ b/0134-Fix-convert-function-to-support-NVMe-devices.patch @@ -1,7 +1,7 @@ From f451ce261bcdb24d3428daac54e32e06c698e2f7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 18 Feb 2014 11:34:00 -0500 -Subject: [PATCH 134/143] Fix convert function to support NVMe devices +Subject: [PATCH 134/152] 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 diff --git a/0135-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch b/0135-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch index afeabe8..fcdff0a 100644 --- a/0135-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch +++ b/0135-Fix-bad-test-on-GRUB_DISABLE_SUBMENU.patch @@ -1,7 +1,7 @@ From da07b568a45d2c87ab2f6e498f0e304c73c5d195 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Wed, 12 Mar 2014 10:58:16 -0400 -Subject: [PATCH 135/143] Fix bad test on GRUB_DISABLE_SUBMENU. +Subject: [PATCH 135/152] Fix bad test on GRUB_DISABLE_SUBMENU. The file /etc/grub.d/10_linux does diff --git a/0136-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch b/0136-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch index 13dfa37..173b3f2 100644 --- a/0136-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch +++ b/0136-Switch-to-use-APM-Mustang-device-tree-for-hardware-t.patch @@ -1,7 +1,7 @@ From e7ba5525f976930b792c91132eb5ec96c5379797 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Mon, 10 Feb 2014 16:13:10 -0500 -Subject: [PATCH 136/143] Switch to use APM Mustang device tree, for hardware +Subject: [PATCH 136/152] Switch to use APM Mustang device tree, for hardware testing. Signed-off-by: David A. Marlin diff --git a/0137-Use-the-default-device-tree-from-the-grub-default-fi.patch b/0137-Use-the-default-device-tree-from-the-grub-default-fi.patch index 32d7b61..f852e24 100644 --- a/0137-Use-the-default-device-tree-from-the-grub-default-fi.patch +++ b/0137-Use-the-default-device-tree-from-the-grub-default-fi.patch @@ -1,7 +1,7 @@ From 5f1ee8ff7170321250874116eb80cbec83cc70ab Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 12 Feb 2014 14:54:04 -0500 -Subject: [PATCH 137/143] Use the default device tree from the grub default +Subject: [PATCH 137/152] Use the default device tree from the grub default file instead of hardcoding a value. diff --git a/0138-reopen-SNP-protocol-for-exclusive-use-by-grub.patch b/0138-reopen-SNP-protocol-for-exclusive-use-by-grub.patch index 1690be3..35692aa 100644 --- a/0138-reopen-SNP-protocol-for-exclusive-use-by-grub.patch +++ b/0138-reopen-SNP-protocol-for-exclusive-use-by-grub.patch @@ -1,7 +1,7 @@ From f4bbb76f70ceca4e089e926ee44d8d3fe919f040 Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Sat, 15 Feb 2014 15:10:22 -0500 -Subject: [PATCH 138/143] reopen SNP protocol for exclusive use by grub +Subject: [PATCH 138/152] reopen SNP protocol for exclusive use by grub --- grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++ diff --git a/0139-Reduce-timer-event-frequency-by-10.patch b/0139-Reduce-timer-event-frequency-by-10.patch index df6e385..934ae2a 100644 --- a/0139-Reduce-timer-event-frequency-by-10.patch +++ b/0139-Reduce-timer-event-frequency-by-10.patch @@ -1,7 +1,7 @@ From 3aed1012cb8f559a0241569d6ec6b1be23844b05 Mon Sep 17 00:00:00 2001 From: Mark Salter Date: Thu, 20 Feb 2014 12:54:52 -0500 -Subject: [PATCH 139/143] Reduce timer event frequency by 10 +Subject: [PATCH 139/152] Reduce timer event frequency by 10 Timer event to keep grub msec counter was running at 1000HZ. This was too fast for UEFI timer driver and resulted in a 10x slowdown in grub time diff --git a/0140-always-return-error-to-UEFI.patch b/0140-always-return-error-to-UEFI.patch index 78ffebf..8789efb 100644 --- a/0140-always-return-error-to-UEFI.patch +++ b/0140-always-return-error-to-UEFI.patch @@ -1,7 +1,7 @@ From 36a34ede9dfa34840c59c7b331c1bc8d8ae7442e Mon Sep 17 00:00:00 2001 From: Fedora Ninjas Date: Wed, 26 Feb 2014 21:49:12 -0500 -Subject: [PATCH 140/143] always return error to UEFI +Subject: [PATCH 140/152] always return error to UEFI --- grub-core/kern/efi/efi.c | 2 +- diff --git a/0141-Add-powerpc-little-endian-ppc64le-flags.patch b/0141-Add-powerpc-little-endian-ppc64le-flags.patch index 0a5460d..8ea344e 100644 --- a/0141-Add-powerpc-little-endian-ppc64le-flags.patch +++ b/0141-Add-powerpc-little-endian-ppc64le-flags.patch @@ -1,7 +1,7 @@ -From 8014cad21bb2cc986f10f0a927036851f490a8ec Mon Sep 17 00:00:00 2001 +From 34df700b6984c730beef2ba9174883d835b360c9 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 13 Aug 2014 18:59:58 +0000 -Subject: [PATCH 141/143] Add powerpc little-endian (ppc64le) flags +Subject: [PATCH 141/152] Add powerpc little-endian (ppc64le) flags libgcc dependency was removed *just* for this target because the distros that use ppc64el doesn't have 32-bit support on it. diff --git a/0142-Files-reorganization-and-include-some-libgcc-fuction.patch b/0142-Files-reorganization-and-include-some-libgcc-fuction.patch index 9d34594..26efb6f 100644 --- a/0142-Files-reorganization-and-include-some-libgcc-fuction.patch +++ b/0142-Files-reorganization-and-include-some-libgcc-fuction.patch @@ -1,7 +1,7 @@ -From a4ea9134214da4801400129cdf7108a5f9e98a10 Mon Sep 17 00:00:00 2001 +From 8bbf108c19b8e9d42f538941a3ae5db49d4c53cd Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 13 Aug 2014 19:00:19 +0000 -Subject: [PATCH 142/143] Files reorganization and include some libgcc fuctions +Subject: [PATCH 142/152] Files reorganization and include some libgcc fuctions As we avoid libgcc dependency for powerpc64el, we moved some functions to other files and add the necessary ones. diff --git a/0143-Suport-for-bi-endianess-in-elf-file.patch b/0143-Suport-for-bi-endianess-in-elf-file.patch index 6971fc9..44285f3 100644 --- a/0143-Suport-for-bi-endianess-in-elf-file.patch +++ b/0143-Suport-for-bi-endianess-in-elf-file.patch @@ -1,7 +1,7 @@ -From 9facac630985467ee1ad40beaed07d50ee18062c Mon Sep 17 00:00:00 2001 +From 15a559aa62cba70b714c066b1075bacfa72cb180 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Fri, 15 Aug 2014 14:39:53 -0300 -Subject: [PATCH 143/143] Suport for bi-endianess in elf file +Subject: [PATCH 143/152] Suport for bi-endianess in elf file * grub-core/kern/elf.c: check and switch endianess with grub_{be,le}_to cpu functions. diff --git a/0144-Add-grub_util_readlink.patch b/0144-Add-grub_util_readlink.patch index 6ba75f0..18f1716 100644 --- a/0144-Add-grub_util_readlink.patch +++ b/0144-Add-grub_util_readlink.patch @@ -1,7 +1,7 @@ From a4492dc21cd26878cc5f4a7766275b17b1f0340c Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:01:03 -0400 -Subject: [PATCH 144/145] Add grub_util_readlink() +Subject: [PATCH 144/152] 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 diff --git a/0145-Make-editenv-chase-symlinks-including-those-across-d.patch b/0145-Make-editenv-chase-symlinks-including-those-across-d.patch index ce4b06c..11365e0 100644 --- a/0145-Make-editenv-chase-symlinks-including-those-across-d.patch +++ b/0145-Make-editenv-chase-symlinks-including-those-across-d.patch @@ -1,7 +1,7 @@ From 4ebb0b512d9cf934ace9478fde7890cebb33f56d Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Sep 2014 10:38:00 -0400 -Subject: [PATCH 145/145] Make editenv chase symlinks including those across +Subject: [PATCH 145/152] Make editenv chase symlinks including those across devices. This lets us make /boot/grub2/grubenv a symlink to diff --git a/0146-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch b/0146-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch new file mode 100644 index 0000000..c4536b2 --- /dev/null +++ b/0146-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch @@ -0,0 +1,33 @@ +From 6c49dab7f960e77a7025cf697b3432bbf480ac96 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 4 Sep 2014 14:23:23 -0400 +Subject: [PATCH 146/152] 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. + +Resolves: rhbz#996794 + +Signed-off-by: Peter Jones +--- + util/grub.d/10_linux.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 6480cd6..ede7175 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -29,7 +29,8 @@ export TEXTDOMAINDIR="@localedir@" + CLASS="--class gnu-linux --class gnu --class os --unrestricted" + + if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then +- OS="$(sed 's, release .*$,,g' /etc/system-release)" ++ OS="$(eval $(grep PRETTY_NAME /etc/os-release) ; echo ${PRETTY_NAME})" ++ CLASS="--class $(eval $(grep '^ID_LIKE=\|^ID=' /etc/os-release) ; [ -n "${ID_LIKE}" ] && echo ${ID_LIKE} || echo ${ID}) ${CLASS}" + else + OS="${GRUB_DISTRIBUTOR}" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" +-- +1.9.3 + diff --git a/0147-Fix-GRUB_DISABLE_SUBMENU-one-more-time.patch b/0147-Fix-GRUB_DISABLE_SUBMENU-one-more-time.patch new file mode 100644 index 0000000..bbe9af4 --- /dev/null +++ b/0147-Fix-GRUB_DISABLE_SUBMENU-one-more-time.patch @@ -0,0 +1,30 @@ +From 9e12a6e3a1cbc5d4747cef1e5f1517337bddf593 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 4 Sep 2014 15:25:22 -0400 +Subject: [PATCH 147/152] Fix GRUB_DISABLE_SUBMENU one more time. + +Resolves: rhbz#1063414 + +Signed-off-by: Peter Jones +--- + util/grub.d/10_linux.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index ede7175..e8088a1 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -256,6 +256,10 @@ while [ "x$list" != "x" ] ; do + linux_root_device_thisversion=${GRUB_DEVICE} + fi + ++ if [ "x${GRUB_DISABLE_SUBMENU}" = "xyes" ] || [ "x${GRUB_DISABLE_SUBMENU}" = "xy" ]; then ++ GRUB_DISABLE_SUBMENU="true" ++ fi ++ + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then + linux_entry "${OS}" "${version}" simple \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" +-- +1.9.3 + diff --git a/0148-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch b/0148-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch new file mode 100644 index 0000000..27301e1 --- /dev/null +++ b/0148-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch @@ -0,0 +1,34 @@ +From 358aef9d8342b92662d4970fa7ec769293a7e879 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 4 Sep 2014 15:52:08 -0400 +Subject: [PATCH 148/152] Minimize the sort ordering for .debug and -rescue- + kernels. + +Resolves: rhbz#1065360 +Signed-off-by: Peter Jones +--- + util/grub-mkconfig_lib.in | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in +index 14fadbc..7ac0bbe 100644 +--- a/util/grub-mkconfig_lib.in ++++ b/util/grub-mkconfig_lib.in +@@ -248,6 +248,14 @@ version_test_gt () + *.old:*.old) ;; + *.old:*) version_test_gt_a="`echo -n "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;; + *:*.old) version_test_gt_b="`echo -n "$version_test_gt_b" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=ge ;; ++ *-rescue-*:*-rescue-*) ;; ++ *.debug:*.debug) ;; ++ *-rescue-*:*.debug) return 1 ;; ++ *.debug:*-rescue-*) return 0 ;; ++ *-rescue-*:*) return 1 ;; ++ *:*-rescue-*) return 0 ;; ++ *.debug:*) return 1 ;; ++ *:*.debug) return 0 ;; + esac + version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b" + return "$?" +-- +1.9.3 + diff --git a/0149-Add-GRUB_DISABLE_UUID.patch b/0149-Add-GRUB_DISABLE_UUID.patch new file mode 100644 index 0000000..44e5537 --- /dev/null +++ b/0149-Add-GRUB_DISABLE_UUID.patch @@ -0,0 +1,101 @@ +From c15606e88f9b6a97985febb331d7ee6d0489ba7e Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 4 Sep 2014 16:49:25 -0400 +Subject: [PATCH 149/152] 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 +as it understands it. + +Good luck. + +Signed-off-by: Peter Jones +--- + docs/grub.texi | 7 +++++++ + util/grub-mkconfig.in | 12 ++++++++++-- + util/grub-mkconfig_lib.in | 4 ++-- + 3 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/docs/grub.texi b/docs/grub.texi +index 46b9e7f..6b112c1 100644 +--- a/docs/grub.texi ++++ b/docs/grub.texi +@@ -1409,6 +1409,13 @@ disable the use of UUIDs, set this option to @samp{true}. + If this option is set to @samp{true}, disable the generation of recovery + mode menu entries. + ++@item GRUB_DISABLE_UUID ++Normally, @command{grub-mkconfig} will generate menu entries that use ++universally-unique identifiers (UUIDs) to identify various filesystems to ++search for files. This is usually more reliable, but in some cases it may ++not be appropriate. To disable this use of UUIDs, set this option to ++@samp{true}. ++ + @item GRUB_VIDEO_BACKEND + 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 beb22de..bc26e7c 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -130,11 +130,11 @@ fi + + # Device containing our userland. Typically used for root= parameter. + GRUB_DEVICE="`${grub_probe} --target=device /`" +-GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true ++GRUB_DEVICE_UUID_GENERATED="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true + + # Device containing our /boot partition. Usually the same as GRUB_DEVICE. + GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`" +-GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true ++GRUB_DEVICE_BOOT_UUID_GENERATED="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true + + # Filesystem for the device containing our userland. Used for stuff like + # choosing Hurd filesystem module. +@@ -148,6 +148,13 @@ if test -f ${sysconfdir}/default/grub ; then + . ${sysconfdir}/default/grub + fi + ++if [ "x$GRUB_DISABLE_UUID" != "xtrue" -a -z "$GRUB_DEVICE_UUID" ]; then ++ GRUB_DEVICE_UUID="$GRUB_DEVICE_UUID_GENERATED" ++fi ++if [ "x$GRUB_DISABLE_UUID" != "xtrue" -a -z "$GRUB_DEVICE_BOOT_UUID" ]; then ++ GRUB_DEVICE_BOOT_UUID="$GRUB_DEVICE_BOOT_UUID_GENERATED" ++fi ++ + # XXX: should this be deprecated at some point? + if [ "x${GRUB_TERMINAL}" != "x" ] ; then + GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}" +@@ -213,6 +220,7 @@ export GRUB_DEFAULT \ + GRUB_SERIAL_COMMAND \ + GRUB_DISABLE_LINUX_UUID \ + GRUB_DISABLE_RECOVERY \ ++ GRUB_DISABLE_UUID \ + GRUB_VIDEO_BACKEND \ + GRUB_GFXMODE \ + GRUB_BACKGROUND \ +diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in +index 7ac0bbe..5c9ed84 100644 +--- a/util/grub-mkconfig_lib.in ++++ b/util/grub-mkconfig_lib.in +@@ -156,7 +156,7 @@ prepare_grub_to_access_device () + if [ "x$fs_hint" != x ]; then + echo "set root='$fs_hint'" + fi +- if fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then ++ if [ "x$GRUB_DISABLE_UUID" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then + hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints= + echo "if [ x\$feature_platform_search_hint = xy ]; then" + echo " search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}" +@@ -173,7 +173,7 @@ grub_get_device_id () + IFS=' + ' + device="$1" +- if fs_uuid="`"${grub_probe}" --device ${device} --target=fs_uuid 2> /dev/null`" ; then ++ if [ "x$GRUB_DISABLE_UUID" != "xtrue" ] && fs_uuid="`"${grub_probe}" --device ${device} --target=fs_uuid 2> /dev/null`" ; then + echo "$fs_uuid"; + else + echo $device |sed 's, ,_,g' +-- +1.9.3 + diff --git a/0150-Allow-fallback-to-include-entries-by-title-not-just-.patch b/0150-Allow-fallback-to-include-entries-by-title-not-just-.patch new file mode 100644 index 0000000..a32934f --- /dev/null +++ b/0150-Allow-fallback-to-include-entries-by-title-not-just-.patch @@ -0,0 +1,131 @@ +From fed4e69879282065708ac7cce9e048f0bb90d51c Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 5 Sep 2014 10:07:04 -0400 +Subject: [PATCH 150/152] Allow "fallback" to include entries by title, not + just number. + +Resolves: rhbz#1026084 + +Signed-off-by: Peter Jones +--- + grub-core/normal/menu.c | 76 +++++++++++++++++++++++++++++++------------------ + 1 file changed, 49 insertions(+), 27 deletions(-) + +diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c +index cc27c37..a446d9a 100644 +--- a/grub-core/normal/menu.c ++++ b/grub-core/normal/menu.c +@@ -163,12 +163,35 @@ grub_menu_set_timeout (int timeout) + } + } + ++static int ++menuentry_eq (const char *id, const char *spec) ++{ ++ const char *ptr1, *ptr2; ++ ptr1 = id; ++ ptr2 = spec; ++ while (1) ++ { ++ if (*ptr2 == '>' && ptr2[1] != '>' && *ptr1 == 0) ++ return 1; ++ if (*ptr2 == '>' && ptr2[1] != '>') ++ return 0; ++ if (*ptr2 == '>') ++ ptr2++; ++ if (*ptr1 != *ptr2) ++ return 0; ++ if (*ptr1 == 0) ++ return 1; ++ ptr1++; ++ ptr2++; ++ } ++} ++ + /* Get the first entry number from the value of the environment variable NAME, + which is a space-separated list of non-negative integers. The entry number + which is returned is stripped from the value of NAME. If no entry number + can be found, -1 is returned. */ + static int +-get_and_remove_first_entry_number (const char *name) ++get_and_remove_first_entry_number (grub_menu_t menu, const char *name) + { + const char *val; + char *tail; +@@ -182,9 +205,32 @@ get_and_remove_first_entry_number (const char *name) + + entry = (int) grub_strtoul (val, &tail, 0); + ++ if (grub_errno == GRUB_ERR_BAD_NUMBER) ++ { ++ /* See if the variable matches the title of a menu entry. */ ++ grub_menu_entry_t e = menu->entry_list; ++ int i; ++ ++ grub_errno = GRUB_ERR_NONE; ++ ++ for (i = 0; e; i++) ++ { ++ if (menuentry_eq (e->title, val) ++ || menuentry_eq (e->id, val)) ++ { ++ entry = i; ++ break; ++ } ++ e = e->next; ++ } ++ ++ if (! e) ++ entry = -1; ++ } ++ + if (grub_errno == GRUB_ERR_NONE) + { +- /* Skip whitespace to find the next digit. */ ++ /* Skip whitespace to find the next entry. */ + while (*tail && grub_isspace (*tail)) + tail++; + grub_env_set (name, tail); +@@ -347,7 +393,7 @@ grub_menu_execute_with_fallback (grub_menu_t menu, + grub_menu_execute_entry (entry, 1); + + /* Deal with fallback entries. */ +- while ((fallback_entry = get_and_remove_first_entry_number ("fallback")) ++ while ((fallback_entry = get_and_remove_first_entry_number (menu, "fallback")) + >= 0) + { + grub_print_error (); +@@ -465,30 +511,6 @@ grub_menu_register_viewer (struct grub_menu_viewer *viewer) + viewers = viewer; + } + +-static int +-menuentry_eq (const char *id, const char *spec) +-{ +- const char *ptr1, *ptr2; +- ptr1 = id; +- ptr2 = spec; +- while (1) +- { +- if (*ptr2 == '>' && ptr2[1] != '>' && *ptr1 == 0) +- return 1; +- if (*ptr2 == '>' && ptr2[1] != '>') +- return 0; +- if (*ptr2 == '>') +- ptr2++; +- if (*ptr1 != *ptr2) +- return 0; +- if (*ptr1 == 0) +- return 1; +- ptr1++; +- ptr2++; +- } +-} +- +- + /* Get the entry number from the variable NAME. */ + static int + get_entry_number (grub_menu_t menu, const char *name) +-- +1.9.3 + diff --git a/0151-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch b/0151-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch new file mode 100644 index 0000000..7933955 --- /dev/null +++ b/0151-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch @@ -0,0 +1,134 @@ +From 3cb3d2a07b11c95b3f8a908ae9d43eabef4dcf62 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 17 Sep 2014 15:13:14 -0500 +Subject: [PATCH 151/152] Initialized initrd_ctx so we don't free a random + pointer from the stack. + +Currently, if "linux" fails, the "goto fail;" in grub_cmd_initrd sends us +into grub_initrd_close() without grub_initrd_init() being called, and thus +it never clears initrd_ctx->components. grub_initrd_close() then frees that +address, which is stale data from the stack. If the stack happens to have a +stale *address* there that matches a recent allocation, then you'll get a +double free later. + +So initialize the memory up front. + +Signed-off-by: Peter Jones +--- + grub-core/loader/arm/linux.c | 2 +- + grub-core/loader/arm64/linux.c | 2 +- + grub-core/loader/i386/linux.c | 2 +- + grub-core/loader/i386/pc/linux.c | 2 +- + grub-core/loader/ia64/efi/linux.c | 2 +- + grub-core/loader/mips/linux.c | 2 +- + grub-core/loader/powerpc/ieee1275/linux.c | 2 +- + grub-core/loader/sparc64/ieee1275/linux.c | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c +index e6770d9..62cbe75 100644 +--- a/grub-core/loader/arm/linux.c ++++ b/grub-core/loader/arm/linux.c +@@ -396,7 +396,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + { + grub_file_t file; + grub_size_t size = 0; +- struct grub_linux_initrd_context initrd_ctx; ++ struct grub_linux_initrd_context initrd_ctx = { 0, }; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); +diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c +index f1d10a1..0dc144e 100644 +--- a/grub-core/loader/arm64/linux.c ++++ b/grub-core/loader/arm64/linux.c +@@ -328,7 +328,7 @@ static grub_err_t + grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + int argc, char *argv[]) + { +- struct grub_linux_initrd_context initrd_ctx; ++ struct grub_linux_initrd_context initrd_ctx = { 0, }; + int initrd_size, initrd_pages; + void *initrd_mem = NULL; + +diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c +index 31fb91e..2ae1763 100644 +--- a/grub-core/loader/i386/linux.c ++++ b/grub-core/loader/i386/linux.c +@@ -1050,7 +1050,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + grub_addr_t addr_min, addr_max; + grub_addr_t addr; + grub_err_t err; +- struct grub_linux_initrd_context initrd_ctx; ++ struct grub_linux_initrd_context initrd_ctx = { 0, }; + + if (argc == 0) + { +diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c +index 672c013..b481e46 100644 +--- a/grub-core/loader/i386/pc/linux.c ++++ b/grub-core/loader/i386/pc/linux.c +@@ -388,7 +388,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + grub_uint8_t *initrd_chunk; + grub_addr_t initrd_addr; + grub_err_t err; +- struct grub_linux_initrd_context initrd_ctx; ++ struct grub_linux_initrd_context initrd_ctx = { 0, }; + + if (argc == 0) + { +diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c +index 87ac49f..eb78e6e 100644 +--- a/grub-core/loader/ia64/efi/linux.c ++++ b/grub-core/loader/ia64/efi/linux.c +@@ -568,7 +568,7 @@ static grub_err_t + grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + int argc, char *argv[]) + { +- struct grub_linux_initrd_context initrd_ctx; ++ struct grub_linux_initrd_context initrd_ctx = { 0, }; + + if (argc == 0) + { +diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c +index ef64a5b..4a3e8c5 100644 +--- a/grub-core/loader/mips/linux.c ++++ b/grub-core/loader/mips/linux.c +@@ -415,7 +415,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + void *initrd_src; + grub_addr_t initrd_dest; + grub_err_t err; +- struct grub_linux_initrd_context initrd_ctx; ++ struct grub_linux_initrd_context initrd_ctx = { 0, }; + + if (argc == 0) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); +diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c +index 4a14f66..787d7dc 100644 +--- a/grub-core/loader/powerpc/ieee1275/linux.c ++++ b/grub-core/loader/powerpc/ieee1275/linux.c +@@ -333,7 +333,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + grub_size_t size = 0; + grub_addr_t first_addr; + grub_addr_t addr; +- struct grub_linux_initrd_context initrd_ctx; ++ struct grub_linux_initrd_context initrd_ctx = { 0, }; + + if (argc == 0) + { +diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c +index de6ee2f..c5e8dfa 100644 +--- a/grub-core/loader/sparc64/ieee1275/linux.c ++++ b/grub-core/loader/sparc64/ieee1275/linux.c +@@ -373,7 +373,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), + grub_addr_t paddr; + grub_addr_t addr; + int ret; +- struct grub_linux_initrd_context initrd_ctx; ++ struct grub_linux_initrd_context initrd_ctx = { 0, }; + + if (argc == 0) + { +-- +1.9.3 + diff --git a/0152-Load-arm-with-SB-enabled.patch b/0152-Load-arm-with-SB-enabled.patch new file mode 100644 index 0000000..33f63a5 --- /dev/null +++ b/0152-Load-arm-with-SB-enabled.patch @@ -0,0 +1,437 @@ +From 6f45f8ab00907d7786bb9dd23575da41033f62e7 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Thu, 18 Sep 2014 11:26:14 -0400 +Subject: [PATCH 152/152] 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.) + +This means giving the kernel grub's loaded image as the vehicle for the +kernel command line, because we can't call systab->bs->LoadImage() if SB +is enabled. +--- + grub-core/Makefile.core.def | 2 + + grub-core/loader/arm64/linux.c | 108 ++++++++++++++++++++------------------ + grub-core/loader/efi/linux.c | 66 +++++++++++++++++++++++ + grub-core/loader/i386/efi/linux.c | 39 ++------------ + include/grub/arm64/linux.h | 8 +++ + include/grub/efi/linux.h | 31 +++++++++++ + 6 files changed, 167 insertions(+), 87 deletions(-) + create mode 100644 grub-core/loader/efi/linux.c + create mode 100644 include/grub/efi/linux.h + +diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def +index 9ff9ae5..9378c73 100644 +--- a/grub-core/Makefile.core.def ++++ b/grub-core/Makefile.core.def +@@ -1682,6 +1682,7 @@ module = { + ia64_efi = loader/ia64/efi/linux.c; + arm = loader/arm/linux.c; + arm64 = loader/arm64/linux.c; ++ arm64 = loader/efi/linux.c; + fdt = lib/fdt.c; + common = loader/linux.c; + common = lib/cmdline.c; +@@ -1718,6 +1719,7 @@ module = { + name = linuxefi; + efi = loader/i386/efi/linux.c; + efi = lib/cmdline.c; ++ efi = loader/efi/linux.c; + enable = i386_efi; + enable = x86_64_efi; + }; +diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c +index 0dc144e..bdd9c9b 100644 +--- a/grub-core/loader/arm64/linux.c ++++ b/grub-core/loader/arm64/linux.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -44,6 +45,7 @@ static int loaded; + + static void *kernel_addr; + static grub_uint64_t kernel_size; ++static grub_uint32_t handover_offset; + + static char *linux_args; + static grub_uint32_t cmdline_size; +@@ -135,7 +137,9 @@ finalize_params (void) + { + grub_efi_boot_services_t *b; + grub_efi_status_t status; ++ grub_efi_loaded_image_t *loaded_image = NULL; + int node, retval; ++ int len; + + get_fdt (); + if (!fdt) +@@ -172,6 +176,23 @@ finalize_params (void) + grub_dprintf ("linux", "Installed/updated FDT configuration table @ %p\n", + fdt); + ++ /* Convert command line to UCS-2 */ ++ loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle); ++ if (!loaded_image) ++ goto failure; ++ ++ loaded_image->load_options_size = len = ++ (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t); ++ loaded_image->load_options = ++ grub_efi_allocate_pages (0, ++ BYTES_TO_PAGES (loaded_image->load_options_size)); ++ if (!loaded_image->load_options) ++ return grub_error(GRUB_ERR_BAD_OS, "failed to create kernel parameters"); ++ ++ loaded_image->load_options_size = ++ 2 * grub_utf8_to_utf16 (loaded_image->load_options, len, ++ (grub_uint8_t *) linux_args, len, NULL); ++ + return GRUB_ERR_NONE; + + failure: +@@ -181,6 +202,23 @@ failure: + return grub_error(GRUB_ERR_BAD_OS, "failed to install/update FDT"); + } + ++static void ++free_params (void) ++{ ++ grub_efi_loaded_image_t *loaded_image = NULL; ++ ++ loaded_image = grub_efi_get_loaded_image (grub_efi_image_handle); ++ if (loaded_image) ++ { ++ if (loaded_image->load_options) ++ grub_efi_free_pages ((grub_efi_physical_address_t) ++ loaded_image->load_options, ++ BYTES_TO_PAGES (loaded_image->load_options_size)); ++ loaded_image->load_options = NULL; ++ loaded_image->load_options_size = 0; ++ } ++} ++ + static grub_err_t + grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)), + int argc, char *argv[]) +@@ -199,6 +237,10 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)), + if (argc != 1) + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); + ++ if (grub_efi_secure_boot ()) ++ return grub_error (GRUB_ERR_INVALID_COMMAND, ++ N_("Not loading devicetree - Secure Boot is enabled")); ++ + if (loaded_fdt) + grub_free (loaded_fdt); + loaded_fdt = NULL; +@@ -243,65 +285,20 @@ out: + static grub_err_t + grub_linux_boot (void) + { +- grub_efi_memory_mapped_device_path_t *mempath; +- grub_efi_handle_t image_handle; +- grub_efi_boot_services_t *b; +- grub_efi_status_t status; + grub_err_t retval; +- grub_efi_loaded_image_t *loaded_image; +- int len; + + retval = finalize_params(); + if (retval != GRUB_ERR_NONE) + return retval; + +- mempath = grub_malloc (2 * sizeof (grub_efi_memory_mapped_device_path_t)); +- if (!mempath) +- return grub_errno; +- +- mempath[0].header.type = GRUB_EFI_HARDWARE_DEVICE_PATH_TYPE; +- mempath[0].header.subtype = GRUB_EFI_MEMORY_MAPPED_DEVICE_PATH_SUBTYPE; +- mempath[0].header.length = grub_cpu_to_le16_compile_time (sizeof (*mempath)); +- mempath[0].memory_type = GRUB_EFI_LOADER_DATA; +- mempath[0].start_address = (grub_addr_t) kernel_addr; +- mempath[0].end_address = (grub_addr_t) kernel_addr + kernel_size; +- +- mempath[1].header.type = GRUB_EFI_END_DEVICE_PATH_TYPE; +- mempath[1].header.subtype = GRUB_EFI_END_ENTIRE_DEVICE_PATH_SUBTYPE; +- mempath[1].header.length = sizeof (grub_efi_device_path_t); +- +- b = grub_efi_system_table->boot_services; +- status = b->load_image (0, grub_efi_image_handle, +- (grub_efi_device_path_t *) mempath, +- kernel_addr, kernel_size, &image_handle); +- if (status != GRUB_EFI_SUCCESS) +- return grub_error (GRUB_ERR_BAD_OS, "cannot load image"); +- + grub_dprintf ("linux", "linux command line: '%s'\n", linux_args); + +- /* Convert command line to UCS-2 */ +- loaded_image = grub_efi_get_loaded_image (image_handle); +- loaded_image->load_options_size = len = +- (grub_strlen (linux_args) + 1) * sizeof (grub_efi_char16_t); +- loaded_image->load_options = +- grub_efi_allocate_pages (0, +- BYTES_TO_PAGES (loaded_image->load_options_size)); +- if (!loaded_image->load_options) +- return grub_errno; ++ retval = grub_efi_linux_boot ((char *)kernel_addr, handover_offset, ++ kernel_addr); + +- loaded_image->load_options_size = +- 2 * grub_utf8_to_utf16 (loaded_image->load_options, len, +- (grub_uint8_t *) linux_args, len, NULL); +- +- grub_dprintf("linux", "starting image %p\n", image_handle); +- status = b->start_image (image_handle, 0, NULL); +- +- /* When successful, not reached */ +- b->unload_image (image_handle); +- grub_efi_free_pages ((grub_efi_physical_address_t) loaded_image->load_options, +- BYTES_TO_PAGES (loaded_image->load_options_size)); +- +- return grub_errno; ++ /* Never reached... */ ++ free_params(); ++ return retval; + } + + static grub_err_t +@@ -382,6 +379,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), + { + grub_file_t file = 0; + struct grub_arm64_linux_kernel_header lh; ++ struct grub_arm64_linux_pe_header *pe; + + grub_dl_ref (my_mod); + +@@ -426,6 +424,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), + + grub_dprintf ("linux", "kernel @ %p\n", kernel_addr); + ++ if (!grub_linuxefi_secure_validate (kernel_addr, kernel_size)) ++ { ++ grub_error (GRUB_ERR_INVALID_COMMAND, N_("%s has invalid signature"), argv[0]); ++ goto fail; ++ } ++ ++ pe = (void *)((unsigned long)kernel_addr + lh.hdr_offset); ++ handover_offset = pe->opt.entry_addr; ++ + cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE); + linux_args = grub_malloc (cmdline_size); + if (!linux_args) +@@ -464,7 +471,6 @@ fail: + return grub_errno; + } + +- + static grub_command_t cmd_linux, cmd_initrd, cmd_devicetree; + + GRUB_MOD_INIT (linux) +diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c +new file mode 100644 +index 0000000..8634578 +--- /dev/null ++++ b/grub-core/loader/efi/linux.c +@@ -0,0 +1,66 @@ ++/* ++ * GRUB -- GRand Unified Bootloader ++ * Copyright (C) 2014 Free Software Foundation, Inc. ++ * ++ * GRUB is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * GRUB is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with GRUB. If not, see . ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define SHIM_LOCK_GUID \ ++ { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} } ++ ++struct grub_efi_shim_lock ++{ ++ grub_efi_status_t (*verify) (void *buffer, grub_uint32_t size); ++}; ++typedef struct grub_efi_shim_lock grub_efi_shim_lock_t; ++ ++grub_efi_boolean_t ++grub_linuxefi_secure_validate (void *data, grub_uint32_t size) ++{ ++ grub_efi_guid_t guid = SHIM_LOCK_GUID; ++ grub_efi_shim_lock_t *shim_lock; ++ ++ shim_lock = grub_efi_locate_protocol(&guid, NULL); ++ ++ if (!shim_lock) ++ return 1; ++ ++ if (shim_lock->verify(data, size) == GRUB_EFI_SUCCESS) ++ return 1; ++ ++ return 0; ++} ++ ++typedef void (*handover_func) (void *, grub_efi_system_table_t *, void *); ++ ++grub_err_t ++grub_efi_linux_boot (void *kernel_addr, grub_off_t offset, ++ void *kernel_params) ++{ ++ handover_func hf; ++ ++ hf = (handover_func)((char *)kernel_addr + offset); ++ hf (grub_efi_image_handle, grub_efi_system_table, kernel_params); ++ ++ 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 +--- a/grub-core/loader/i386/efi/linux.c ++++ b/grub-core/loader/i386/efi/linux.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -40,52 +41,18 @@ static char *linux_cmdline; + + #define BYTES_TO_PAGES(bytes) (((bytes) + 0xfff) >> 12) + +-#define SHIM_LOCK_GUID \ +- { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} } +- +-struct grub_efi_shim_lock +-{ +- grub_efi_status_t (*verify) (void *buffer, grub_uint32_t size); +-}; +-typedef struct grub_efi_shim_lock grub_efi_shim_lock_t; +- +-static grub_efi_boolean_t +-grub_linuxefi_secure_validate (void *data, grub_uint32_t size) +-{ +- grub_efi_guid_t guid = SHIM_LOCK_GUID; +- grub_efi_shim_lock_t *shim_lock; +- +- shim_lock = grub_efi_locate_protocol(&guid, NULL); +- +- if (!shim_lock) +- return 1; +- +- if (shim_lock->verify(data, size) == GRUB_EFI_SUCCESS) +- return 1; +- +- return 0; +-} +- +-typedef void(*handover_func)(void *, grub_efi_system_table_t *, struct linux_kernel_params *); +- + static grub_err_t + grub_linuxefi_boot (void) + { +- handover_func hf; + int offset = 0; + + #ifdef __x86_64__ + offset = 512; + #endif +- +- hf = (handover_func)((char *)kernel_mem + handover_offset + offset); +- + asm volatile ("cli"); + +- hf (grub_efi_image_handle, grub_efi_system_table, params); +- +- /* Not reached */ +- return GRUB_ERR_NONE; ++ return grub_efi_linux_boot ((char *)kernel_mem, handover_offset + offset, ++ params); + } + + static grub_err_t +diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h +index 864e5dc..2cbd64f 100644 +--- a/include/grub/arm64/linux.h ++++ b/include/grub/arm64/linux.h +@@ -20,6 +20,7 @@ + #define GRUB_LINUX_CPU_HEADER 1 + + #include ++#include + + #define GRUB_ARM64_LINUX_MAGIC 0x644d5241 /* 'ARM\x64' */ + +@@ -38,4 +39,11 @@ struct grub_arm64_linux_kernel_header + grub_uint32_t hdr_offset; /* Offset of PE/COFF header */ + }; + ++struct grub_arm64_linux_pe_header ++{ ++ grub_uint32_t magic; ++ struct grub_pe32_coff_header coff; ++ struct grub_pe64_optional_header opt; ++}; ++ + #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 +--- /dev/null ++++ b/include/grub/efi/linux.h +@@ -0,0 +1,31 @@ ++/* ++ * GRUB -- GRand Unified Bootloader ++ * Copyright (C) 2014 Free Software Foundation, Inc. ++ * ++ * GRUB is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * GRUB is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with GRUB. If not, see . ++ */ ++#ifndef GRUB_EFI_LINUX_HEADER ++#define GRUB_EFI_LINUX_HEADER 1 ++ ++#include ++#include ++#include ++ ++grub_efi_boolean_t ++EXPORT_FUNC(grub_linuxefi_secure_validate) (void *data, grub_uint32_t size); ++grub_err_t ++EXPORT_FUNC(grub_efi_linux_boot) (void *kernel_address, grub_off_t offset, ++ void *kernel_param); ++ ++#endif /* ! GRUB_EFI_LINUX_HEADER */ +-- +1.9.3 + diff --git a/grub2.spec b/grub2.spec index 598d265..bfae7fa 100644 --- a/grub2.spec +++ b/grub2.spec @@ -47,7 +47,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 0.8%{?dist} +Release: 0.9%{?dist} Summary: Bootloader with support for Linux, Multiboot and more Group: System Environment/Base @@ -205,6 +205,13 @@ Patch0142: 0142-Files-reorganization-and-include-some-libgcc-fuction.patch Patch0143: 0143-Suport-for-bi-endianess-in-elf-file.patch Patch0144: 0144-Add-grub_util_readlink.patch Patch0145: 0145-Make-editenv-chase-symlinks-including-those-across-d.patch +Patch0146: 0146-Generate-OS-and-CLASS-in-10_linux-from-etc-os-releas.patch +Patch0147: 0147-Fix-GRUB_DISABLE_SUBMENU-one-more-time.patch +Patch0148: 0148-Minimize-the-sort-ordering-for-.debug-and-rescue-ker.patch +Patch0149: 0149-Add-GRUB_DISABLE_UUID.patch +Patch0150: 0150-Allow-fallback-to-include-entries-by-title-not-just-.patch +Patch0151: 0151-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch +Patch0152: 0152-Load-arm-with-SB-enabled.patch BuildRequires: flex bison binutils python BuildRequires: ncurses-devel xz-devel bzip2-devel @@ -347,12 +354,13 @@ cd grub-efi-%{tarversion} --disable-werror make %{?_smp_mflags} -GRUB_MODULES=" all_video boot btrfs cat chain configfile echo efifwsetup \ - efinet ext2 fat font gfxmenu gfxterm gzio halt hfsplus iso9660 \ - jpeg loadenv lvm mdraid09 mdraid1x minicmd normal part_apple \ - part_msdos part_gpt password_pbkdf2 png reboot search \ - search_fs_uuid search_fs_file search_label sleep syslinuxcfg \ - test tftp video xfs" +GRUB_MODULES=" all_video backtrace boot btrfs cat chain configfile echo \ + efifwsetup efinet ext2 fat font gfxmenu gfxterm gzio halt \ + hfsplus iso9660 jpeg loadenv lvm mdraid09 mdraid1x minicmd \ + normal part_apple part_msdos part_gpt password_pbkdf2 png \ + reboot search search_fs_uuid search_fs_file search_label \ + serial sleep syslinuxcfg test tftp usb usbserial_common \ + usbserial_pl2303 usbserial_ftdi usbserial_usbdebug video xfs" %ifarch aarch64 GRUB_MODULES="${GRUB_MODULES} linux" %else @@ -360,11 +368,12 @@ GRUB_MODULES+="${GRUB_MODULES} linuxefi multiboot2 multiboot" %endif ./grub-mkimage -O %{grubefiarch} -o %{grubefiname}.orig -p /EFI/%{efidir} \ -d grub-core ${GRUB_MODULES} -%ifarch aarch64 -mv %{grubefiname}.orig %{grubefiname} -%else ./grub-mkimage -O %{grubefiarch} -o %{grubeficdname}.orig -p /EFI/BOOT \ -d grub-core ${GRUB_MODULES} +%ifarch aarch64 +mv %{grubefiname}.orig %{grubefiname} +mv %{grubeficdname}.orig %{grubeficdname} +%else %pesign -s -i %{grubeficdname}.orig -o %{grubeficdname} %pesign -s -i %{grubefiname}.orig -o %{grubefiname} %endif @@ -635,6 +644,18 @@ fi %{_datarootdir}/grub/themes/ %changelog +* Mon Sep 29 2014 Peter Jones - 2.02-0.9 +- Clean up the build a bit to make it faster +- Make grubenv work right on UEFI machines + Related: rhbz#1119943 +- Sort debug and rescue kernels later than normal ones + Related: rhbz#1065360 +- Allow "fallback" to include entries by title as well as number. + Related: rhbz#1026084 +- Fix a segfault on aarch64. +- Load arm with SB enabled if available. +- Add some serial port options to GRUB_MODULES. + * Tue Aug 19 2014 Peter Jones - 2.02-0.8 - Add ppc64le support. Resolves: rhbz#1125540 diff --git a/sources b/sources index d38dd1a..65a310d 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ a1043102fbc7bcedbf53e7ee3d17ab91 grub-2.00.tar.xz 566c4668b90b610c1f6c0c402cbd6ab0 theme.tar.bz2 8c28087c5fcb3188f1244b390efffdbe unifont-5.1.20080820.pcf.gz be62932eade308a364ea4bbc91295930 grub-2.02~beta2.tar.xz -48aed0db12324053babfa40feaae3d78 gitignore +96db33341a3826adddd54316e8ac27b6 gitignore