diff -Nru grub2-2.02~beta2/debian/changelog grub2-2.02~beta2/debian/changelog --- grub2-2.02~beta2/debian/changelog 2015-11-18 19:06:15.000000000 +0000 +++ grub2-2.02~beta2/debian/changelog 2015-11-25 16:07:34.000000000 +0000 @@ -1,9 +1,18 @@ -grub2 (2.02~beta2-31ubuntu1) xenial; urgency=medium +grub2 (2.02~beta2-32) unstable; urgency=medium + [ Mathieu Trudel-Lapierre ] * Cherry-pick patch to add SAS disks to the device list from the ofdisk module. (LP: #1517586) - -- Mathieu Trudel-Lapierre Tue, 17 Nov 2015 10:55:56 -0500 + [ dann frazier ] + * Cherry-pick patch to open Simple Network Protocol exclusively. + (LP: #1508893) + + [ Linn Crosetto ] + * Install arm64 signed images if UEFI Secure Boot is enabled (closes: + #806178). + + -- Colin Watson Wed, 25 Nov 2015 16:07:21 +0000 grub2 (2.02~beta2-31) unstable; urgency=medium diff -Nru grub2-2.02~beta2/debian/control grub2-2.02~beta2/debian/control --- grub2-2.02~beta2/debian/control 2015-11-17 15:56:11.000000000 +0000 +++ grub2-2.02~beta2/debian/control 2015-11-25 16:04:46.000000000 +0000 @@ -1,8 +1,7 @@ Source: grub2 Section: admin Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: GRUB Maintainers +Maintainer: GRUB Maintainers Uploaders: Felix Zielcke , Jordi Mallach , Colin Watson , Ian Campbell Build-Depends: debhelper (>= 7.4.2~), patchutils, diff -Nru grub2-2.02~beta2/debian/.git-dpm grub2-2.02~beta2/debian/.git-dpm --- grub2-2.02~beta2/debian/.git-dpm 2015-11-05 15:07:26.000000000 +0000 +++ grub2-2.02~beta2/debian/.git-dpm 2015-11-25 16:04:50.000000000 +0000 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -25133940565784be3bac00f140ca4086bf20d243 -25133940565784be3bac00f140ca4086bf20d243 +99d5df36311e15d60a16f6cba6e3b4ca442b0472 +99d5df36311e15d60a16f6cba6e3b4ca442b0472 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71 grub2_2.02~beta2.orig.tar.xz diff -Nru grub2-2.02~beta2/debian/patches/arm64-set-correct-length-of-device-path-end-entry.patch grub2-2.02~beta2/debian/patches/arm64-set-correct-length-of-device-path-end-entry.patch --- grub2-2.02~beta2/debian/patches/arm64-set-correct-length-of-device-path-end-entry.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/arm64-set-correct-length-of-device-path-end-entry.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 07a105d450ee701b7a690a562b7efa0d827bdc65 Mon Sep 17 00:00:00 2001 +From 94e0b1d4575ab5468a97a8e710a573ce5c09fb9f Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Tue, 7 Jan 2014 17:52:50 +0000 Subject: arm64: set correct length of device path end entry diff -Nru grub2-2.02~beta2/debian/patches/arm64-setjmp-Add-missing-license-macro.patch grub2-2.02~beta2/debian/patches/arm64-setjmp-Add-missing-license-macro.patch --- grub2-2.02~beta2/debian/patches/arm64-setjmp-Add-missing-license-macro.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/arm64-setjmp-Add-missing-license-macro.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 5156130e37ca208f5961d7caba766841b401d82c Mon Sep 17 00:00:00 2001 +From 2252bec27ecd3d0353d1868af5a5f325450cc1d2 Mon Sep 17 00:00:00 2001 From: dann frazier Date: Thu, 21 May 2015 10:28:48 -0600 Subject: arm64/setjmp: Add missing license macro diff -Nru grub2-2.02~beta2/debian/patches/arp_icmp_oversize_handling.patch grub2-2.02~beta2/debian/patches/arp_icmp_oversize_handling.patch --- grub2-2.02~beta2/debian/patches/arp_icmp_oversize_handling.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/arp_icmp_oversize_handling.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 4eded66960cc60d824dce6a86b6c5ad7f17d4ff4 Mon Sep 17 00:00:00 2001 +From 9d818510f1e49ae0312e35fe9b41261c4eb2c46a Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 20 Mar 2015 21:14:23 +0100 Subject: arp, icmp: Fix handling in case of oversized or invalid packets. diff -Nru grub2-2.02~beta2/debian/patches/btrfs-endian.patch grub2-2.02~beta2/debian/patches/btrfs-endian.patch --- grub2-2.02~beta2/debian/patches/btrfs-endian.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/btrfs-endian.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From dcc4deee38bb11a1b8a769ed8622a7461004f873 Mon Sep 17 00:00:00 2001 +From d771f207d26597645b0492c8fdd725e845dd878c Mon Sep 17 00:00:00 2001 From: Thomas Falcon Date: Mon, 31 Mar 2014 15:32:30 +0100 Subject: btrfs: fix get_root key comparison failures due to endianness diff -Nru grub2-2.02~beta2/debian/patches/check_blocklists_overlap_fix.patch grub2-2.02~beta2/debian/patches/check_blocklists_overlap_fix.patch --- grub2-2.02~beta2/debian/patches/check_blocklists_overlap_fix.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/check_blocklists_overlap_fix.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 0a1b500ccb115cbb913addc5ffbffcc9df710c7a Mon Sep 17 00:00:00 2001 +From b1f7969bc4017977a8a67564a185fde77b32f5a9 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 diff -Nru grub2-2.02~beta2/debian/patches/efinet-open-Simple-Network-Protocol-exclusively.patch grub2-2.02~beta2/debian/patches/efinet-open-Simple-Network-Protocol-exclusively.patch --- grub2-2.02~beta2/debian/patches/efinet-open-Simple-Network-Protocol-exclusively.patch 1970-01-01 00:00:00.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/efinet-open-Simple-Network-Protocol-exclusively.patch 2015-11-25 16:04:50.000000000 +0000 @@ -0,0 +1,73 @@ +From 99d5df36311e15d60a16f6cba6e3b4ca442b0472 Mon Sep 17 00:00:00 2001 +From: Andrei Borzenkov +Date: Thu, 7 May 2015 20:37:17 +0300 +Subject: efinet: open Simple Network Protocol exclusively + +Patch-Name: efinet-open-Simple-Network-Protocol-exclusively.patch +Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=49426e9fd2e562c73a4f1206f32eff9e424a1a73 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1508893 +Last-Update: 2015-11-25 +--- + grub-core/net/drivers/efi/efinet.c | 46 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 46 insertions(+) + +diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c +index 2b344d6..658b3d1 100644 +--- a/grub-core/net/drivers/efi/efinet.c ++++ b/grub-core/net/drivers/efi/efinet.c +@@ -130,9 +130,55 @@ get_card_packet (struct grub_net_card *dev) + return nb; + } + ++static grub_err_t ++open_card (struct grub_net_card *dev) ++{ ++ grub_efi_simple_network_t *net; ++ ++ /* Try to reopen SNP exlusively to close any active MNP protocol instance ++ that may compete for packet polling ++ */ ++ net = grub_efi_open_protocol (dev->efi_handle, &net_io_guid, ++ GRUB_EFI_OPEN_PROTOCOL_BY_EXCLUSIVE); ++ if (net) ++ { ++ if (net->mode->state == GRUB_EFI_NETWORK_STOPPED ++ && efi_call_1 (net->start, net) != GRUB_EFI_SUCCESS) ++ return grub_error (GRUB_ERR_NET_NO_CARD, "%s: net start failed", ++ dev->name); ++ ++ if (net->mode->state == GRUB_EFI_NETWORK_STOPPED) ++ return grub_error (GRUB_ERR_NET_NO_CARD, "%s: card stopped", ++ dev->name); ++ ++ if (net->mode->state == GRUB_EFI_NETWORK_STARTED ++ && efi_call_3 (net->initialize, net, 0, 0) != GRUB_EFI_SUCCESS) ++ return grub_error (GRUB_ERR_NET_NO_CARD, "%s: net initialize failed", ++ dev->name); ++ ++ efi_call_4 (grub_efi_system_table->boot_services->close_protocol, ++ dev->efi_net, &net_io_guid, ++ grub_efi_image_handle, dev->efi_handle); ++ dev->efi_net = net; ++ } ++ ++ /* If it failed we just try to run as best as we can */ ++ return GRUB_ERR_NONE; ++} ++ ++static void ++close_card (struct grub_net_card *dev) ++{ ++ efi_call_4 (grub_efi_system_table->boot_services->close_protocol, ++ dev->efi_net, &net_io_guid, ++ grub_efi_image_handle, dev->efi_handle); ++} ++ + static struct grub_net_card_driver efidriver = + { + .name = "efinet", ++ .open = open_card, ++ .close = close_card, + .send = send_card_buffer, + .recv = get_card_packet + }; diff -Nru grub2-2.02~beta2/debian/patches/efi_sanitise_path.patch grub2-2.02~beta2/debian/patches/efi_sanitise_path.patch --- grub2-2.02~beta2/debian/patches/efi_sanitise_path.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/efi_sanitise_path.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 3183198b8ed8c46f82cc3308266c627b9291e48b Mon Sep 17 00:00:00 2001 +From 899f8e8dc1f79a49b44f263428009c3509bb6054 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sat, 18 Jan 2014 16:41:47 +0100 Subject: Fix UEFI boot failure with some firmware that returns incorrect paths diff -Nru grub2-2.02~beta2/debian/patches/elf_bi_endian.patch grub2-2.02~beta2/debian/patches/elf_bi_endian.patch --- grub2-2.02~beta2/debian/patches/elf_bi_endian.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/elf_bi_endian.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From d88993cd0e37169a46891e41279766fe51880de9 Mon Sep 17 00:00:00 2001 +From 793e71681684520de266daeaa188165aa7810955 Mon Sep 17 00:00:00 2001 From: Tomohiro B Berry Date: Tue, 14 Jan 2014 17:43:25 +0000 Subject: Add bi-endian support to ELF parser diff -Nru grub2-2.02~beta2/debian/patches/fix_diskfilter_lv_name_dblfree.patch grub2-2.02~beta2/debian/patches/fix_diskfilter_lv_name_dblfree.patch --- grub2-2.02~beta2/debian/patches/fix_diskfilter_lv_name_dblfree.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/fix_diskfilter_lv_name_dblfree.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 874a6fb6e8db5c86ea3448e89a559070e3b947cb Mon Sep 17 00:00:00 2001 +From 6640663a349f902c717b0f447c7e8c05d6d8e280 Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Sat, 14 Feb 2015 19:08:58 +0300 Subject: diskfilter: fix double free of lv names for mdraid diff -Nru grub2-2.02~beta2/debian/patches/fix_disk-module_option_handling.patch grub2-2.02~beta2/debian/patches/fix_disk-module_option_handling.patch --- grub2-2.02~beta2/debian/patches/fix_disk-module_option_handling.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/fix_disk-module_option_handling.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 225dd520075c7df7198386d96d17350602be9d73 Mon Sep 17 00:00:00 2001 +From 9612078b9b45f34e29c19c65c2811de380ff1437 Mon Sep 17 00:00:00 2001 From: Glenn Washburn Date: Sun, 22 Jun 2014 01:45:11 +0200 Subject: * util/grub-install.c: Fix handling of --disk-module. @@ -13,7 +13,7 @@ 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c -index 54fbd35..4f4b2a7 100644 +index 462071f..5f17dd5 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -97,7 +97,6 @@ enum diff -Nru grub2-2.02~beta2/debian/patches/freebsd_debugflags_eperm.patch grub2-2.02~beta2/debian/patches/freebsd_debugflags_eperm.patch --- grub2-2.02~beta2/debian/patches/freebsd_debugflags_eperm.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/freebsd_debugflags_eperm.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 950b292474387ad6075bf3885667f93386061753 Mon Sep 17 00:00:00 2001 +From 138b4402806c482ff9cb7a975a937e61ff0ee234 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 17 Jan 2014 02:55:58 +0000 Subject: Ignore EPERM when modifying kern.geom.debugflags diff -Nru grub2-2.02~beta2/debian/patches/gettext-print-typo.patch grub2-2.02~beta2/debian/patches/gettext-print-typo.patch --- grub2-2.02~beta2/debian/patches/gettext-print-typo.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/gettext-print-typo.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From b8dc92352cf949ec33d6d37fa3eaca3cd5fbf9c3 Mon Sep 17 00:00:00 2001 +From e4917d1a63c0b8c677bfd107f2917bfa11ea0210 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Thu, 14 Aug 2014 21:02:31 +0400 Subject: Fix typo (gettext_print instead of gettext_printf) diff -Nru grub2-2.02~beta2/debian/patches/gfxpayload_dynamic.patch grub2-2.02~beta2/debian/patches/gfxpayload_dynamic.patch --- grub2-2.02~beta2/debian/patches/gfxpayload_dynamic.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/gfxpayload_dynamic.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 39d3baefcb4229f52bfe9b1802e40eb6c9eae8dd Mon Sep 17 00:00:00 2001 +From 99cccbe05dba4b71e44c235028ba4329db7794ac Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Mon, 13 Jan 2014 12:13:29 +0000 Subject: Add configure option to enable gfxpayload=keep dynamically diff -Nru grub2-2.02~beta2/debian/patches/grub-install-extra-removable.patch grub2-2.02~beta2/debian/patches/grub-install-extra-removable.patch --- grub2-2.02~beta2/debian/patches/grub-install-extra-removable.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/grub-install-extra-removable.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From f2add475ab69e7e8cc8714da54bd80b2c7b1edae Mon Sep 17 00:00:00 2001 +From 57879c97917d8bfdbef85685c655eaea8e8bcb23 Mon Sep 17 00:00:00 2001 From: Steve McIntyre <93sam@debian.org> Date: Wed, 3 Dec 2014 01:25:12 +0000 Subject: Add support for forcing EFI installation to the removable media path @@ -22,7 +22,7 @@ 1 file changed, 108 insertions(+), 2 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c -index 7a7734e..54fbd35 100644 +index b1db51e..462071f 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -56,6 +56,7 @@ @@ -183,7 +183,7 @@ /* The EFI specification requires that an EFI System Partition must contain an "EFI" subdirectory, and that OS loaders are stored in subdirectories below EFI. Vendors are expected to pick names that do -@@ -1949,9 +2049,15 @@ main (int argc, char *argv[]) +@@ -1950,9 +2050,15 @@ main (int argc, char *argv[]) fprintf (config_dst_f, "configfile $prefix/grub.cfg\n"); fclose (config_dst_f); free (config_dst); diff -Nru grub2-2.02~beta2/debian/patches/grub-install-pvxen-paths.patch grub2-2.02~beta2/debian/patches/grub-install-pvxen-paths.patch --- grub2-2.02~beta2/debian/patches/grub-install-pvxen-paths.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/grub-install-pvxen-paths.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From b20ba775c572d3e2ef201cee153f5d4636484f38 Mon Sep 17 00:00:00 2001 +From b9b6bc8b66532577167fe464cd9dbcbebead0748 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Sat, 6 Sep 2014 12:20:12 +0100 Subject: grub-install: Install PV Xen binaries into the upstream specified @@ -28,10 +28,10 @@ 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c -index 70f514c..7a7734e 100644 +index 92d92a5..b1db51e 100644 --- a/util/grub-install.c +++ b/util/grub-install.c -@@ -1979,6 +1979,28 @@ main (int argc, char *argv[]) +@@ -1980,6 +1980,28 @@ main (int argc, char *argv[]) } break; @@ -60,7 +60,7 @@ case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON: case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS: case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS: -@@ -1987,8 +2009,6 @@ main (int argc, char *argv[]) +@@ -1988,8 +2010,6 @@ main (int argc, char *argv[]) case GRUB_INSTALL_PLATFORM_MIPSEL_ARC: case GRUB_INSTALL_PLATFORM_ARM_UBOOT: case GRUB_INSTALL_PLATFORM_I386_QEMU: diff -Nru grub2-2.02~beta2/debian/patches/grub-shell-no-pad.patch grub2-2.02~beta2/debian/patches/grub-shell-no-pad.patch --- grub2-2.02~beta2/debian/patches/grub-shell-no-pad.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/grub-shell-no-pad.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From f95eef821b9bb4877d5a532a4161939131bb90de Mon Sep 17 00:00:00 2001 +From caa6b84423b6f257b55ab026cee89734448ea1f6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 16 Jan 2014 12:51:23 +0000 Subject: grub-shell: Pass -no-pad to xorriso when building floppy images diff -Nru grub2-2.02~beta2/debian/patches/hostfs_remove_ftm.patch grub2-2.02~beta2/debian/patches/hostfs_remove_ftm.patch --- grub2-2.02~beta2/debian/patches/hostfs_remove_ftm.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/hostfs_remove_ftm.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From d5b2b23cc59633b8b90d4ab750f6595aba347b61 Mon Sep 17 00:00:00 2001 +From 946b7eb237540e3a6bf66d7531f9abd64d56a3d9 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 23 Mar 2015 14:34:01 +0000 Subject: hostfs: Drop unnecessary feature test macros diff -Nru grub2-2.02~beta2/debian/patches/ieee1275-clear-reset.patch grub2-2.02~beta2/debian/patches/ieee1275-clear-reset.patch --- grub2-2.02~beta2/debian/patches/ieee1275-clear-reset.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ieee1275-clear-reset.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From d54a4060d551eb5b47b378eed4d53dcd9c10b060 Mon Sep 17 00:00:00 2001 +From b53df876c463a5479344715896985e1d1d91971f Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Thu, 25 Sep 2014 18:41:29 -0300 Subject: Include a text attribute reset in the clear command for ppc diff -Nru grub2-2.02~beta2/debian/patches/ieee1275-pseries-emulation.patch grub2-2.02~beta2/debian/patches/ieee1275-pseries-emulation.patch --- grub2-2.02~beta2/debian/patches/ieee1275-pseries-emulation.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ieee1275-pseries-emulation.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 23dd0145769d95d27d28c806b5444f41aa18cc62 Mon Sep 17 00:00:00 2001 +From ba554826ccfc6ad3af1256b8d8422ee84de751b2 Mon Sep 17 00:00:00 2001 From: Nikunj A Dadhania Date: Thu, 20 Mar 2014 16:57:12 +0530 Subject: ieee1275: check for IBM pseries emulated machine diff -Nru grub2-2.02~beta2/debian/patches/ignore_grub_func_test_failures.patch grub2-2.02~beta2/debian/patches/ignore_grub_func_test_failures.patch --- grub2-2.02~beta2/debian/patches/ignore_grub_func_test_failures.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ignore_grub_func_test_failures.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 139a7745043b76c87bb55420fb4663ea047b6fed Mon Sep 17 00:00:00 2001 +From 4d092f7c98b2ab4b7af464a956669d51811f55b8 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:32 +0000 Subject: Ignore functional test failures for now as they are broken diff -Nru grub2-2.02~beta2/debian/patches/insmod-xzio-and-lzopio-on-xen.patch grub2-2.02~beta2/debian/patches/insmod-xzio-and-lzopio-on-xen.patch --- grub2-2.02~beta2/debian/patches/insmod-xzio-and-lzopio-on-xen.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/insmod-xzio-and-lzopio-on-xen.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From e1ac7f814cc42952929fd105846495f219ff6e47 Mon Sep 17 00:00:00 2001 +From b9fbeea370137f72b01fd2f9f0b8290df34fef89 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Sun, 30 Nov 2014 12:12:52 +0000 Subject: Arrange to insmod xzio and lzopio when booting a kernel as a Xen diff -Nru grub2-2.02~beta2/debian/patches/install_arm64_naming.patch grub2-2.02~beta2/debian/patches/install_arm64_naming.patch --- grub2-2.02~beta2/debian/patches/install_arm64_naming.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/install_arm64_naming.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From f44b144e5b37e1acf96d370cfab2e2c65cd04330 Mon Sep 17 00:00:00 2001 +From 26cb457d5be327757069ab14c2ffb754f8311975 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Mon, 10 Mar 2014 13:34:10 +0000 Subject: use {grub,boot}aa64.efi for boot images on AArch64 @@ -16,7 +16,7 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c -index 98da118..b4fe429 100644 +index 49ebb3f..8414ed4 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -1110,8 +1110,8 @@ main (int argc, char *argv[]) diff -Nru grub2-2.02~beta2/debian/patches/install_efi_ubuntu_flavours.patch grub2-2.02~beta2/debian/patches/install_efi_ubuntu_flavours.patch --- grub2-2.02~beta2/debian/patches/install_efi_ubuntu_flavours.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/install_efi_ubuntu_flavours.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 11392b57ed24d3c8bf7fdfa49d9509a9d8ace98b Mon Sep 17 00:00:00 2001 +From db59defb5a3ecb7447c5478e12edbed4aa87eb31 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:27 +0000 Subject: Cope with Kubuntu setting GRUB_DISTRIBUTOR @@ -17,7 +17,7 @@ 1 file changed, 2 insertions(+) diff --git a/util/grub-install.c b/util/grub-install.c -index 0d77a2a..1f27b65 100644 +index c15aa8c..d6018e3 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -1089,6 +1089,8 @@ main (int argc, char *argv[]) diff -Nru grub2-2.02~beta2/debian/patches/install_powerpc_machtypes.patch grub2-2.02~beta2/debian/patches/install_powerpc_machtypes.patch --- grub2-2.02~beta2/debian/patches/install_powerpc_machtypes.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/install_powerpc_machtypes.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 9d780dc2fdb7bef85176cfa86d328f1e6e0a708b Mon Sep 17 00:00:00 2001 +From 3b48c0a70aa574b5bec32be9a8dbba5328bfd5cd Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 28 Jan 2014 14:40:02 +0000 Subject: Port yaboot logic for various powerpc machine types @@ -196,7 +196,7 @@ grub_install_register_efi (grub_device_t efidir_grub_dev, const char *efifile_path, diff --git a/util/grub-install.c b/util/grub-install.c -index 1f27b65..98da118 100644 +index d6018e3..49ebb3f 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -1143,7 +1143,18 @@ main (int argc, char *argv[]) diff -Nru grub2-2.02~beta2/debian/patches/install_signed.patch grub2-2.02~beta2/debian/patches/install_signed.patch --- grub2-2.02~beta2/debian/patches/install_signed.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/install_signed.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 9ded66d6cc7ef7ca47b635ab843ba616d441acd6 Mon Sep 17 00:00:00 2001 +From 2e5b9663075671782f8946a2874f3deb3c48b245 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:22 +0000 Subject: Install signed images if UEFI Secure Boot is enabled @@ -8,16 +8,17 @@ Author: Stéphane Graber Author: Steve Langasek +Author: Linn Crosetto Forwarded: no -Last-Update: 2014-03-31 +Last-Update: 2015-11-19 Patch-Name: install_signed.patch --- - util/grub-install.c | 169 +++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 122 insertions(+), 47 deletions(-) + util/grub-install.c | 170 +++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 123 insertions(+), 47 deletions(-) diff --git a/util/grub-install.c b/util/grub-install.c -index 3275209..0d77a2a 100644 +index 3275209..c15aa8c 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -80,6 +80,7 @@ static char *label_color; @@ -170,7 +171,7 @@ } t = grub_util_path_concat (3, efidir, "EFI", efi_distributor); free (efidir); -@@ -1329,14 +1336,40 @@ main (int argc, char *argv[]) +@@ -1329,14 +1336,41 @@ main (int argc, char *argv[]) } } @@ -181,6 +182,7 @@ + case GRUB_INSTALL_PLATFORM_I386_EFI: + case GRUB_INSTALL_PLATFORM_X86_64_EFI: + case GRUB_INSTALL_PLATFORM_ARM_EFI: ++ case GRUB_INSTALL_PLATFORM_ARM64_EFI: + case GRUB_INSTALL_PLATFORM_IA64_EFI: + { + char *dir = xasprintf ("%s-signed", grub_install_source_directory); @@ -213,7 +215,7 @@ { char *uuid = NULL; /* generic method (used on coreboot and ata mod). */ -@@ -1857,7 +1890,49 @@ main (int argc, char *argv[]) +@@ -1857,7 +1891,49 @@ main (int argc, char *argv[]) case GRUB_INSTALL_PLATFORM_IA64_EFI: { char *dst = grub_util_path_concat (2, efidir, efi_file); diff -Nru grub2-2.02~beta2/debian/patches/macbless_mansection.patch grub2-2.02~beta2/debian/patches/macbless_mansection.patch --- grub2-2.02~beta2/debian/patches/macbless_mansection.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/macbless_mansection.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 6d30fb01cc921fbb6bf0bdbcc05affe1d25f5eea Mon Sep 17 00:00:00 2001 +From 4eecc4ed9ca7190935cf6b2d33075b4f1151886f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 8 Jan 2014 11:05:20 +0000 Subject: * Makefile.util.def (grub-macbless): Change mansection to 8. diff -Nru grub2-2.02~beta2/debian/patches/maybe_quiet.patch grub2-2.02~beta2/debian/patches/maybe_quiet.patch --- grub2-2.02~beta2/debian/patches/maybe_quiet.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/maybe_quiet.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From a90ef3f72a4a107112bd9c77c74af0994d81cbe5 Mon Sep 17 00:00:00 2001 +From a9a0fea7981c9fa910726e52cb4b3aae8668006f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:26 +0000 Subject: Add configure option to reduce visual clutter at boot time diff -Nru grub2-2.02~beta2/debian/patches/mips-abiflags.patch grub2-2.02~beta2/debian/patches/mips-abiflags.patch --- grub2-2.02~beta2/debian/patches/mips-abiflags.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/mips-abiflags.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 3c177c9e5744cc4eb80a2905694d4f9b657ac6ae Mon Sep 17 00:00:00 2001 +From 59feb4a8603b7d509f098219cf21a2e20e01f0ce Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 26 Sep 2014 10:34:46 +0100 Subject: Remove .MIPS.abiflags section from images diff -Nru grub2-2.02~beta2/debian/patches/mixed_size_efi.patch grub2-2.02~beta2/debian/patches/mixed_size_efi.patch --- grub2-2.02~beta2/debian/patches/mixed_size_efi.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/mixed_size_efi.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 5ae07c1ecdc51923eeac7066d2df62bc99ad7ff6 Mon Sep 17 00:00:00 2001 +From 41f39647eec96745dd63221e295a869050faab9a Mon Sep 17 00:00:00 2001 From: Steve McIntyre <93sam@debian.org> Date: Tue, 27 Jan 2015 20:08:53 +0000 Subject: Add support for running a 64-bit Linux kernel on a 32-bit EFI diff -Nru grub2-2.02~beta2/debian/patches/mkconfig-kernels-infloop.patch grub2-2.02~beta2/debian/patches/mkconfig-kernels-infloop.patch --- grub2-2.02~beta2/debian/patches/mkconfig-kernels-infloop.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/mkconfig-kernels-infloop.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From ea6b24d6fb4621577133a41627544625cead8dae Mon Sep 17 00:00:00 2001 +From e883ecadcfbd2879e8a3b0fbb7027ac1d375a7ed Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 8 Jul 2014 23:54:30 +0100 Subject: Fix an infinite loop in grub-mkconfig diff -Nru grub2-2.02~beta2/debian/patches/mkconfig_other_inits.patch grub2-2.02~beta2/debian/patches/mkconfig_other_inits.patch --- grub2-2.02~beta2/debian/patches/mkconfig_other_inits.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/mkconfig_other_inits.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From b0a7ac915fbe37d5e20312fe5da56325b130f3ae Mon Sep 17 00:00:00 2001 +From f11cdc39e992d228da764c2fb45feeb57777a72c Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 3 Jan 2015 12:04:59 +0000 Subject: Generate alternative init entries in advanced menu diff -Nru grub2-2.02~beta2/debian/patches/mkconfig_recovery_title.patch grub2-2.02~beta2/debian/patches/mkconfig_recovery_title.patch --- grub2-2.02~beta2/debian/patches/mkconfig_recovery_title.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/mkconfig_recovery_title.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 50a4985aaea010dc104971430fed5ac7cd97ef67 Mon Sep 17 00:00:00 2001 +From c88ce860dc1a3977f6b0b930cadb0c76631ade9e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:33 +0000 Subject: Add GRUB_RECOVERY_TITLE option diff -Nru grub2-2.02~beta2/debian/patches/mkrescue_arm64_naming.patch grub2-2.02~beta2/debian/patches/mkrescue_arm64_naming.patch --- grub2-2.02~beta2/debian/patches/mkrescue_arm64_naming.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/mkrescue_arm64_naming.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 98c685676ed6debbe656462d2ae4040e16fe6a69 Mon Sep 17 00:00:00 2001 +From b3bac73da1c58b3e5f956a4f0a34de8e6e4abeb8 Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Mon, 10 Mar 2014 13:35:53 +0000 Subject: Change grub-mkrescue to use bootaa64.efi too diff -Nru grub2-2.02~beta2/debian/patches/net-ramp-up-interval.patch grub2-2.02~beta2/debian/patches/net-ramp-up-interval.patch --- grub2-2.02~beta2/debian/patches/net-ramp-up-interval.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/net-ramp-up-interval.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From c6653da3c70e30cb337676cb2aeb868c12555b79 Mon Sep 17 00:00:00 2001 +From ee1df194ddcb14fb7e49e3f1c5763cfcc9a861bf Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 21 Jan 2014 11:03:51 -0200 Subject: increase network try interval gradually diff -Nru grub2-2.02~beta2/debian/patches/net-receive-packets-yield.patch grub2-2.02~beta2/debian/patches/net-receive-packets-yield.patch --- grub2-2.02~beta2/debian/patches/net-receive-packets-yield.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/net-receive-packets-yield.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 66dc60ed5442d907edc8e7fada7274e0fd0a7a04 Mon Sep 17 00:00:00 2001 +From 5e6f0b32f7697259c2203d66df251aa86e55ad9b Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Tue, 21 Jan 2014 10:49:39 -0200 Subject: change stop condition to avoid infinite loops diff -Nru grub2-2.02~beta2/debian/patches/ofdisk_add_sas_disks.patch grub2-2.02~beta2/debian/patches/ofdisk_add_sas_disks.patch --- grub2-2.02~beta2/debian/patches/ofdisk_add_sas_disks.patch 2015-11-18 19:06:32.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ofdisk_add_sas_disks.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 52f3ab215a666e6effdfa96b573161fe6aec57bc Mon Sep 17 00:00:00 2001 +From 4b75a4a0f2438e1afd6ff3cb15697dbc52dfbd74 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Sun, 8 Nov 2015 21:52:22 -0200 Subject: ofdisk: add sas disks to the device list @@ -6,7 +6,7 @@ Patch-Name: ofdisk_add_sas_disks.patch Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=c899d9f42c543939abc92d79c9729d429740492e Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1517586 -Last-Update: 2015-11-16 +Last-Update: 2015-11-20 --- grub-core/disk/ieee1275/ofdisk.c | 76 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff -Nru grub2-2.02~beta2/debian/patches/platform-none.patch grub2-2.02~beta2/debian/patches/platform-none.patch --- grub2-2.02~beta2/debian/patches/platform-none.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/platform-none.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 1daa5e8f9951b17a1b0c0365a9d7cdc7131bccff Mon Sep 17 00:00:00 2001 +From 9083cc0a91980827f3e52526e085335097c22763 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 23 Sep 2014 12:11:58 +0100 Subject: Add a new "none" platform that only builds utilities diff -Nru grub2-2.02~beta2/debian/patches/ppc64el-avoid_unnecessary_optimizations.patch grub2-2.02~beta2/debian/patches/ppc64el-avoid_unnecessary_optimizations.patch --- grub2-2.02~beta2/debian/patches/ppc64el-avoid_unnecessary_optimizations.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ppc64el-avoid_unnecessary_optimizations.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 492e73462f34206acae5959cbaf96cdbb24f4bdd Mon Sep 17 00:00:00 2001 +From 43a4b86bf439d33dbddf9d28b2f1b5a7e5b045fc Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Thu, 11 Jun 2015 07:55:16 -0400 Subject: powerpc: Add a flag to avoid unnecessary optimizations (like vsx) diff -Nru grub2-2.02~beta2/debian/patches/ppc64el-disable-vsx.patch grub2-2.02~beta2/debian/patches/ppc64el-disable-vsx.patch --- grub2-2.02~beta2/debian/patches/ppc64el-disable-vsx.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ppc64el-disable-vsx.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 94fca54ee88252b6354ed0cf6f971d6c15ac69d4 Mon Sep 17 00:00:00 2001 +From 7fdfd21bfaec8d01638942704949a651c73c2f41 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Thu, 25 Sep 2014 19:33:39 -0300 Subject: Disable VSX instruction diff -Nru grub2-2.02~beta2/debian/patches/ppc64el-flags.patch grub2-2.02~beta2/debian/patches/ppc64el-flags.patch --- grub2-2.02~beta2/debian/patches/ppc64el-flags.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ppc64el-flags.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From aacad2787d901d873d198ea7142ad0765feeab7b Mon Sep 17 00:00:00 2001 +From c6007ccf86fe91b149971163109dde783663190a Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 17 Sep 2014 14:42:40 -0300 Subject: Add powerpc little-endian (ppc64le) flags diff -Nru grub2-2.02~beta2/debian/patches/ppc64el-skip-libgcc.patch grub2-2.02~beta2/debian/patches/ppc64el-skip-libgcc.patch --- grub2-2.02~beta2/debian/patches/ppc64el-skip-libgcc.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ppc64el-skip-libgcc.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 635102e512eb4a37989f60cd8a6343f6df3fc62c Mon Sep 17 00:00:00 2001 +From 354296efccfd14107c204c81bd3fe436a2278fa9 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Wed, 17 Sep 2014 14:44:30 -0300 Subject: Skip libgcc dependency for powerpc diff -Nru grub2-2.02~beta2/debian/patches/probe-delimiter.patch grub2-2.02~beta2/debian/patches/probe-delimiter.patch --- grub2-2.02~beta2/debian/patches/probe-delimiter.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/probe-delimiter.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 239fd685d8142f264491f69949478370171093dd Mon Sep 17 00:00:00 2001 +From 180b19da2345c3ceeed4ef5fb416226a8d3470df Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 31 Mar 2014 14:48:33 +0100 Subject: Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig. @@ -131,7 +131,7 @@ #endif /* ! GRUB_RAID_H */ diff --git a/util/grub-install.c b/util/grub-install.c -index b4fe429..70f514c 100644 +index 8414ed4..92d92a5 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -401,7 +401,7 @@ probe_raid_level (grub_disk_t disk) diff -Nru grub2-2.02~beta2/debian/patches/probe_fusionio.patch grub2-2.02~beta2/debian/patches/probe_fusionio.patch --- grub2-2.02~beta2/debian/patches/probe_fusionio.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/probe_fusionio.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 33388eccf96d3c6e0eb1596e004a8cb09f3a6326 Mon Sep 17 00:00:00 2001 +From fa220e8e8d80cca55511fe5b2c4fe95f40b922da Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:31 +0000 Subject: Probe FusionIO devices diff -Nru grub2-2.02~beta2/debian/patches/probe_nvme.patch grub2-2.02~beta2/debian/patches/probe_nvme.patch --- grub2-2.02~beta2/debian/patches/probe_nvme.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/probe_nvme.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From c38ecd0452c75e28736958afeed9a2295d8e96bf Mon Sep 17 00:00:00 2001 +From e3591a59adc3802a0ec32808f4b9dc95b903b7d3 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 29 Apr 2014 16:45:44 +0100 Subject: Add support for nvme device in grub-mkdevicemap diff -Nru grub2-2.02~beta2/debian/patches/progress_avoid_null_deref.patch grub2-2.02~beta2/debian/patches/progress_avoid_null_deref.patch --- grub2-2.02~beta2/debian/patches/progress_avoid_null_deref.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/progress_avoid_null_deref.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From df958de5315158a421d3cf938ccbb5164096526a Mon Sep 17 00:00:00 2001 +From 2450f1cce11f110df6e9ca561fea601750f3c580 Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Sat, 10 Oct 2015 11:44:14 +0300 Subject: progress: avoid NULL dereference for net files diff -Nru grub2-2.02~beta2/debian/patches/quick_boot.patch grub2-2.02~beta2/debian/patches/quick_boot.patch --- grub2-2.02~beta2/debian/patches/quick_boot.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/quick_boot.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 93182e8bbc7bc5f723f50b1f89cb913ff373c8b2 Mon Sep 17 00:00:00 2001 +From 13e55ebaa2bf5acf082f6aa45e3cdf4fb181c870 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:28 +0000 Subject: Add configure option to bypass boot menu if possible diff -Nru grub2-2.02~beta2/debian/patches/series grub2-2.02~beta2/debian/patches/series --- grub2-2.02~beta2/debian/patches/series 2015-11-17 15:46:46.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/series 2015-11-25 16:04:46.000000000 +0000 @@ -82,3 +82,4 @@ xfs-fix-alignment.patch xfs-crc-fix-symlink.patch ofdisk_add_sas_disks.patch +efinet-open-Simple-Network-Protocol-exclusively.patch diff -Nru grub2-2.02~beta2/debian/patches/skip_gettext_strings_test.patch grub2-2.02~beta2/debian/patches/skip_gettext_strings_test.patch --- grub2-2.02~beta2/debian/patches/skip_gettext_strings_test.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/skip_gettext_strings_test.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From c9244baed87e46b156769c1a1f0c3b78d6c0a44f Mon Sep 17 00:00:00 2001 +From 46a376d588b6f58a6422eff610c89be6d7c0cf6a Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:34 +0000 Subject: Don't run gettext_strings_test diff -Nru grub2-2.02~beta2/debian/patches/sleep_shift.patch grub2-2.02~beta2/debian/patches/sleep_shift.patch --- grub2-2.02~beta2/debian/patches/sleep_shift.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/sleep_shift.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 9cbb1c4fb92818de45c6ba9c79ee57d2a962a8d6 Mon Sep 17 00:00:00 2001 +From 640f8f37d881017bc18f32e19f901078d39923d1 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:23 +0000 Subject: Allow Shift to interrupt 'sleep --interruptible' diff -Nru grub2-2.02~beta2/debian/patches/tolerate-lvm-snapshots.patch grub2-2.02~beta2/debian/patches/tolerate-lvm-snapshots.patch --- grub2-2.02~beta2/debian/patches/tolerate-lvm-snapshots.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/tolerate-lvm-snapshots.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From df0b6ee461eabadd02bf511cf83b282b11390b69 Mon Sep 17 00:00:00 2001 +From 97be9318773b1ac44747c78b960a0c20210270d9 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 10 Apr 2014 16:54:33 +0100 Subject: Tolerate devices with no filesystem UUID returned by os-prober diff -Nru grub2-2.02~beta2/debian/patches/vt_handoff.patch grub2-2.02~beta2/debian/patches/vt_handoff.patch --- grub2-2.02~beta2/debian/patches/vt_handoff.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/vt_handoff.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From fa9609ca456e67df1f15ebde85684fd5a798ced8 Mon Sep 17 00:00:00 2001 +From c6a5ed447e76e0c3c8797b8e0395691f5f5bdba4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:30 +0000 Subject: Add configure option to use vt.handoff=7 diff -Nru grub2-2.02~beta2/debian/patches/wubi_no_windows.patch grub2-2.02~beta2/debian/patches/wubi_no_windows.patch --- grub2-2.02~beta2/debian/patches/wubi_no_windows.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/wubi_no_windows.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 2051416f6752d1ab910acbdbe1d3e559994dfee7 Mon Sep 17 00:00:00 2001 +From ba847e2301a79775921edb851ffd7ce4036cbfe3 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 13 Jan 2014 12:13:24 +0000 Subject: Skip Windows os-prober entries on Wubi systems diff -Nru grub2-2.02~beta2/debian/patches/x32.patch grub2-2.02~beta2/debian/patches/x32.patch --- grub2-2.02~beta2/debian/patches/x32.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/x32.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From c3f16f40232c35056c8a65cbdf7bb626ed1c6d1f Mon Sep 17 00:00:00 2001 +From 7b883b7a3eb4b52c46cf8c5ef1b399df3cf16a10 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 7 Sep 2014 23:06:49 +0100 Subject: Support grub-emu on x32 (ILP32 but with x86-64 instruction set) diff -Nru grub2-2.02~beta2/debian/patches/xfs-add-inode-size-helpers.patch grub2-2.02~beta2/debian/patches/xfs-add-inode-size-helpers.patch --- grub2-2.02~beta2/debian/patches/xfs-add-inode-size-helpers.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/xfs-add-inode-size-helpers.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From f7692b6ea2df001fb91559b4a27bb8c288db7805 Mon Sep 17 00:00:00 2001 +From 3bfa66ba214fe989719283588ae61c7778988595 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 1 Jun 2015 14:28:45 +0200 Subject: xfs: Add helpers for inode size diff -Nru grub2-2.02~beta2/debian/patches/xfs-crc-fix-symlink.patch grub2-2.02~beta2/debian/patches/xfs-crc-fix-symlink.patch --- grub2-2.02~beta2/debian/patches/xfs-crc-fix-symlink.patch 2015-11-05 15:07:26.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/xfs-crc-fix-symlink.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 25133940565784be3bac00f140ca4086bf20d243 Mon Sep 17 00:00:00 2001 +From 80be497baf892b89ac7b775dfd237d3d9e297c69 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 24 Jul 2015 01:15:32 +0200 Subject: xfs: Fix handling of symlink with crc-enabled filesystem. diff -Nru grub2-2.02~beta2/debian/patches/xfs-fix-alignment.patch grub2-2.02~beta2/debian/patches/xfs-fix-alignment.patch --- grub2-2.02~beta2/debian/patches/xfs-fix-alignment.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/xfs-fix-alignment.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 744e82c493eb014c2649a765cc8ee12f523ccaf4 Mon Sep 17 00:00:00 2001 +From 442d2d2861cc817a2769949a0cd46330cfc268b1 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 16 Jul 2015 12:46:02 +0200 Subject: XFS: Fix wrong alignment treatment. diff -Nru grub2-2.02~beta2/debian/patches/xfs-fix-directory-iteration.patch grub2-2.02~beta2/debian/patches/xfs-fix-directory-iteration.patch --- grub2-2.02~beta2/debian/patches/xfs-fix-directory-iteration.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/xfs-fix-directory-iteration.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From fe80425253b89108c01841f84203bc2b3db5a848 Mon Sep 17 00:00:00 2001 +From 7d12bcf99a086f5082b95ba8f819afb8d0b4a073 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 14 Jul 2014 17:21:29 +0200 Subject: xfs: Fix termination loop for directory iteration diff -Nru grub2-2.02~beta2/debian/patches/xfs-simplify-inode-endian-conversion.patch grub2-2.02~beta2/debian/patches/xfs-simplify-inode-endian-conversion.patch --- grub2-2.02~beta2/debian/patches/xfs-simplify-inode-endian-conversion.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/xfs-simplify-inode-endian-conversion.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 5c9c6331c04238caf4baad5cec01b9979af32c86 Mon Sep 17 00:00:00 2001 +From 82f382747d87ce89176b1fbdd5c3e0ae3eb7bd21 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 14 Jul 2014 17:21:30 +0200 Subject: xfs: Convert inode numbers to cpu endianity immediately after reading diff -Nru grub2-2.02~beta2/debian/patches/xfs-v5.patch grub2-2.02~beta2/debian/patches/xfs-v5.patch --- grub2-2.02~beta2/debian/patches/xfs-v5.patch 2015-11-05 15:07:25.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/xfs-v5.patch 2015-11-25 16:04:50.000000000 +0000 @@ -1,4 +1,4 @@ -From 0c936e15b7b223c618628e7971e822d8dfa23d6f Mon Sep 17 00:00:00 2001 +From cd6abe82a63c633d94290eb22341d884627ef57a Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 1 Jun 2015 14:28:46 +0200 Subject: xfs: V5 filesystem format support