diff options
| author |   Ian Delaney <della5@iinet.com.au> | 2012-11-24 10:22:50 +0800 |
|---|---|---|
| committer | Ian Delaney <della5@iinet.com.au> | 2012-11-24 10:22:50 +0800 |
| commit | 931fc09547869064f6b186fb50a30e1e67d9ea49 (patch) | |
| tree | 823f89915b793f449f929b76a1d24a7b728fd064 | |
| parent | revbump, patch to counter downloads during build, patch to counter double str... (diff) | |
| download | virtualization-931fc09547869064f6b186fb50a30e1e67d9ea49.tar.gz virtualization-931fc09547869064f6b186fb50a30e1e67d9ea49.tar.bz2 virtualization-931fc09547869064f6b186fb50a30e1e67d9ea49.zip | |
Added jserver.patch, fixes QA issue in build, tested
Package-Manager: portage-2.1.11.30
4 files changed, 24 insertions, 46 deletions
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 deleted file mode 100644 index f21b44d..0000000 --- a/app-emulation/xen-tools/files/ipxe-nopie-4.2.0.patch +++ /dev/null @@ -1,28 +0,0 @@ -2011-10-22 Ralf Glauberman <ralfglauberman@gmx.de> - - #360805 Don't compile ipxe with pie on hardened. - * /tools/firmware/etherboot/patches/ipxe-nopie.patche New patch - * /tools/firmware/etherboot/patches/series Add ipxe-nopie.patch - ---- a/tools/firmware/etherboot/patches/ipxe-nopie.patch 1970-01-01 01:00:00.000000000 +0100 -+++ b/tools/firmware/etherboot/patches/ipxe-nopie.patch 2011-03-27 17:45:13.929697782 +0200 -@@ -0,0 +1,11 @@ -+--- ipxe/src/Makefile~ 2011-03-27 17:41:52.000000000 +0200 -++++ ipxe/src/Makefile 2011-03-27 17:43:20.869446433 +0200 -+@@ -4,7 +4,7 @@ -+ # -+ -+ CLEANUP := -+-CFLAGS := -++CFLAGS := -nopie -+ ASFLAGS := -+ LDFLAGS := -+ MAKEDEPS := Makefile ---- a/tools/firmware/etherboot/patches/series 2011-03-25 11:42:50.000000000 +0100 -+++ b/tools/firmware/etherboot/patches/series 2011-03-27 17:45:45.140446216 +0200 -@@ -1,4 +1,5 @@ - boot_prompt_option.patch - build_fix_1.patch - build_fix_2.patch - build_fix_3.patch -+ipxe-nopie.patch 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 new file mode 100644 index 0000000..d42080c --- /dev/null +++ b/app-emulation/xen-tools/files/xen-4.2.0-jserver.patch @@ -0,0 +1,20 @@ +diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile +--- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800 ++++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800 +@@ -14,13 +14,13 @@ + .PHONY: blowfish.h + blowfish.h: + rm -f blowfish.bin +- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all ++ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all + (echo "static unsigned int blowfish32_code[] = {"; \ + od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ + echo "};") >$@ + rm -f blowfish.bin + ifeq ($(XEN_COMPILE_ARCH),x86_64) +- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all ++ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all + (echo "static unsigned int blowfish64_code[] = {"; \ + od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\ + echo "};") >>$@ + 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 index 1ef1555..de06279 100644 --- a/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch +++ b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch @@ -35,20 +35,3 @@ diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/ endif ifdef CONFIG_TRACE_SYSTEMTAP ifdef CONFIG_TRACE_SYSTEMTAP -#diff -ur xen-4.2.0.orig/Makefile xen-4.2.0/Makefile -#--- Makefile 2012-09-17 18:21:17.000000000 +0800 -#+++ Makefile 2012-11-22 09:09:45.080624651 +0800 -#@@ -62,11 +62,11 @@ -# -# .PHONY: install-xen -# install-xen: -#- $(MAKE) -C xen install -#+ +$(MAKE) -C xen install -# -# .PHONY: install-tools -# install-tools: -#- $(MAKE) -C tools install -#+ +$(MAKE) -C tools install -# -# ifeq ($(CONFIG_IOEMU),y) -# install-tools: tools/qemu-xen-traditional-dir tools/qemu-xen-dir 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 index 7ee1dc5..b426ab7 100644 --- a/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.2.0-r1.ebuild @@ -191,11 +191,14 @@ src_prepare() { # Don't build ipxe with pie on hardened, Bug #360805 if gcc-specs-pie; then - epatch "${FILESDIR}/ipxe-nopie-4.2.0.patch" + epatch "${FILESDIR}/ipxe-nopie.patch" fi # Prevent double stripping of files at install epatch "${FILESDIR}"/${P/-tools/}-nostrip.patch + + # fix jobserver in Makefile + epatch "${FILESDIR}"/${P/-tools/}-jserver.patch } src_compile() { |