[grub/f15/master] Fix wrong includes on 32-bit for efibind.h
Peter Jones
pjones at fedoraproject.org
Mon Mar 14 15:35:03 UTC 2011
commit ff41f045a42ea4d59d9ec6bb16cb0ab0ec1bfe2b
Author: Peter Jones <pjones at redhat.com>
Date: Mon Mar 14 11:33:48 2011 -0400
Fix wrong includes on 32-bit for efibind.h
grub-fedora-15.patch | 114 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 35 deletions(-)
---
diff --git a/grub-fedora-15.patch b/grub-fedora-15.patch
index d2c3c8a..b19346d 100644
--- a/grub-fedora-15.patch
+++ b/grub-fedora-15.patch
@@ -33,20 +33,20 @@ git diff grub-0.97 fedora-15
b/efi/Makefile.am | 76
b/efi/byteswap.h | 37
b/efi/dhcp.h | 133
- b/efi/efichainloader.c | 267 +
- b/efi/eficon.c | 308 +
- b/efi/eficore.c | 233 +
- b/efi/efidisk.c | 787 ++++
+ b/efi/efichainloader.c | 271 +
+ b/efi/eficon.c | 312 +
+ b/efi/eficore.c | 237 +
+ b/efi/efidisk.c | 791 ++++
b/efi/efidp.c | 984 +++++
- b/efi/efigraph.c | 1461 +++++++
+ b/efi/efigraph.c | 1465 +++++++
b/efi/efimain.c | 129
- b/efi/efimisc.c | 667 +++
- b/efi/efimm.c | 514 ++
- b/efi/efiserial.c | 267 +
- b/efi/efitftp.c | 230 +
- b/efi/efiuga.c | 948 ++++
+ b/efi/efimisc.c | 671 +++
+ b/efi/efimm.c | 518 ++
+ b/efi/efiserial.c | 271 +
+ b/efi/efitftp.c | 234 +
+ b/efi/efiuga.c | 952 ++++
b/efi/font_8x16.c | 4638 +++++++++++++++++++++++
- b/efi/graphics.c | 570 ++
+ b/efi/graphics.c | 574 ++
b/efi/graphics.h | 79
b/efi/grub/.gitignore | 1
b/efi/grub/efi/api.h | 1471 +++++++
@@ -150,8 +150,8 @@ git diff grub-0.97 fedora-15
b/util/grub-crypt.in | 80
b/util/grub-install.in | 334 +
configure | 7639 ---------------------------------------
- 139 files changed, 27375 insertions(+), 10639 deletions(-)
-
+ 139 files changed, 27419 insertions(+), 10639 deletions(-)
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4e19579
@@ -10863,10 +10863,10 @@ index 0000000..a82a522
+#endif /* DHCP_H */
diff --git a/efi/efichainloader.c b/efi/efichainloader.c
new file mode 100644
-index 0000000..307048b
+index 0000000..afa84e9
--- /dev/null
+++ b/efi/efichainloader.c
-@@ -0,0 +1,267 @@
+@@ -0,0 +1,271 @@
+/* efichainloader.c - boot another boot loader */
+/*
+ * GRUB -- GRand Unified Bootloader
@@ -10895,7 +10895,11 @@ index 0000000..307048b
+
+#include <shared.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+#define grub_file_size() filemax
+
@@ -11136,10 +11140,10 @@ index 0000000..307048b
+}
diff --git a/efi/eficon.c b/efi/eficon.c
new file mode 100644
-index 0000000..2a04247
+index 0000000..1580452
--- /dev/null
+++ b/efi/eficon.c
-@@ -0,0 +1,308 @@
+@@ -0,0 +1,312 @@
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2006 Free Software Foundation, Inc.
@@ -11165,7 +11169,11 @@ index 0000000..2a04247
+#include <grub/efi/api.h>
+#include <grub/efi/misc.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+#include <shared.h>
+#include <term.h>
@@ -11450,10 +11458,10 @@ index 0000000..2a04247
+}
diff --git a/efi/eficore.c b/efi/eficore.c
new file mode 100644
-index 0000000..ff61fb0
+index 0000000..b57170c
--- /dev/null
+++ b/efi/eficore.c
-@@ -0,0 +1,233 @@
+@@ -0,0 +1,237 @@
+/* eficore.c - generic EFI support */
+/*
+ * GRUB -- GRand Unified Bootloader
@@ -11482,7 +11490,11 @@ index 0000000..ff61fb0
+#include <grub/efi/console_control.h>
+#include <grub/efi/time.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+#include <shared.h>
+
@@ -11689,10 +11701,10 @@ index 0000000..ff61fb0
+
diff --git a/efi/efidisk.c b/efi/efidisk.c
new file mode 100644
-index 0000000..9d94951
+index 0000000..e9cbf62
--- /dev/null
+++ b/efi/efidisk.c
-@@ -0,0 +1,787 @@
+@@ -0,0 +1,791 @@
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2006 Free Software Foundation, Inc.
@@ -11718,7 +11730,11 @@ index 0000000..9d94951
+#include <grub/efi/efi.h>
+#include <grub/efi/misc.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+#include <shared.h>
+
@@ -13472,10 +13488,10 @@ index 0000000..3e0019d
+}
diff --git a/efi/efigraph.c b/efi/efigraph.c
new file mode 100644
-index 0000000..9f309c7
+index 0000000..623d583
--- /dev/null
+++ b/efi/efigraph.c
-@@ -0,0 +1,1461 @@
+@@ -0,0 +1,1465 @@
+/* efigraph.c - EFI "graphics output" support for GRUB/EFI */
+/*
+ * GRUB -- GRand Unified Bootloader
@@ -13512,7 +13528,11 @@ index 0000000..9f309c7
+#include <shared.h>
+#include <graphics.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+#include "graphics.h"
+#include "xpm.h"
@@ -15074,10 +15094,10 @@ index 0000000..e1a1e66
+}
diff --git a/efi/efimisc.c b/efi/efimisc.c
new file mode 100644
-index 0000000..7b306c8
+index 0000000..c3b811a
--- /dev/null
+++ b/efi/efimisc.c
-@@ -0,0 +1,667 @@
+@@ -0,0 +1,671 @@
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2006 Free Software Foundation, Inc.
@@ -15104,7 +15124,11 @@ index 0000000..7b306c8
+#include <grub/efi/misc.h>
+#include <grub/misc.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+#include <shared.h>
+
@@ -15747,10 +15771,10 @@ index 0000000..7b306c8
+}
diff --git a/efi/efimm.c b/efi/efimm.c
new file mode 100644
-index 0000000..776608a
+index 0000000..e145bf2
--- /dev/null
+++ b/efi/efimm.c
-@@ -0,0 +1,514 @@
+@@ -0,0 +1,518 @@
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2006 Free Software Foundation, Inc.
@@ -15777,7 +15801,11 @@ index 0000000..776608a
+#include <grub/efi/efi.h>
+#include <grub/efi/misc.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+#include <shared.h>
+
@@ -16270,10 +16298,10 @@ new file mode 100644
index 0000000..e69de29
diff --git a/efi/efiserial.c b/efi/efiserial.c
new file mode 100644
-index 0000000..c8c3fda
+index 0000000..5a0aa30
--- /dev/null
+++ b/efi/efiserial.c
-@@ -0,0 +1,267 @@
+@@ -0,0 +1,271 @@
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2007 Intel Corp.
@@ -16305,7 +16333,11 @@ index 0000000..c8c3fda
+#include <serial.h>
+#include <term.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+struct grub_efiserial_data
+{
@@ -16543,16 +16575,20 @@ index 0000000..c8c3fda
+#endif /* SUPPORT_SERIAL */
diff --git a/efi/efitftp.c b/efi/efitftp.c
new file mode 100644
-index 0000000..d11fd75
+index 0000000..ef2cd9f
--- /dev/null
+++ b/efi/efitftp.c
-@@ -0,0 +1,230 @@
+@@ -0,0 +1,234 @@
+#include <grub/efi/efi.h>
+#include <grub/efi/api.h>
+#include <grub/efi/misc.h>
+#include <grub/misc.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+#include <shared.h>
+#include <filesys.h>
@@ -16779,10 +16815,10 @@ index 0000000..d11fd75
+}
diff --git a/efi/efiuga.c b/efi/efiuga.c
new file mode 100644
-index 0000000..0ba67e5
+index 0000000..22623b4
--- /dev/null
+++ b/efi/efiuga.c
-@@ -0,0 +1,948 @@
+@@ -0,0 +1,952 @@
+/* efiuga.c - "univeral graphics adapter" support for GRUB/EFI */
+/*
+ * GRUB -- GRand Unified Bootloader
@@ -16819,7 +16855,11 @@ index 0000000..0ba67e5
+#include <shared.h>
+#include <graphics.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+#include "graphics.h"
+#include "xpm.h"
@@ -22377,10 +22417,10 @@ index 0000000..94829ec
+#endif
diff --git a/efi/graphics.c b/efi/graphics.c
new file mode 100644
-index 0000000..e74c8f7
+index 0000000..73864a8
--- /dev/null
+++ b/efi/graphics.c
-@@ -0,0 +1,570 @@
+@@ -0,0 +1,574 @@
+#ifdef SUPPORT_GRAPHICS
+
+#include <grub/misc.h>
@@ -22394,7 +22434,11 @@ index 0000000..e74c8f7
+#include <shared.h>
+#include <graphics.h>
+
++#ifdef __x86_64__
+#include </usr/include/efi/x86_64/efibind.h>
++#else
++#include </usr/include/efi/ia32/efibind.h>
++#endif
+
+#include "graphics.h"
+
More information about the scm-commits
mailing list