revbump, patch to counter downloads during build, patch to counter double stripping, nopie patch returned to conditional state, fixes to QA issues, one remaining

Package-Manager: portage-2.1.11.30

2 files changed, 82 insertions, 0 deletions

diff --git a/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch b/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch
new file mode 100644
index 0000000..95a1ce6
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-4.2.0-anti-download.patch
@@ -0,0 +1,28 @@
+diff -ur xen-4.2.0.orig/tools/firmware/etherboot/Makefile xen-4.2.0/tools/firmware/etherboot/Makefile
+--- tools/firmware/etherboot/Makefile	2012-09-17 18:21:18.000000000 +0800
++++ tools/firmware/etherboot/Makefile	2012-11-21 14:12:54.389536642 +0800
+@@ -28,13 +28,6 @@
+ 	$(MAKE) -C $D/src bin/$(*F).rom
+ 
+ $T:
+-	if ! wget -O _$T $(IPXE_TARBALL_URL); then \
+-		$(GIT) clone $(IPXE_GIT_URL) $D.git; \
+-		(cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
+-		$(IPXE_GIT_TAG) | gzip >../_$T); \
+-		rm -rf $D.git; \
+-	fi
+-	mv _$T $T
+ 
+ $D/src/arch/i386/Makefile: $T Config
+ 	rm -rf $D
+diff -ur xen-4.2.0.orig/tools/firmware/Makefile xen-4.2.0/tools/firmware/Makefile
+--- tools/firmware/Makefile	2012-09-17 18:21:18.000000000 +0800
++++ tools/firmware/Makefile	2012-11-21 16:14:21.974868539 +0800
+@@ -18,7 +18,6 @@
+ 	cp ovmf-makefile ovmf/Makefile;
+ 
+ seabios-dir:
+-	GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
+	cp seabios-config seabios-dir/.config;
+ 
+ .PHONY: all
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
new file mode 100644
index 0000000..1ef1555
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-4.2.0-nostrip.patch
@@ -0,0 +1,54 @@
+diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile
+--- tools/qemu-xen-traditional/Makefile	2012-09-07 00:05:30.000000000 +0800
++++ tools/qemu-xen-traditional/Makefile	2012-11-22 06:12:29.433599695 +0800
+@@ -243,7 +243,7 @@
+ install: all $(if $(BUILD_DOCS),install-doc)
+ 	mkdir -p "$(DESTDIR)$(bindir)"
+ ifneq ($(TOOLS),)
+-	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
++	$(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
+ endif
+ ifneq ($(BLOBS),)
+ 	mkdir -p "$(DESTDIR)$(datadir)"
+diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile.target xen-4.2.0/tools/qemu-xen-traditional/Makefile.target
+--- tools/qemu-xen-traditional/Makefile.target	2012-09-07 00:05:30.000000000 +0800
++++ tools/qemu-xen-traditional/Makefile.target	2012-11-22 06:26:45.302521231 +0800
+@@ -755,7 +755,7 @@
+ 
+ install: all install-hook
+ ifneq ($(PROGS),)
+-	$(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
++	$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
+ endif
+ 
+ # Include automatically generated dependency files
+diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target
+--- tools/qemu-xen/Makefile.target	2012-09-11 02:10:52.000000000 +0800
++++ tools/qemu-xen/Makefile.target	2012-11-22 07:13:38.894263291 +0800
+@@ -437,9 +437,6 @@
+ install: all
+ ifneq ($(PROGS),)
+ 	$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
+-ifneq ($(STRIP),)
+-	$(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
+-endif
+ 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