diff -Nru grub2-2.02~beta2/debian/changelog grub2-2.02~beta2/debian/changelog --- grub2-2.02~beta2/debian/changelog 2014-09-26 17:05:19.000000000 +0000 +++ grub2-2.02~beta2/debian/changelog 2014-10-15 20:34:05.000000000 +0000 @@ -1,3 +1,11 @@ +grub2 (2.02~beta2-15) unstable; urgency=medium + + * Disable nvram installation again on chrp_ibm machines that are emulated + by qemu; that doesn't have nvram devices so the nvram utility inevitably + fails. + + -- Colin Watson Wed, 15 Oct 2014 21:34:02 +0100 + grub2 (2.02~beta2-14) unstable; urgency=medium * On architectures without a real GRUB port, just build the utilities. diff -Nru grub2-2.02~beta2/debian/.git-dpm grub2-2.02~beta2/debian/.git-dpm --- grub2-2.02~beta2/debian/.git-dpm 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/.git-dpm 2014-10-15 12:28:12.000000000 +0000 @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -a37e2d321eee07abe95da4bc452762d0f3de3704 -a37e2d321eee07abe95da4bc452762d0f3de3704 +603e3eaf4807b988cb87e3dd8a00a0518dc237aa +603e3eaf4807b988cb87e3dd8a00a0518dc237aa e8f07821cce1bd0ab6d5622c2a42440f15f4fd71 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71 grub2_2.02~beta2.orig.tar.xz 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 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/btrfs-endian.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From f80114b5f552bb2ffd0db0cef31738c0952c0a71 Mon Sep 17 00:00:00 2001 +From 05782dbceedc0c2a5f17a80cbd58c233ce7c8141 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/ieee1275-clear-reset.patch grub2-2.02~beta2/debian/patches/ieee1275-clear-reset.patch --- grub2-2.02~beta2/debian/patches/ieee1275-clear-reset.patch 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ieee1275-clear-reset.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 1ef3375e9bf123eb9e46a61ea4d7d17d747ce892 Mon Sep 17 00:00:00 2001 +From 8500c4f400ae033c79f495bbb5a10079f633193c 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 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ieee1275-pseries-emulation.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From b76176d6c5d48dc95f9d70b2330e13ed34dbf924 Mon Sep 17 00:00:00 2001 +From 5b79bb9581844e0abbfabfa06e0670f9c5fc594e 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/install_arm64_naming.patch grub2-2.02~beta2/debian/patches/install_arm64_naming.patch --- grub2-2.02~beta2/debian/patches/install_arm64_naming.patch 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/install_arm64_naming.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From e14cf7792a98a819254d62e613736fde2b3bca8e Mon Sep 17 00:00:00 2001 +From b9f4934da52a6d870299916ca636e663f41161a2 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 505af9e..1ff6522 100644 +index 98da118..b4fe429 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_powerpc_machtypes.patch grub2-2.02~beta2/debian/patches/install_powerpc_machtypes.patch --- grub2-2.02~beta2/debian/patches/install_powerpc_machtypes.patch 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/install_powerpc_machtypes.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 2256ca4482615037f1420845fa3066be1133d92d Mon Sep 17 00:00:00 2001 +From 6b86ab9bd13c56b7cbf957e89a5e201ddc011979 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 @@ -12,17 +12,17 @@ verified.) Forwarded: no -Last-Update: 2014-09-26 +Last-Update: 2014-10-15 Patch-Name: install_powerpc_machtypes.patch --- grub-core/osdep/basic/platform.c | 5 +++ - grub-core/osdep/linux/platform.c | 64 ++++++++++++++++++++++++++++++++++++++ - grub-core/osdep/unix/platform.c | 28 +++++++++++++---- + grub-core/osdep/linux/platform.c | 72 ++++++++++++++++++++++++++++++++++++++ + grub-core/osdep/unix/platform.c | 28 +++++++++++---- grub-core/osdep/windows/platform.c | 6 ++++ include/grub/util/install.h | 3 ++ - util/grub-install.c | 9 ++++++ - 6 files changed, 109 insertions(+), 6 deletions(-) + util/grub-install.c | 11 ++++++ + 6 files changed, 119 insertions(+), 6 deletions(-) diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c index 4b5502a..2ab9079 100644 @@ -38,7 +38,7 @@ + return "generic"; +} diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c -index 175da72..185f971 100644 +index 175da72..033afd8 100644 --- a/grub-core/osdep/linux/platform.c +++ b/grub-core/osdep/linux/platform.c @@ -24,6 +24,7 @@ @@ -49,7 +49,7 @@ #include #include -@@ -108,3 +109,66 @@ grub_install_get_default_x86_platform (void) +@@ -108,3 +109,74 @@ grub_install_get_default_x86_platform (void) grub_util_info ("... not found"); return "i386-pc"; } @@ -93,8 +93,16 @@ + if (strncmp (buf, "machine", sizeof ("machine") - 1) == 0 && + strstr (buf, "CHRP IBM")) + { -+ machtype = "chrp_ibm"; -+ break; ++ if (strstr (buf, "qemu")) ++ { ++ machtype = "chrp_ibm_qemu"; ++ break; ++ } ++ else ++ { ++ machtype = "chrp_ibm"; ++ break; ++ } + } + + if (strncmp (buf, "platform", sizeof ("platform") - 1) == 0) @@ -188,10 +196,10 @@ 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..505af9e 100644 +index 1f27b65..98da118 100644 --- a/util/grub-install.c +++ b/util/grub-install.c -@@ -1143,7 +1143,16 @@ main (int argc, char *argv[]) +@@ -1143,7 +1143,18 @@ main (int argc, char *argv[]) if (platform == GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275) { @@ -204,6 +212,8 @@ + update_nvram = 0; + else if (strcmp (machtype, "generic") == 0) + update_nvram = 0; ++ else if (strcmp (machtype, "chrp_ibm_qemu") == 0) ++ update_nvram = 0; + if (!macppcdir) { 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 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/mips-abiflags.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 46a36e18ffabb27c048b761635aee2e1ff142d0d Mon Sep 17 00:00:00 2001 +From a2c0750e322048db7f6e151b2f40832e1cc4060e 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/mkconfig-kernels-infloop.patch grub2-2.02~beta2/debian/patches/mkconfig-kernels-infloop.patch --- grub2-2.02~beta2/debian/patches/mkconfig-kernels-infloop.patch 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/mkconfig-kernels-infloop.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 3daa2cfe7ef4ac2de9b46f086af03ac33413d96b Mon Sep 17 00:00:00 2001 +From 2054fb25f29ee1896e232ed22b4f75c645b3603a 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/mkrescue_arm64_naming.patch grub2-2.02~beta2/debian/patches/mkrescue_arm64_naming.patch --- grub2-2.02~beta2/debian/patches/mkrescue_arm64_naming.patch 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/mkrescue_arm64_naming.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From d24a5f758e9ba240673eabe44682da2d633007eb Mon Sep 17 00:00:00 2001 +From 9a1ad757a9dfb7cf6668cd0c075e3194505dfde5 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 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/net-ramp-up-interval.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 959aab2a4c8eb84b9422cddc0d76505a7d8eae77 Mon Sep 17 00:00:00 2001 +From e90d795b449c4ee877b7cbad6ee72f24dbe7c3ff 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 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/net-receive-packets-yield.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 47f7e14f4425da35789eb74eb86dd5a284210328 Mon Sep 17 00:00:00 2001 +From c08579124c9dd427b5ab1978b940387cd1202ed5 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/platform-none.patch grub2-2.02~beta2/debian/patches/platform-none.patch --- grub2-2.02~beta2/debian/patches/platform-none.patch 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/platform-none.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 6f0ffb5f9a6d770c7714ca70af52ce2f45f8c5d6 Mon Sep 17 00:00:00 2001 +From 77222fe6636854567863cf5fd6b1bf0c3bc5ffb4 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-disable-vsx.patch grub2-2.02~beta2/debian/patches/ppc64el-disable-vsx.patch --- grub2-2.02~beta2/debian/patches/ppc64el-disable-vsx.patch 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ppc64el-disable-vsx.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From a37e2d321eee07abe95da4bc452762d0f3de3704 Mon Sep 17 00:00:00 2001 +From 603e3eaf4807b988cb87e3dd8a00a0518dc237aa 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 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ppc64el-flags.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From e7337b69b907875d43ca9e39cac0fad540a4f6cf Mon Sep 17 00:00:00 2001 +From 1218b1cf4290eb0389f28128ae1ad3798e29ac90 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 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/ppc64el-skip-libgcc.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From e5f9743e4b1d122e80fac1b78f90f6e64b26dcfa Mon Sep 17 00:00:00 2001 +From b3c2863b099e05ddf970797c5ab2c79bc1e09fb8 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 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/probe-delimiter.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 85f00e4dc5aa2c89ba688fa7d2f1b93dd5105c9c Mon Sep 17 00:00:00 2001 +From 96f378e2fbeccea95d2496d4428b82a69fbb5f8e 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 1ff6522..93cdf1f 100644 +index b4fe429..70f514c 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_nvme.patch grub2-2.02~beta2/debian/patches/probe_nvme.patch --- grub2-2.02~beta2/debian/patches/probe_nvme.patch 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/probe_nvme.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 187c212f7306634aa4da829b68af1aef890009a8 Mon Sep 17 00:00:00 2001 +From a59b9959c77a656f109e3b1c15029c1dec3e62d2 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/tolerate-lvm-snapshots.patch grub2-2.02~beta2/debian/patches/tolerate-lvm-snapshots.patch --- grub2-2.02~beta2/debian/patches/tolerate-lvm-snapshots.patch 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/tolerate-lvm-snapshots.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 4ed426167d62201d66d2d6aa6bb4468533e6780b Mon Sep 17 00:00:00 2001 +From 92881e145cd5844c0f38b7fe67c0ab5755275a6a 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/x32.patch grub2-2.02~beta2/debian/patches/x32.patch --- grub2-2.02~beta2/debian/patches/x32.patch 2014-09-26 13:08:52.000000000 +0000 +++ grub2-2.02~beta2/debian/patches/x32.patch 2014-10-15 12:28:12.000000000 +0000 @@ -1,4 +1,4 @@ -From 9183a4b023ce65b5a9c40092293b0c9f83651b0a Mon Sep 17 00:00:00 2001 +From d074f9f8320a3d6498982389d3a1779de078c898 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)