| 1 |
idella4 13/07/31 08:26:21 |
| 2 |
|
| 3 |
Added: xen-pvgrub-4.2-jserver.patch xen-pvgrub-4-qa.patch |
| 4 |
Removed: xen-4.2.0-jserver.patch |
| 5 |
Log: |
| 6 |
Re-name xen-4.2.0-jserver.patch -> xen-pvgrub-4.2-jserver.patch, added patch from upstream addressing QA issues |
| 7 |
|
| 8 |
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-emulation/xen-pvgrub/files/xen-pvgrub-4.2-jserver.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2-jserver.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2-jserver.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: xen-pvgrub-4.2-jserver.patch |
| 17 |
=================================================================== |
| 18 |
diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile |
| 19 |
--- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800 |
| 20 |
+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800 |
| 21 |
@@ -14,13 +14,13 @@ |
| 22 |
.PHONY: blowfish.h |
| 23 |
blowfish.h: |
| 24 |
rm -f blowfish.bin |
| 25 |
- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all |
| 26 |
+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all |
| 27 |
(echo "static unsigned int blowfish32_code[] = {"; \ |
| 28 |
od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
| 29 |
echo "};") >$@ |
| 30 |
rm -f blowfish.bin |
| 31 |
ifeq ($(XEN_COMPILE_ARCH),x86_64) |
| 32 |
- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all |
| 33 |
+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all |
| 34 |
(echo "static unsigned int blowfish64_code[] = {"; \ |
| 35 |
od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
| 36 |
echo "};") >>$@ |
| 37 |
|
| 38 |
diff -ur xen-4.2.0.orig/tools/firmware/vgabios/Makefile xen-4.2.0/tools/firmware/vgabios/Makefile |
| 39 |
--- tools/firmware/vgabios/Makefile 2013-02-04 13:56:50.973533544 +0800 |
| 40 |
+++ tools/firmware/vgabios/Makefile 2013-02-04 13:57:21.380535958 +0800 |
| 41 |
@@ -27,7 +27,7 @@ |
| 42 |
|
| 43 |
.PHONY: release |
| 44 |
release: |
| 45 |
- VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios |
| 46 |
+ VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" $(MAKE) bios cirrus-bios |
| 47 |
/bin/rm -f *.o *.s *.ld86 \ |
| 48 |
temp.awk.* vgabios.*.orig _vgabios_.*.c core *.bak .#* |
| 49 |
cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin |
| 50 |
|
| 51 |
|
| 52 |
|
| 53 |
1.1 app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch |
| 54 |
|
| 55 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch?rev=1.1&view=markup |
| 56 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch?rev=1.1&content-type=text/plain |
| 57 |
|
| 58 |
Index: xen-pvgrub-4-qa.patch |
| 59 |
=================================================================== |
| 60 |
This includes a few headers to fix some missing function declarations. |
| 61 |
|
| 62 |
Signed-off-by: Samuel Thibault <samuel.thibault@××××××××.org> |
| 63 |
|
| 64 |
diff --git a/stubdom/grub/config.h b/stubdom/grub/config.h |
| 65 |
index 1649d51..15a6583 100644 |
| 66 |
--- a/stubdom/grub/config.h |
| 67 |
+++ b/stubdom/grub/config.h |
| 68 |
@@ -2,6 +2,7 @@ |
| 69 |
#undef putchar |
| 70 |
#include <ctype.h> |
| 71 |
#include <string.h> |
| 72 |
+#include <kernel.h> |
| 73 |
#define debug _debug |
| 74 |
#define grub_halt(a) do_exit() |
| 75 |
#define printf grub_printf |
| 76 |
diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h |
| 77 |
index 2a6fa54..e65db6d 100644 |
| 78 |
--- a/xen/include/xen/libelf.h |
| 79 |
+++ b/xen/include/xen/libelf.h |
| 80 |
@@ -39,11 +39,13 @@ typedef int elf_negerrnoval; /* 0: ok; -EFOO: error */ |
| 81 |
#ifdef __XEN__ |
| 82 |
#include <public/elfnote.h> |
| 83 |
#include <public/features.h> |
| 84 |
+#include <xen/string.h> |
| 85 |
#else |
| 86 |
#include <xen/elfnote.h> |
| 87 |
#include <xen/features.h> |
| 88 |
|
| 89 |
#include <stdarg.h> |
| 90 |
+#include <string.h> |
| 91 |
|
| 92 |
struct elf_binary; |
| 93 |
typedef void elf_log_callback(struct elf_binary*, void *caller_data, |
Archives