summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub/grub-2.00
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/grub/grub-2.00')
-rw-r--r--meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch44
-rw-r--r--meta/recipes-bsp/grub/grub-2.00/grub-install.in.patch20
-rw-r--r--meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch104
-rw-r--r--meta/recipes-bsp/grub/grub-2.00/remove-gets.patch20
4 files changed, 188 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch b/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch
new file mode 100644
index 0000000000..079992afba
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch
@@ -0,0 +1,44 @@
1grub-core/net/tftp.c: fix endianness problem.
2
3 * grub-core/net/tftp.c (ack): Fix endianness problem.
4 (tftp_receive): Likewise.
5 Reported by: Michael Davidsaver.
6
7Upstream-Status: Backport
8
9diff --git a/ChangeLog b/ChangeLog
10index 81bdae9..c2f42d5 100644
11--- a/ChangeLog
12+++ b/ChangeLog
13@@ -1,3 +1,9 @@
14+2012-07-02 Vladimir Serbinenko <phcoder@gmail.com>
15+
16+ * grub-core/net/tftp.c (ack): Fix endianness problem.
17+ (tftp_receive): Likewise.
18+ Reported by: Michael Davidsaver.
19+
20 2012-06-27 Vladimir Serbinenko <phcoder@gmail.com>
21
22 * configure.ac: Bump version to 2.00.
23diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
24index 9c70efb..d0f39ea 100644
25--- a/grub-core/net/tftp.c
26+++ b/grub-core/net/tftp.c
27@@ -143,7 +143,7 @@ ack (tftp_data_t data, grub_uint16_t block)
28
29 tftph_ack = (struct tftphdr *) nb_ack.data;
30 tftph_ack->opcode = grub_cpu_to_be16 (TFTP_ACK);
31- tftph_ack->u.ack.block = block;
32+ tftph_ack->u.ack.block = grub_cpu_to_be16 (block);
33
34 err = grub_net_send_udp_packet (data->sock, &nb_ack);
35 if (err)
36@@ -225,7 +225,7 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)),
37 grub_priority_queue_pop (data->pq);
38
39 if (file->device->net->packs.count < 50)
40- err = ack (data, tftph->u.data.block);
41+ err = ack (data, data->block + 1);
42 else
43 {
44 file->device->net->stall = 1;
diff --git a/meta/recipes-bsp/grub/grub-2.00/grub-install.in.patch b/meta/recipes-bsp/grub/grub-2.00/grub-install.in.patch
new file mode 100644
index 0000000000..326951df44
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-2.00/grub-install.in.patch
@@ -0,0 +1,20 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Our use of grub-install doesn't require the -x option, so we should be
4be able make use of grep versions that don't support it.
5
6Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
7
8Index: grub-1.99/util/grub-install.in
9===================================================================
10--- grub-1.99.orig/util/grub-install.in 2011-09-09 22:37:20.093906679 -0500
11+++ grub-1.99/util/grub-install.in 2011-09-09 22:37:30.854737882 -0500
12@@ -510,7 +510,7 @@
13
14 if [ "x${devabstraction_module}" = "x" ] ; then
15 if [ x"${install_device}" != x ]; then
16- if echo "${install_device}" | grep -qx "(.*)" ; then
17+ if echo "${install_device}" | grep -q "(.*)" ; then
18 install_drive="${install_device}"
19 else
20 install_drive="`"$grub_probe" --device-map="${device_map}" --target=drive --device "${install_device}"`" || exit 1
diff --git a/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch b/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch
new file mode 100644
index 0000000000..6259a1abe3
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-2.00/grub2-remove-sparc64-setup-from-x86-builds.patch
@@ -0,0 +1,104 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3remove the grub-sparc64-setup files from the x86 builds.
4
5Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
6
7--- a/Makefile.util.am 2014-08-15 11:41:02.441011278 -0700
8+++ b/Makefile.util.am 2014-08-15 11:44:26.245021142 -0700
9@@ -4692,9 +4692,9 @@
10 endif
11
12 if COND_emu
13-sbin_PROGRAMS += grub-sparc64-setup
14+sbin_PROGRAMS +=
15 if COND_MAN_PAGES
16-man_MANS += grub-sparc64-setup.8
17+man_MANS +=
18
19 grub-sparc64-setup.8: grub-sparc64-setup
20 chmod a+x grub-sparc64-setup
21@@ -4715,9 +4715,9 @@
22 endif
23
24 if COND_i386_pc
25-sbin_PROGRAMS += grub-sparc64-setup
26+sbin_PROGRAMS +=
27 if COND_MAN_PAGES
28-man_MANS += grub-sparc64-setup.8
29+man_MANS +=
30
31 grub-sparc64-setup.8: grub-sparc64-setup
32 chmod a+x grub-sparc64-setup
33@@ -4738,9 +4738,9 @@
34 endif
35
36 if COND_i386_efi
37-sbin_PROGRAMS += grub-sparc64-setup
38+sbin_PROGRAMS +=
39 if COND_MAN_PAGES
40-man_MANS += grub-sparc64-setup.8
41+man_MANS +=
42
43 grub-sparc64-setup.8: grub-sparc64-setup
44 chmod a+x grub-sparc64-setup
45@@ -4761,9 +4761,9 @@
46 endif
47
48 if COND_i386_qemu
49-sbin_PROGRAMS += grub-sparc64-setup
50+sbin_PROGRAMS +=
51 if COND_MAN_PAGES
52-man_MANS += grub-sparc64-setup.8
53+man_MANS +=
54
55 grub-sparc64-setup.8: grub-sparc64-setup
56 chmod a+x grub-sparc64-setup
57@@ -4784,9 +4784,9 @@
58 endif
59
60 if COND_i386_coreboot
61-sbin_PROGRAMS += grub-sparc64-setup
62+sbin_PROGRAMS +=
63 if COND_MAN_PAGES
64-man_MANS += grub-sparc64-setup.8
65+man_MANS +=
66
67 grub-sparc64-setup.8: grub-sparc64-setup
68 chmod a+x grub-sparc64-setup
69@@ -4807,9 +4807,9 @@
70 endif
71
72 if COND_i386_multiboot
73-sbin_PROGRAMS += grub-sparc64-setup
74+sbin_PROGRAMS +=
75 if COND_MAN_PAGES
76-man_MANS += grub-sparc64-setup.8
77+man_MANS +=
78
79 grub-sparc64-setup.8: grub-sparc64-setup
80 chmod a+x grub-sparc64-setup
81@@ -4830,9 +4830,9 @@
82 endif
83
84 if COND_i386_ieee1275
85-sbin_PROGRAMS += grub-sparc64-setup
86+sbin_PROGRAMS +=
87 if COND_MAN_PAGES
88-man_MANS += grub-sparc64-setup.8
89+man_MANS +=
90
91 grub-sparc64-setup.8: grub-sparc64-setup
92 chmod a+x grub-sparc64-setup
93@@ -4853,9 +4853,9 @@
94 endif
95
96 if COND_x86_64_efi
97-sbin_PROGRAMS += grub-sparc64-setup
98+sbin_PROGRAMS +=
99 if COND_MAN_PAGES
100-man_MANS += grub-sparc64-setup.8
101+man_MANS +=
102
103 grub-sparc64-setup.8: grub-sparc64-setup
104 chmod a+x grub-sparc64-setup
diff --git a/meta/recipes-bsp/grub/grub-2.00/remove-gets.patch b/meta/recipes-bsp/grub/grub-2.00/remove-gets.patch
new file mode 100644
index 0000000000..463f7847ad
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-2.00/remove-gets.patch
@@ -0,0 +1,20 @@
1ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: grub-1.99/grub-core/gnulib/stdio.in.h
7===================================================================
8--- grub-1.99.orig/grub-core/gnulib/stdio.in.h 2010-12-01 06:45:43.000000000 -0800
9+++ grub-1.99/grub-core/gnulib/stdio.in.h 2012-07-04 12:25:02.057099107 -0700
10@@ -140,8 +140,10 @@
11 /* It is very rare that the developer ever has full control of stdin,
12 so any use of gets warrants an unconditional warning. Assume it is
13 always declared, since it is required by C89. */
14+#if defined gets
15 #undef gets
16 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
17+#endif
18
19 #if @GNULIB_FOPEN@
20 # if @REPLACE_FOPEN@
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-28 00:43:20 +0000