← Back to branch summary

~ubuntu-branches/ubuntu/wily/grub2/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/linuxefi_amd64_only.patch

  • Committer: Package Import Robot
  • Author(s): Ian Campbell, Colin Watson, Ian Campbell
  • Date: 2014-11-30 17:15:21 UTC
  • Revision ID: package-import@ubuntu.com-20141130171521-jtqle9j0ckcww9wy
Tags: 2.02~beta2-17
https://launchpad.net/bugs/1390766
http://bugs.debian.org/770412
http://bugs.debian.org/755256
[ Colin Watson ]
* Fix up some pointer-to-integer casts in linuxefi so that it can build on
  i386-efi.
* Backport from upstream:
  - Fix typo (gettext_print instead of gettext_printf) (LP: #1390766).

[ Ian Campbell ]
* Correct syntax error in grub-xen-host bootstrap configuration file.
* Log failure when grub-install fails in postinst, rather than failing the
  entire postinst. (Closes: #770412)
* Arrange to insmod xzio and lzopio when booting a kernel as a Xen guest.
  (Closes: #755256)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/linuxefi_amd64_only.patch
1
 
From d17d82d5217170e5f3124ed1c5aa77a7b8f253d7 Mon Sep 17 00:00:00 2001
2
 
From: Colin Watson <cjwatson@ubuntu.com>
3
 
Date: Mon, 13 Jan 2014 12:13:16 +0000
4
 
Subject: Only build linuxefi on amd64
5
 
 
6
 
Forwarded: no
7
 
Last-Update: 2013-12-25
8
 
 
9
 
Patch-Name: linuxefi_amd64_only.patch
10
 
---
11
 
 grub-core/Makefile.core.def | 1 -
12
 
 1 file changed, 1 deletion(-)
13
 
 
14
 
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
15
 
index 8c246c6..8fed2fb 100644
16
 
--- a/grub-core/Makefile.core.def
17
 
+++ b/grub-core/Makefile.core.def
18
 
@@ -1709,7 +1709,6 @@ module = {
19
 
   name = linuxefi;
20
 
   efi = loader/i386/efi/linux.c;
21
 
   efi = lib/cmdline.c;
22
 
-  enable = i386_efi;
23
 
   enable = x86_64_efi;
24
 
 };
25