diff --git a/debian/.git-dpm b/debian/.git-dpm index a6a45c090..e849f4465 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -df4a549e72451e65578d055400fb5f213a4699fb -df4a549e72451e65578d055400fb5f213a4699fb +9d4f1601e187894da565f4573b5d174dcf586cd6 +9d4f1601e187894da565f4573b5d174dcf586cd6 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71 grub2_2.02~beta2.orig.tar.xz diff --git a/debian/changelog b/debian/changelog index 10458eaa8..f07d4d702 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,11 @@ grub2 (2.02~beta2-21) UNRELEASED; urgency=medium * Add support for running a 64-bit Linux kernel on a 32-bit EFI (closes: #775202). + [ Colin Watson ] + * Use mtmsr rather than mtmsrd in ppc64el-disable-vsx.patch, since the + "VSX Available" bit is in the lower half of the MSR anyway, and mtmsrd + faults on 32-bit systems (closes: #776400). + -- Mathieu Trudel-Lapierre Fri, 23 Jan 2015 13:43:16 -0500 grub2 (2.02~beta2-20) unstable; urgency=medium diff --git a/debian/patches/check_blocklists_overlap_fix.patch b/debian/patches/check_blocklists_overlap_fix.patch index b2d706de9..fe99ae2f5 100644 --- a/debian/patches/check_blocklists_overlap_fix.patch +++ b/debian/patches/check_blocklists_overlap_fix.patch @@ -1,4 +1,4 @@ -From 2549deb51c3636669b42370c1b2a5c7091016420 Mon Sep 17 00:00:00 2001 +From 2a54e1b19aa1e080f9795a00d7381c0be85b2a4b 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 --git a/debian/patches/gettext-print-typo.patch b/debian/patches/gettext-print-typo.patch index 0c3aca300..9cfaf61cb 100644 --- a/debian/patches/gettext-print-typo.patch +++ b/debian/patches/gettext-print-typo.patch @@ -1,4 +1,4 @@ -From 20886bef9351d5c20a9de1fb3339fe40114f01d1 Mon Sep 17 00:00:00 2001 +From 34411ff593136ce78ab5c21706dfb7ae3655a16f 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 --git a/debian/patches/grub-install-extra-removable.patch b/debian/patches/grub-install-extra-removable.patch index 9b02481b8..6edc43671 100644 --- a/debian/patches/grub-install-extra-removable.patch +++ b/debian/patches/grub-install-extra-removable.patch @@ -1,4 +1,4 @@ -From 617a691e4a95e67967ca8b0c77c59d347df182d6 Mon Sep 17 00:00:00 2001 +From 0c98fa2f582d686e2e9ebdc7065b4475d38e57cb 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 diff --git a/debian/patches/grub-install-pvxen-paths.patch b/debian/patches/grub-install-pvxen-paths.patch index c46b3d86e..3b245ac5e 100644 --- a/debian/patches/grub-install-pvxen-paths.patch +++ b/debian/patches/grub-install-pvxen-paths.patch @@ -1,4 +1,4 @@ -From 313d9a785287753409051363335a26e75855cbd6 Mon Sep 17 00:00:00 2001 +From 1f6d5327f7ae4d6b2cccb6a7c7bd19e86dffbc6e 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 diff --git a/debian/patches/insmod-xzio-and-lzopio-on-xen.patch b/debian/patches/insmod-xzio-and-lzopio-on-xen.patch index dcc2043ca..b23e49ccc 100644 --- a/debian/patches/insmod-xzio-and-lzopio-on-xen.patch +++ b/debian/patches/insmod-xzio-and-lzopio-on-xen.patch @@ -1,4 +1,4 @@ -From b837a9997cb306dc9aaeb3308f05d08cef402456 Mon Sep 17 00:00:00 2001 +From 117750671b90c8576dab576af524f29df9a0981c 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 --git a/debian/patches/mixed_size_efi.patch b/debian/patches/mixed_size_efi.patch index e7e85dd3f..c78346ae7 100644 --- a/debian/patches/mixed_size_efi.patch +++ b/debian/patches/mixed_size_efi.patch @@ -1,4 +1,4 @@ -From df4a549e72451e65578d055400fb5f213a4699fb Mon Sep 17 00:00:00 2001 +From 9d4f1601e187894da565f4573b5d174dcf586cd6 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 --git a/debian/patches/mkconfig_other_inits.patch b/debian/patches/mkconfig_other_inits.patch index 8c51c7af3..85c29fd30 100644 --- a/debian/patches/mkconfig_other_inits.patch +++ b/debian/patches/mkconfig_other_inits.patch @@ -1,4 +1,4 @@ -From cbc80b2e595a7c4938dabd8264c2ff6a26eb4863 Mon Sep 17 00:00:00 2001 +From 810bd3508823c23b4fe05a4edcaf822932a9fffb 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 --git a/debian/patches/ppc64el-disable-vsx.patch b/debian/patches/ppc64el-disable-vsx.patch index d006fc1ad..4af35b81c 100644 --- a/debian/patches/ppc64el-disable-vsx.patch +++ b/debian/patches/ppc64el-disable-vsx.patch @@ -1,4 +1,4 @@ -From 8a1286ce461f0866b26e56ed83626b1d7818f51a Mon Sep 17 00:00:00 2001 +From f7e1bb53e4ea20869766206e348ad97351f94bb2 Mon Sep 17 00:00:00 2001 From: Paulo Flabiano Smorigo Date: Thu, 25 Sep 2014 19:33:39 -0300 Subject: Disable VSX instruction @@ -10,17 +10,18 @@ Kernel will activate it when necessary. * grub-core/kern/powerpc/ieee1275/startup.S: Disable VSX. Also-By: Adhemerval Zanella +Also-By: Colin Watson Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00078.html -Last-Update: 2014-09-26 +Last-Update: 2015-01-27 Patch-Name: ppc64el-disable-vsx.patch --- - grub-core/kern/powerpc/ieee1275/startup.S | 10 ++++++++++ - 1 file changed, 10 insertions(+) + grub-core/kern/powerpc/ieee1275/startup.S | 12 ++++++++++++ + 1 file changed, 12 insertions(+) diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S -index 21c884b..b4d9c21 100644 +index 21c884b..de9a960 100644 --- a/grub-core/kern/powerpc/ieee1275/startup.S +++ b/grub-core/kern/powerpc/ieee1275/startup.S @@ -20,6 +20,8 @@ @@ -32,7 +33,7 @@ index 21c884b..b4d9c21 100644 .extern __bss_start .extern _end -@@ -28,6 +30,14 @@ +@@ -28,6 +30,16 @@ .globl start, _start start: _start: @@ -41,7 +42,9 @@ index 21c884b..b4d9c21 100644 + /* Disable VSX instruction */ + mfmsr 0 + oris 0,0,MSR_VSX -+ mtmsrd 0 ++ /* The "VSX Available" bit is in the lower half of the MSR, so we ++ don't need mtmsrd, which in any case won't work in 32-bit mode. */ ++ mtmsr 0 + isync + li 2, 0 diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S index b4d9c219f..de9a9601a 100644 --- a/grub-core/kern/powerpc/ieee1275/startup.S +++ b/grub-core/kern/powerpc/ieee1275/startup.S @@ -35,7 +35,9 @@ _start: /* Disable VSX instruction */ mfmsr 0 oris 0,0,MSR_VSX - mtmsrd 0 + /* The "VSX Available" bit is in the lower half of the MSR, so we + don't need mtmsrd, which in any case won't work in 32-bit mode. */ + mtmsr 0 isync li 2, 0