summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2013-07-31 08:26:21 +0000
committerIan Delaney <idella4@gentoo.org>2013-07-31 08:26:21 +0000
commit62cd2d1cb4ebfdbbcecb035baca4bee067e3bc83 (patch)
tree2b6bf09e3eb1621f073145172ed047de7d9d30e1 /app-emulation/xen-pvgrub/files
parentStable for amd64, wrt bug #479048 (diff)
downloadgentoo-2-62cd2d1cb4ebfdbbcecb035baca4bee067e3bc83.tar.gz
gentoo-2-62cd2d1cb4ebfdbbcecb035baca4bee067e3bc83.tar.bz2
gentoo-2-62cd2d1cb4ebfdbbcecb035baca4bee067e3bc83.zip
Re-name xen-4.2.0-jserver.patch -> xen-pvgrub-4.2-jserver.patch, added patch from upstream addressing QA issues
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'app-emulation/xen-pvgrub/files')
-rw-r--r--app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch35
-rw-r--r--app-emulation/xen-pvgrub/files/xen-pvgrub-4.2-jserver.patch (renamed from app-emulation/xen-pvgrub/files/xen-4.2.0-jserver.patch)0
2 files changed, 35 insertions, 0 deletions
diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch
new file mode 100644
index 000000000000..33d56db54e60
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch
@@ -0,0 +1,35 @@
+This includes a few headers to fix some missing function declarations.
+
+Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+diff --git a/stubdom/grub/config.h b/stubdom/grub/config.h
+index 1649d51..15a6583 100644
+--- a/stubdom/grub/config.h
++++ b/stubdom/grub/config.h
+@@ -2,6 +2,7 @@
+ #undef putchar
+ #include <ctype.h>
+ #include <string.h>
++#include <kernel.h>
+ #define debug _debug
+ #define grub_halt(a) do_exit()
+ #define printf grub_printf
+diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h
+index 2a6fa54..e65db6d 100644
+--- a/xen/include/xen/libelf.h
++++ b/xen/include/xen/libelf.h
+@@ -39,11 +39,13 @@ typedef int elf_negerrnoval; /* 0: ok; -EFOO: error */
+ #ifdef __XEN__
+ #include <public/elfnote.h>
+ #include <public/features.h>
++#include <xen/string.h>
+ #else
+ #include <xen/elfnote.h>
+ #include <xen/features.h>
+
+ #include <stdarg.h>
++#include <string.h>
+
+ struct elf_binary;
+ typedef void elf_log_callback(struct elf_binary*, void *caller_data,
+
diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.0-jserver.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2-jserver.patch
index 514fd0575b23..514fd0575b23 100644
--- a/app-emulation/xen-pvgrub/files/xen-4.2.0-jserver.patch
+++ b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2-jserver.patch