From c5ecc11dec2402aa05e68bd03b65a6460837b748 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 31 Jan 2011 00:07:54 -0600 Subject: 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 --- .../grub/grub-1.98/uninit-shdr-fix.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch (limited to 'common/recipes-bsp/grub/grub-1.98/uninit-shdr-fix.patch') 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 @@ +Index: grub-1.98/loader/i386/bsdXX.c +=================================================================== +--- grub-1.98.orig/loader/i386/bsdXX.c 2011-01-25 00:12:14.967535179 -0600 ++++ grub-1.98/loader/i386/bsdXX.c 2011-01-25 00:13:16.387535169 -0600 +@@ -80,7 +80,7 @@ + { + Elf_Ehdr e; + Elf_Shdr *s; +- char *shdr; ++ char *shdr = NULL; + grub_addr_t curload, module; + grub_err_t err; + +@@ -148,7 +148,7 @@ + { + Elf_Ehdr e; + Elf_Shdr *s; +- char *shdr; ++ char *shdr = NULL; + grub_addr_t curload, module; + grub_err_t err; + +@@ -223,7 +223,7 @@ + grub_err_t err; + Elf_Ehdr e; + Elf_Shdr *s; +- char *shdr; ++ char *shdr = NULL; + unsigned symoff, stroff, symsize, strsize; + grub_addr_t curload; + grub_freebsd_addr_t symstart, symend, symentsize, dynamic; -- cgit v1.2.3-54-g00ecf