diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-01-31 00:07:54 -0600 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2011-01-31 00:07:54 -0600 |
commit | c5ecc11dec2402aa05e68bd03b65a6460837b748 (patch) | |
tree | 8ca0e296946abc3a0b9a79b51fa9f04d7d5469d7 /common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch | |
parent | 3a6fbfdf01945277a4a271942fc8086575c41744 (diff) | |
download | meta-intel-c5ecc11dec2402aa05e68bd03b65a6460837b748.tar.gz |
meta-intel: add a /common dir with grub2/live-install changes
Add a /common dir to contain code shared by multiple BSPs in the
meta-intel repo, along with a couple recipes to live there
temporarily.
In this case, there are two BSPs that need to share the common grub2
and associated initramfs-live-install changes (sugarbay and
jasperforest).
The grub2 and associated initramfs-live-install changes will soon be
submitted to the main poky repo, but for now it makes more sense to
keep them here - they're needed for live-install of the two BSPs
mentioned, but they contain a couple hacks that need to be addressed
and are untested with anything else.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch')
-rw-r--r-- | common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch b/common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch new file mode 100644 index 00000000..67af594b --- /dev/null +++ b/common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Index: grub-1.98/loader/i386/bsdXX.c | ||
2 | =================================================================== | ||
3 | --- grub-1.98.orig/loader/i386/bsdXX.c 2011-01-25 00:12:14.967535179 -0600 | ||
4 | +++ grub-1.98/loader/i386/bsdXX.c 2011-01-25 00:13:16.387535169 -0600 | ||
5 | @@ -80,7 +80,7 @@ | ||
6 | { | ||
7 | Elf_Ehdr e; | ||
8 | Elf_Shdr *s; | ||
9 | - char *shdr; | ||
10 | + char *shdr = NULL; | ||
11 | grub_addr_t curload, module; | ||
12 | grub_err_t err; | ||
13 | |||
14 | @@ -148,7 +148,7 @@ | ||
15 | { | ||
16 | Elf_Ehdr e; | ||
17 | Elf_Shdr *s; | ||
18 | - char *shdr; | ||
19 | + char *shdr = NULL; | ||
20 | grub_addr_t curload, module; | ||
21 | grub_err_t err; | ||
22 | |||
23 | @@ -223,7 +223,7 @@ | ||
24 | grub_err_t err; | ||
25 | Elf_Ehdr e; | ||
26 | Elf_Shdr *s; | ||
27 | - char *shdr; | ||
28 | + char *shdr = NULL; | ||
29 | unsigned symoff, stroff, symsize, strsize; | ||
30 | grub_addr_t curload; | ||
31 | grub_freebsd_addr_t symstart, symend, symentsize, dynamic; | ||