| 1 |
commit: 931fc09547869064f6b186fb50a30e1e67d9ea49 |
| 2 |
Author: Ian Delaney <della5 <AT> iinet <DOT> com <DOT> au> |
| 3 |
AuthorDate: Sat Nov 24 02:22:50 2012 +0000 |
| 4 |
Commit: Ian Delaney <della5 <AT> iinet <DOT> com <DOT> au> |
| 5 |
CommitDate: Sat Nov 24 02:22:50 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/virtualization.git;a=commit;h=931fc095 |
| 7 |
|
| 8 |
Added jserver.patch, fixes QA issue in build, tested |
| 9 |
|
| 10 |
Package-Manager: portage-2.1.11.30 |
| 11 |
|
| 12 |
--- |
| 13 |
.../xen-tools/files/ipxe-nopie-4.2.0.patch | 28 -------------------- |
| 14 |
.../xen-tools/files/xen-4.2.0-jserver.patch | 20 ++++++++++++++ |
| 15 |
.../xen-tools/files/xen-4.2.0-nostrip.patch | 17 ------------ |
| 16 |
app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild | 5 +++- |
| 17 |
4 files changed, 24 insertions(+), 46 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/xen-tools/files/ipxe-nopie-4.2.0.patch b/app-emulation/xen-tools/files/ipxe-nopie-4.2.0.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index f21b44d..0000000 |
| 22 |
--- a/app-emulation/xen-tools/files/ipxe-nopie-4.2.0.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,28 +0,0 @@ |
| 25 |
-2011-10-22 Ralf Glauberman <ralfglauberman@×××.de> |
| 26 |
- |
| 27 |
- #360805 Don't compile ipxe with pie on hardened. |
| 28 |
- * /tools/firmware/etherboot/patches/ipxe-nopie.patche New patch |
| 29 |
- * /tools/firmware/etherboot/patches/series Add ipxe-nopie.patch |
| 30 |
- |
| 31 |
---- a/tools/firmware/etherboot/patches/ipxe-nopie.patch 1970-01-01 01:00:00.000000000 +0100 |
| 32 |
-+++ b/tools/firmware/etherboot/patches/ipxe-nopie.patch 2011-03-27 17:45:13.929697782 +0200 |
| 33 |
-@@ -0,0 +1,11 @@ |
| 34 |
-+--- ipxe/src/Makefile~ 2011-03-27 17:41:52.000000000 +0200 |
| 35 |
-++++ ipxe/src/Makefile 2011-03-27 17:43:20.869446433 +0200 |
| 36 |
-+@@ -4,7 +4,7 @@ |
| 37 |
-+ # |
| 38 |
-+ |
| 39 |
-+ CLEANUP := |
| 40 |
-+-CFLAGS := |
| 41 |
-++CFLAGS := -nopie |
| 42 |
-+ ASFLAGS := |
| 43 |
-+ LDFLAGS := |
| 44 |
-+ MAKEDEPS := Makefile |
| 45 |
---- a/tools/firmware/etherboot/patches/series 2011-03-25 11:42:50.000000000 +0100 |
| 46 |
-+++ b/tools/firmware/etherboot/patches/series 2011-03-27 17:45:45.140446216 +0200 |
| 47 |
-@@ -1,4 +1,5 @@ |
| 48 |
- boot_prompt_option.patch |
| 49 |
- build_fix_1.patch |
| 50 |
- build_fix_2.patch |
| 51 |
- build_fix_3.patch |
| 52 |
-+ipxe-nopie.patch |
| 53 |
|
| 54 |
diff --git a/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch |
| 55 |
new file mode 100644 |
| 56 |
index 0000000..d42080c |
| 57 |
--- /dev/null |
| 58 |
+++ b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch |
| 59 |
@@ -0,0 +1,20 @@ |
| 60 |
+diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile |
| 61 |
+--- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800 |
| 62 |
++++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800 |
| 63 |
+@@ -14,13 +14,13 @@ |
| 64 |
+ .PHONY: blowfish.h |
| 65 |
+ blowfish.h: |
| 66 |
+ rm -f blowfish.bin |
| 67 |
+- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all |
| 68 |
++ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all |
| 69 |
+ (echo "static unsigned int blowfish32_code[] = {"; \ |
| 70 |
+ od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
| 71 |
+ echo "};") >$@ |
| 72 |
+ rm -f blowfish.bin |
| 73 |
+ ifeq ($(XEN_COMPILE_ARCH),x86_64) |
| 74 |
+- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all |
| 75 |
++ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all |
| 76 |
+ (echo "static unsigned int blowfish64_code[] = {"; \ |
| 77 |
+ od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ |
| 78 |
+ echo "};") >>$@ |
| 79 |
+ |
| 80 |
|
| 81 |
diff --git a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch |
| 82 |
index 1ef1555..de06279 100644 |
| 83 |
--- a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch |
| 84 |
+++ b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch |
| 85 |
@@ -35,20 +35,3 @@ diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/ |
| 86 |
endif |
| 87 |
ifdef CONFIG_TRACE_SYSTEMTAP |
| 88 |
ifdef CONFIG_TRACE_SYSTEMTAP |
| 89 |
-#diff -ur xen-4.2.0.orig/Makefile xen-4.2.0/Makefile |
| 90 |
-#--- Makefile 2012-09-17 18:21:17.000000000 +0800 |
| 91 |
-#+++ Makefile 2012-11-22 09:09:45.080624651 +0800 |
| 92 |
-#@@ -62,11 +62,11 @@ |
| 93 |
-# |
| 94 |
-# .PHONY: install-xen |
| 95 |
-# install-xen: |
| 96 |
-#- $(MAKE) -C xen install |
| 97 |
-#+ +$(MAKE) -C xen install |
| 98 |
-# |
| 99 |
-# .PHONY: install-tools |
| 100 |
-# install-tools: |
| 101 |
-#- $(MAKE) -C tools install |
| 102 |
-#+ +$(MAKE) -C tools install |
| 103 |
-# |
| 104 |
-# ifeq ($(CONFIG_IOEMU),y) |
| 105 |
-# install-tools: tools/qemu-xen-traditional-dir tools/qemu-xen-dir |
| 106 |
|
| 107 |
diff --git a/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild |
| 108 |
index 7ee1dc5..b426ab7 100644 |
| 109 |
--- a/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild |
| 110 |
+++ b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild |
| 111 |
@@ -191,11 +191,14 @@ src_prepare() { |
| 112 |
|
| 113 |
# Don't build ipxe with pie on hardened, Bug #360805 |
| 114 |
if gcc-specs-pie; then |
| 115 |
- epatch "${FILESDIR}/ipxe-nopie-4.2.0.patch" |
| 116 |
+ epatch "${FILESDIR}/ipxe-nopie.patch" |
| 117 |
fi |
| 118 |
|
| 119 |
# Prevent double stripping of files at install |
| 120 |
epatch "${FILESDIR}"/${P/-tools/}-nostrip.patch |
| 121 |
+ |
| 122 |
+ # fix jobserver in Makefile |
| 123 |
+ epatch "${FILESDIR}"/${P/-tools/}-jserver.patch |
| 124 |
} |
| 125 |
|
| 126 |
src_compile() { |
Archives