public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-pvgrub/files/, app-emulation/xen-pvgrub/
@ 2016-07-28 16:50 Yixun Lan
  0 siblings, 0 replies; 4+ messages in thread
From: Yixun Lan @ 2016-07-28 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     b640b623d901afc89ac1e47c7dd5f8b94cebcd12
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 16:48:13 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 16:50:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b640b623

app-emulation/xen-pvgrub: drop old

Package-Manager: portage-2.3.0

 app-emulation/xen-pvgrub/Manifest                  |   2 -
 .../xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch | 245 ---------------------
 .../xen-pvgrub/files/xen-4.2.1-externals.patch     |  83 -------
 .../files/xen-4.3-fix_dotconfig-gcc.patch          | 220 ------------------
 .../files/xen-4.4-fix_dotconfig-gcc.patch          | 171 --------------
 .../xen-pvgrub/files/xen-pvgrub-4-qa.patch         |  35 ---
 .../xen-pvgrub/files/xen-pvgrub-4.2.3-qa.patch     |  34 ---
 .../xen-pvgrub/files/xen-pvgrub-4.3.1-qa.patch     |  30 ---
 app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild   | 144 ------------
 app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild   | 144 ------------
 10 files changed, 1108 deletions(-)

diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 9d16eff..5939f84 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -3,8 +3,6 @@ DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe182
 DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db
 DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e
 DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
-DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
-DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5
 DIST xen-4.6.3.tar.gz 19707041 SHA256 02badfce9a037bd1bd4a94210c1f6b85467746216c71795805102b514bcf1fc4 SHA512 187a860b40c05139f22b8498a5fae1db173c3110d957147af29a56cb83b7111c9dc4946d65f9dffc847001fc01c5e9bf51886eaa1194bb9cfd0b6dbcd43a2c5c WHIRLPOOL f80fa73727218567b8d6c8d6bab9dfd577c4bb84ac737b084e4396128e8c4aa79776a277f73c283d5b12f17764b183b67fbf8596e240042dd0709f28cbab777e
 DIST xen-4.7.0.tar.gz 20702550 SHA256 be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623 SHA512 2c52c8ef145dfab7d069e79318d5d631e1106a0ddc79d88b3bacf36c7f15cea67dccb704a245e785d2a1e42c6fb6c0ad74832f564aaeec025ad7b864031f0921 WHIRLPOOL 9725ac9fe94e78aab47b0534b5ee1a190106a773bf7d6204fed736abe7069b71937717b6680833736bd02a3a3a43f2eb2162fe7c0d992ddd47d12158b5d9835f
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276

diff --git a/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch b/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch
deleted file mode 100644
index 4e08a30..0000000
--- a/app-emulation/xen-pvgrub/files/xen-4-fix_dotconfig-gcc.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-# Fix gcc-4.6
-diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
---- extras/mini-os/minios.mk	2012-09-17 18:21:17.000000000 +0800
-+++ extras/mini-os/minios.mk	2012-12-05 14:01:10.653260260 +0800
-@@ -6,7 +6,7 @@
- 
- # Define some default flags.
- # NB. '-Wcast-qual' is nasty, so I omitted it.
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
-diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
---- tools/libxc/Makefile       2012-09-17 18:21:18.000000000 +0800
-+++ tools/libxc/Makefile       2012-12-05 14:01:10.653260260 +0800
-@@ -73,7 +73,7 @@
-
- -include $(XEN_TARGET_ARCH)/Makefile
-
--CFLAGS   += -Werror -Wmissing-prototypes
-+CFLAGS   += -Wmissing-prototypes
- CFLAGS   += -I. $(CFLAGS_xeninclude)
-
- # Needed for posix_fadvise64() in xc_linux.c
-# Drop .config
-diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
---- Config.mk	2012-09-17 18:23:12.000000000 +0800
-+++ Config.mk	2012-12-05 14:01:10.641260261 +0800
-@@ -7,7 +7,6 @@ Drop .config
- # fallback for older make
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
- 
---include $(XEN_ROOT)/.config
- 
- # A debug build of Xen and tools?
- debug ?= n
-@@ -24,7 +24,7 @@
- 
- # Tools to run on system hosting the build
- HOSTCC      = gcc
--HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS  = -Wstrict-prototypes -O2 -fomit-frame-pointer
- HOSTCFLAGS += -fno-strict-aliasing
- 
- DISTDIR     ?= $(XEN_ROOT)/dist
-@@ -156,7 +156,7 @@
- 
- CFLAGS += -std=gnu99
- 
--CFLAGS += -Wall -Wstrict-prototypes
-+CFLAGS += -Wstrict-prototypes
- 
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
- # and is over-zealous with the printf format lint
-diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile
---- tools/blktap2/drivers/Makefile	2012-12-17 23:00:11.000000000 +0800
-+++ tools/blktap2/drivers/Makefile	2013-01-30 12:31:43.539941099 +0800
-@@ -9,7 +9,7 @@
- LOCK_UTIL  = lock-util
- INST_DIR   = $(SBINDIR)
- 
--CFLAGS    += -Werror -g
-+CFLAGS    += -g
- CFLAGS    += -Wno-unused
- CFLAGS    += -fno-strict-aliasing
- CFLAGS    += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers
-diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk
---- tools/debugger/gdbsx/Rules.mk	2012-12-17 23:00:22.000000000 +0800
-+++ tools/debugger/gdbsx/Rules.mk	2013-01-30 12:31:43.516941098 +0800
-@@ -1,4 +1,4 @@
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS   += -Werror -Wmissing-prototypes 
-+CFLAGS   += -Wmissing-prototypes 
- # (gcc 4.3x and later)   -Wconversion -Wno-sign-conversion
-diff -ur xen-4.2.1.orig/tools/debugger/xenitp/Makefile xen-4.2.1/tools/debugger/xenitp/Makefile
---- tools/debugger/xenitp/Makefile	2012-12-17 23:00:22.000000000 +0800
-+++ tools/debugger/xenitp/Makefile	2013-01-30 12:31:43.516941098 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--#CFLAGS  += -Werror -g -O0
-+#CFLAGS  += -g -O0
- 
- CFLAGS  += $(CFLAGS_libxenctrl)
- 
-diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile
---- tools/libaio/harness/Makefile	2012-12-17 23:00:35.000000000 +0800
-+++ tools/libaio/harness/Makefile	2013-01-30 12:31:43.541941099 +0800
-@@ -4,7 +4,7 @@
- HARNESS_SRCS:=main.c
- # io_queue.c
- 
--CFLAGS=-Wall -Werror -g -O -laio
-+CFLAGS=-Wall -g -O -laio
- #-lpthread -lrt
- 
- all: $(PROGS)
-diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk
---- tools/libfsimage/Rules.mk	2012-12-17 23:00:36.000000000 +0800
-+++ tools/libfsimage/Rules.mk	2013-01-30 12:31:43.515941097 +0800
-@@ -1,7 +1,7 @@
- include $(XEN_ROOT)/tools/Rules.mk
- 
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
--CFLAGS += -Werror -D_GNU_SOURCE
-+CFLAGS += -D_GNU_SOURCE
- LDFLAGS += -L../common/
- 
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
-diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile
---- tools/libxl/Makefile	2012-12-17 23:01:08.000000000 +0800
-+++ tools/libxl/Makefile	2013-01-30 12:31:43.541941099 +0800
-@@ -11,7 +11,7 @@
- XLUMAJOR = 1.0
- XLUMINOR = 1
- 
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
- 	-Wno-declaration-after-statement -Wformat-nonliteral
- CFLAGS += -I. -fPIC
- 
-diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile
---- tools/qemu-xen/pc-bios/optionrom/Makefile	2012-09-11 02:10:52.000000000 +0800
-+++ tools/qemu-xen/pc-bios/optionrom/Makefile	2013-01-30 12:31:43.528941098 +0800
-@@ -9,7 +9,7 @@
- 
- .PHONY : all clean build-all
- 
--CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
-+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin
- CFLAGS += -I$(SRC_PATH)
- CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
- QEMU_CFLAGS = $(CFLAGS)
-diff -ur xen-4.2.1.orig/tools/vtpm/Rules.mk xen-4.2.1/tools/vtpm/Rules.mk
---- tools/vtpm/Rules.mk	2012-12-17 23:01:35.000000000 +0800
-+++ tools/vtpm/Rules.mk	2013-01-30 12:31:43.515941097 +0800
-@@ -6,7 +6,7 @@
- #
- 
- # General compiler flags
--CFLAGS   = -Werror -g3
-+CFLAGS   = -g3
- 
- # Generic project files
- HDRS	= $(wildcard *.h)
-diff -ur xen-4.2.1.orig/tools/vtpm_manager/Rules.mk xen-4.2.1/tools/vtpm_manager/Rules.mk
---- tools/vtpm_manager/Rules.mk	2012-12-17 23:01:35.000000000 +0800
-+++ tools/vtpm_manager/Rules.mk	2013-01-30 12:31:43.511941097 +0800
-@@ -6,7 +6,7 @@
- #
- 
- # General compiler flags
--CFLAGS	= -Werror -g3
-+CFLAGS	= -g3
- 
- # Generic project files
- HDRS	= $(wildcard *.h)
-diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile
---- tools/xenstat/xentop/Makefile	2012-12-17 23:01:35.000000000 +0800
-+++ tools/xenstat/xentop/Makefile	2013-01-30 12:31:43.535941098 +0800
-@@ -18,7 +18,7 @@
- all install xentop:
- else
- 
--CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
-+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat)
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
- CFLAGS += -DHOST_$(XEN_OS)
- 
-diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk
---- xen/arch/arm/Rules.mk	2012-12-17 23:01:37.000000000 +0800
-+++ xen/arch/arm/Rules.mk	2013-01-30 12:31:43.498941097 +0800
-@@ -9,7 +9,7 @@
- HAS_DEVICE_TREE := y
- 
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
- CFLAGS += -I$(BASEDIR)/include
- 
- # Prevent floating-point variables from creeping into Xen.
-diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk
---- xen/arch/x86/Rules.mk	2012-12-17 23:01:37.000000000 +0800
-+++ xen/arch/x86/Rules.mk	2013-01-30 12:31:43.490941096 +0800
-@@ -24,7 +24,7 @@
- endif
- 
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
- CFLAGS += -I$(BASEDIR)/include 
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
-diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile
---- xen/include/Makefile	2012-12-17 23:01:55.000000000 +0800
-+++ xen/include/Makefile	2013-01-30 12:31:43.502941097 +0800
-@@ -78,7 +78,7 @@
- all: headers.chk
- 
- headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile
--	for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
-+	for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
- 	mv $@.new $@
- 
- endif
-diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile
---- tools/tests/mce-test/tools/Makefile  2012-12-17 23:01:35.000000000 +0800
-+++ tools/tests/mce-test/tools/Makefile       2013-01-30 13:01:44.890020152 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenguest)
- CFLAGS += $(CFLAGS_libxenstore)
-diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile
---- tools/tests/mem-sharing/Makefile     2012-12-17 23:01:35.000000000 +0800
-+++ tools/tests/mem-sharing/Makefile  2013-01-30 13:01:44.890020152 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS += -Werror
-+CFLAGS +=
- 
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_xeninclude)
-diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile
---- tools/tests/xen-access/Makefile      2012-12-17 23:01:35.000000000 +0800
-+++ tools/tests/xen-access/Makefile   2013-01-30 13:01:44.891020152 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS += -Werror
-+CFLAGS +=
- 
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenguest)
-

diff --git a/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch
deleted file mode 100644
index f2525ae..0000000
--- a/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-# Patch Makefile to patch insource newlib, 
-# Prevent internal downloading of external packages
-diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile
---- stubdom/Makefile	2012-09-17 18:21:17.000000000 +0800
-+++ stubdom/Makefile	2012-12-05 14:01:10.694260256 +0800
-@@ -95,12 +95,13 @@
- ##############
- 
- newlib-$(NEWLIB_VERSION).tar.gz:
--	$(WGET) $(NEWLIB_URL)/$@
-+#	$(WGET) $(NEWLIB_URL)/$@
- 
- newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
- 	tar xzf $<
- 	patch -d $@ -p0 < newlib.patch
- 	patch -d $@ -p0 < newlib-chk.patch
-+	patch -d $@ -p0 < newlib-implicits.patch
- 	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
- 	find $@ -type f | xargs perl -i.bak \
- 		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
-@@ -110,7 +110,7 @@
- $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
- 	mkdir -p newlib-$(XEN_TARGET_ARCH)
- 	( cd newlib-$(XEN_TARGET_ARCH) && \
--	  CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
-+	  CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
- 	  $(MAKE) DESTDIR= && \
- 	  $(MAKE) DESTDIR= install )
- 
-@@ -121,7 +122,7 @@
- ############
- 
- zlib-$(ZLIB_VERSION).tar.gz:
--	$(WGET) $(ZLIB_URL)/$@
-+#	$(WGET) $(ZLIB_URL)/$@
- 
- zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz 
- 	tar xzf $<
-@@ -130,7 +130,7 @@
- cross-zlib: $(ZLIB_STAMPFILE)
- $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
- 	( cd $< && \
--	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
-+	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
- 	  $(MAKE) DESTDIR= libz.a && \
- 	  $(MAKE) DESTDIR= install )
- 
-@@ -141,7 +142,7 @@
- ##############
- 
- pciutils-$(LIBPCI_VERSION).tar.bz2:
--	$(WGET) $(LIBPCI_URL)/$@
-+#	$(WGET) $(LIBPCI_URL)/$@
- 
- pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
- 	tar xjf $<
-@@ -169,7 +170,7 @@
- ######
- 
- lwip-$(LWIP_VERSION).tar.gz:
--	$(WGET) $(LWIP_URL)/$@
-+#	$(WGET) $(LWIP_URL)/$@
- 
- lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
- 	tar xzf $<
-@@ -325,7 +326,7 @@
- ######
- 
- grub-$(GRUB_VERSION).tar.gz:
--	$(WGET) $(GRUB_URL)/$@
-+#$(WGET) $(GRUB_URL)/$@
- 
- grub-upstream: grub-$(GRUB_VERSION).tar.gz
- 	tar xzf $<
-@@ -392,7 +393,7 @@
- 	$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
- 	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz"
- 
--install-grub: pv-grub
-+install-grub:
- 	$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
- 	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz"
- 

diff --git a/app-emulation/xen-pvgrub/files/xen-4.3-fix_dotconfig-gcc.patch b/app-emulation/xen-pvgrub/files/xen-4.3-fix_dotconfig-gcc.patch
deleted file mode 100644
index 588be74..0000000
--- a/app-emulation/xen-pvgrub/files/xen-4.3-fix_dotconfig-gcc.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-# Fix gcc-4.6
-diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
---- extras/mini-os/minios.mk	2012-09-17 18:21:17.000000000 +0800
-+++ extras/mini-os/minios.mk	2012-12-05 14:01:10.653260260 +0800
-@@ -6,7 +6,7 @@
- 
- # Define some default flags.
- # NB. '-Wcast-qual' is nasty, so I omitted it.
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
-diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
---- tools/libxc/Makefile       2012-09-17 18:21:18.000000000 +0800
-+++ tools/libxc/Makefile       2012-12-05 14:01:10.653260260 +0800
-@@ -85,7 +85,7 @@
-
- -include $(XEN_TARGET_ARCH)/Makefile
-
--CFLAGS   += -Werror -Wmissing-prototypes
-+CFLAGS   += -Wmissing-prototypes
- CFLAGS   += -I. $(CFLAGS_xeninclude)
-
- # Needed for posix_fadvise64() in xc_linux.c
-# Drop .config
-diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
---- Config.mk	2012-09-17 18:23:12.000000000 +0800
-+++ Config.mk	2012-12-05 14:01:10.641260261 +0800
-@@ -7,7 +7,6 @@ Drop .config
- # fallback for older make
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
- 
---include $(XEN_ROOT)/.config
- 
- # A debug build of Xen and tools?
- debug ?= n
-@@ -24,7 +24,7 @@
- 
- # Tools to run on system hosting the build
- HOSTCC      = gcc
--HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS  = -Wstrict-prototypes -O2 -fomit-frame-pointer
- HOSTCFLAGS += -fno-strict-aliasing
- 
- DISTDIR     ?= $(XEN_ROOT)/dist
-@@ -156,7 +156,7 @@
- 
- CFLAGS += -std=gnu99
- 
--CFLAGS += -Wall -Wstrict-prototypes
-+CFLAGS += -Wstrict-prototypes
- 
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
- # and is over-zealous with the printf format lint
-diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile
---- tools/blktap2/drivers/Makefile	2012-12-17 23:00:11.000000000 +0800
-+++ tools/blktap2/drivers/Makefile	2013-01-30 12:31:43.539941099 +0800
-@@ -9,7 +9,7 @@
- LOCK_UTIL  = lock-util
- INST_DIR   = $(SBINDIR)
- 
--CFLAGS    += -Werror -g
-+CFLAGS    += -g
- CFLAGS    += -Wno-unused
- CFLAGS    += -fno-strict-aliasing
- CFLAGS    += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers
-diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk
---- tools/debugger/gdbsx/Rules.mk	2012-12-17 23:00:22.000000000 +0800
-+++ tools/debugger/gdbsx/Rules.mk	2013-01-30 12:31:43.516941098 +0800
-@@ -1,4 +1,4 @@
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS   += -Werror -Wmissing-prototypes 
-+CFLAGS   += -Wmissing-prototypes 
- # (gcc 4.3x and later)   -Wconversion -Wno-sign-conversion
-diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile
---- tools/libaio/harness/Makefile	2012-12-17 23:00:35.000000000 +0800
-+++ tools/libaio/harness/Makefile	2013-01-30 12:31:43.541941099 +0800
-@@ -4,7 +4,7 @@
- HARNESS_SRCS:=main.c
- # io_queue.c
- 
--CFLAGS=-Wall -Werror -g -O -laio
-+CFLAGS=-Wall -g -O -laio
- #-lpthread -lrt
- 
- all: $(PROGS)
-diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk
---- tools/libfsimage/Rules.mk	2012-12-17 23:00:36.000000000 +0800
-+++ tools/libfsimage/Rules.mk	2013-01-30 12:31:43.515941097 +0800
-@@ -1,7 +1,7 @@
- include $(XEN_ROOT)/tools/Rules.mk
- 
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
--CFLAGS += -Werror -D_GNU_SOURCE
-+CFLAGS += -D_GNU_SOURCE
- LDFLAGS += -L../common/
- 
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
-diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile
---- tools/libxl/Makefile	2012-12-17 23:01:08.000000000 +0800
-+++ tools/libxl/Makefile	2013-01-30 12:31:43.541941099 +0800
-@@ -11,7 +11,7 @@
- XLUMAJOR = 1.0
- XLUMINOR = 1
- 
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
- 	-Wno-declaration-after-statement -Wformat-nonliteral
- CFLAGS += -I. -fPIC
- 
-diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile
---- tools/qemu-xen/pc-bios/optionrom/Makefile	2012-09-11 02:10:52.000000000 +0800
-+++ tools/qemu-xen/pc-bios/optionrom/Makefile	2013-01-30 12:31:43.528941098 +0800
-@@ -9,7 +9,7 @@
- 
- .PHONY : all clean build-all
- 
--CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
-+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin
- CFLAGS += -I$(SRC_PATH)
- CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
- QEMU_CFLAGS = $(CFLAGS)
-diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile
---- tools/xenstat/xentop/Makefile	2012-12-17 23:01:35.000000000 +0800
-+++ tools/xenstat/xentop/Makefile	2013-01-30 12:31:43.535941098 +0800
-@@ -18,7 +18,7 @@
- all install xentop:
- else
- 
--CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
-+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat)
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
- CFLAGS += -DHOST_$(XEN_OS)
- 
-diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk
---- xen/arch/arm/Rules.mk	2012-12-17 23:01:37.000000000 +0800
-+++ xen/arch/arm/Rules.mk	2013-01-30 12:31:43.498941097 +0800
-@@ -9,7 +9,7 @@
- HAS_DEVICE_TREE := y
- 
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
- CFLAGS += -I$(BASEDIR)/include
- 
- # Prevent floating-point variables from creeping into Xen.
-diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk
---- xen/arch/x86/Rules.mk	2012-12-17 23:01:37.000000000 +0800
-+++ xen/arch/x86/Rules.mk	2013-01-30 12:31:43.490941096 +0800
-@@ -24,7 +24,7 @@
- endif
- 
- CFLAGS += -fno-builtin -fno-common -Wredundant-decls
--CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
-+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
- CFLAGS += -I$(BASEDIR)/include 
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
- CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
-diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile
---- xen/include/Makefile	2012-12-17 23:01:55.000000000 +0800
-+++ xen/include/Makefile	2013-01-30 12:31:43.502941097 +0800
-@@ -78,7 +78,7 @@
- all: headers.chk
- 
- headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile
--	for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
-+	for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
- 	mv $@.new $@
- 
- endif
-diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile
---- tools/tests/mce-test/tools/Makefile  2012-12-17 23:01:35.000000000 +0800
-+++ tools/tests/mce-test/tools/Makefile       2013-01-30 13:01:44.890020152 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenguest)
- CFLAGS += $(CFLAGS_libxenstore)
-diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile
---- tools/tests/mem-sharing/Makefile     2012-12-17 23:01:35.000000000 +0800
-+++ tools/tests/mem-sharing/Makefile  2013-01-30 13:01:44.890020152 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS += -Werror
-+CFLAGS +=
- 
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_xeninclude)
-diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile
---- tools/tests/xen-access/Makefile      2012-12-17 23:01:35.000000000 +0800
-+++ tools/tests/xen-access/Makefile   2013-01-30 13:01:44.891020152 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS += -Werror
-+CFLAGS +=
- 
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenguest)
-diff -ur xen-4.3.0.orig/tools/firmware/Rules.mk xen-4.3.0/tools/firmware/Rules.mk
---- tools/firmware/Rules.mk	2013-07-09 18:46:56.000000000 +0800
-+++ ttools/firmware/Rules.mk	2013-07-20 20:28:57.811836505 +0800
-@@ -11,8 +11,6 @@
- CFLAGS += -DNDEBUG
- endif
- 
--CFLAGS += -Werror
--
- $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
- 
- # Extra CFLAGS suitable for an embedded type of environment.

diff --git a/app-emulation/xen-pvgrub/files/xen-4.4-fix_dotconfig-gcc.patch b/app-emulation/xen-pvgrub/files/xen-4.4-fix_dotconfig-gcc.patch
deleted file mode 100644
index 5bba0fd..0000000
--- a/app-emulation/xen-pvgrub/files/xen-4.4-fix_dotconfig-gcc.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-diff -ur xen-4.4.0.orig/Config.mk xen-4.4.0/Config.mk
---- xen-4.4.0.orig/Config.mk	2014-03-10 18:47:38.000000000 +0800
-+++ xen-4.4.0/Config.mk	2014-03-23 21:54:07.327717400 +0800
-@@ -13,8 +13,6 @@
- # fallback for older make
- realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
- 
---include $(XEN_ROOT)/.config
--
- # A debug build of Xen and tools?
- debug ?= n
- debug_symbols ?= $(debug)
-@@ -36,7 +34,7 @@
- 
- # Tools to run on system hosting the build
- HOSTCC      = gcc
--HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS  = -Wstrict-prototypes -O2 -fomit-frame-pointer
- HOSTCFLAGS += -fno-strict-aliasing
- 
- DISTDIR     ?= $(XEN_ROOT)/dist
-@@ -187,7 +185,7 @@
- 
- CFLAGS += -std=gnu99
- 
--CFLAGS += -Wall -Wstrict-prototypes
-+CFLAGS += -Wstrict-prototypes
- 
- # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
- # and is over-zealous with the printf format lint
-diff -ur xen-4.4.0.orig/extras/mini-os/minios.mk xen-4.4.0/extras/mini-os/minios.mk
---- xen-4.4.0.orig/extras/mini-os/minios.mk	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/extras/mini-os/minios.mk	2014-03-23 21:48:41.110722054 +0800
-@@ -6,7 +6,7 @@
- 
- # Define some default flags.
- # NB. '-Wcast-qual' is nasty, so I omitted it.
--DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
-+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
- DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
- DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
- DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
-diff -ur xen-4.4.0.orig/tools/blktap2/drivers/Makefile xen-4.4.0/tools/blktap2/drivers/Makefile
---- xen-4.4.0.orig/tools/blktap2/drivers/Makefile	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/tools/blktap2/drivers/Makefile	2014-03-23 21:55:52.215715903 +0800
-@@ -9,7 +9,7 @@
- LOCK_UTIL  = lock-util
- INST_DIR   = $(SBINDIR)
- 
--CFLAGS    += -Werror -g
-+CFLAGS    += -g
- CFLAGS    += -Wno-unused
- CFLAGS    += -fno-strict-aliasing
- CFLAGS    += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers
-diff -ur xen-4.4.0.orig/tools/debugger/gdbsx/Rules.mk xen-4.4.0/tools/debugger/gdbsx/Rules.mk
---- xen-4.4.0.orig/tools/debugger/gdbsx/Rules.mk	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/tools/debugger/gdbsx/Rules.mk	2014-03-23 21:56:21.399715487 +0800
-@@ -1,4 +1,4 @@
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS   += -Werror -Wmissing-prototypes 
-+CFLAGS   += -Wmissing-prototypes 
- # (gcc 4.3x and later)   -Wconversion -Wno-sign-conversion
-diff -ur xen-4.4.0.orig/tools/firmware/Rules.mk xen-4.4.0/tools/firmware/Rules.mk
---- xen-4.4.0.orig/tools/firmware/Rules.mk	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/tools/firmware/Rules.mk	2014-03-23 22:30:36.056686174 +0800
-@@ -11,7 +11,7 @@
- CFLAGS += -DNDEBUG
- endif
- 
--CFLAGS += -Werror
-+CFLAGS +=
- 
- $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
- 
-diff -ur xen-4.4.0.orig/tools/libfsimage/Rules.mk xen-4.4.0/tools/libfsimage/Rules.mk
---- xen-4.4.0.orig/tools/libfsimage/Rules.mk	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/tools/libfsimage/Rules.mk	2014-03-23 21:57:21.767714626 +0800
-@@ -1,7 +1,7 @@
- include $(XEN_ROOT)/tools/Rules.mk
- 
- CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
--CFLAGS += -Werror -D_GNU_SOURCE
-+CFLAGS += -D_GNU_SOURCE
- LDFLAGS += -L../common/
- 
- PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
-diff -ur xen-4.4.0.orig/tools/libxc/Makefile xen-4.4.0/tools/libxc/Makefile
---- xen-4.4.0.orig/tools/libxc/Makefile	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/tools/libxc/Makefile	2014-03-23 21:49:37.919721243 +0800
-@@ -87,7 +87,7 @@
- 
- -include $(XEN_TARGET_ARCH)/Makefile
- 
--CFLAGS   += -Werror -Wmissing-prototypes
-+CFLAGS   += -Wmissing-prototypes
- CFLAGS   += -I. $(CFLAGS_xeninclude)
- 
- # Needed for posix_fadvise64() in xc_linux.c
-diff -ur xen-4.4.0.orig/tools/libxl/Makefile xen-4.4.0/tools/libxl/Makefile
---- xen-4.4.0.orig/tools/libxl/Makefile	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/tools/libxl/Makefile	2014-03-23 21:58:09.983713938 +0800
-@@ -11,7 +11,7 @@
- XLUMAJOR = 4.3
- XLUMINOR = 0
- 
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
- 	-Wno-declaration-after-statement -Wformat-nonliteral
- CFLAGS += -I. -fPIC
- 
-diff -ur xen-4.4.0.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.4.0/tools/qemu-xen/pc-bios/optionrom/Makefile
---- xen-4.4.0.orig/tools/qemu-xen/pc-bios/optionrom/Makefile	2014-02-06 00:59:14.000000000 +0800
-+++ xen-4.4.0/tools/qemu-xen/pc-bios/optionrom/Makefile	2014-03-23 21:59:13.175713036 +0800
-@@ -9,7 +9,7 @@
- 
- .PHONY : all clean build-all
- 
--CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
-+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin
- CFLAGS += -I$(SRC_PATH)
- CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
- QEMU_CFLAGS = $(CFLAGS)
-diff -ur xen-4.4.0.orig/tools/tests/mce-test/tools/Makefile xen-4.4.0/tools/tests/mce-test/tools/Makefile
---- xen-4.4.0.orig/tools/tests/mce-test/tools/Makefile	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/tools/tests/mce-test/tools/Makefile	2014-03-23 22:28:45.160687756 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS += -Werror
-+CFLAGS +=
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenguest)
- CFLAGS += $(CFLAGS_libxenstore) 
-diff -ur xen-4.4.0.orig/tools/tests/mem-sharing/Makefile xen-4.4.0/tools/tests/mem-sharing/Makefile
---- xen-4.4.0.orig/tools/tests/mem-sharing/Makefile	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/tools/tests/mem-sharing/Makefile	2014-03-23 22:29:15.472687324 +0800
-@@ -1,7 +1,7 @@
- XEN_ROOT=$(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS += -Werror
-+CFLAGS +=
- 
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_xeninclude)
-diff -ur xen-4.4.0.orig/tools/tests/xen-access/Makefile xen-4.4.0/tools/tests/xen-access/Makefile
---- xen-4.4.0.orig/tools/tests/xen-access/Makefile	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/tools/tests/xen-access/Makefile	2014-03-23 22:30:02.064686659 +0800
-@@ -1,8 +1,6 @@
- XEN_ROOT=$(CURDIR)/../../..
- include $(XEN_ROOT)/tools/Rules.mk
- 
--CFLAGS += -Werror
--
- CFLAGS += $(CFLAGS_libxenctrl)
- CFLAGS += $(CFLAGS_libxenguest)
- CFLAGS += $(CFLAGS_xeninclude)
-diff -ur xen-4.4.0.orig/tools/xenstat/xentop/Makefile xen-4.4.0/tools/xenstat/xentop/Makefile
---- xen-4.4.0.orig/tools/xenstat/xentop/Makefile	2014-03-10 18:43:57.000000000 +0800
-+++ xen-4.4.0/tools/xenstat/xentop/Makefile	2014-03-23 22:23:59.944691825 +0800
-@@ -18,7 +18,7 @@
- all install xentop:
- else
- 
--CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
-+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat)
- LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
- CFLAGS += -DHOST_$(XEN_OS)
- 

diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch
deleted file mode 100644
index 33d56db..0000000
--- a/app-emulation/xen-pvgrub/files/xen-pvgrub-4-qa.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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-pvgrub-4.2.3-qa.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2.3-qa.patch
deleted file mode 100644
index ea69366..0000000
--- a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2.3-qa.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 -ur xen-4.2.3.orig/xen/include/xen/libelf.h xen-4.2.3/xen/include/xen/libelf.h
---- xen-4.2.3.orig/xen/include/xen/libelf.h	2013-09-09 20:27:41.000000000 +0800
-+++ xen-4.2.3/xen/include/xen/libelf.h	2014-02-15 13:42:24.491435783 +0800
-@@ -37,12 +37,14 @@
- #ifdef __XEN__
- #include <public/elfnote.h>
- #include <public/features.h>
-+#include <xen/string.h>
- #include <xen/stdbool.h>
- #else
- #include <xen/elfnote.h>
- #include <xen/features.h>
- 
- #include <stdarg.h>
-+#include <string.h>
- #include <stdbool.h>
- 
- struct elf_binary;

diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.3.1-qa.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.3.1-qa.patch
deleted file mode 100644
index f5cb3d2..0000000
--- a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.3.1-qa.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur xen-4.3.1.orig/stubdom/grub/config.h xen-4.3.1/stubdom/grub/config.h
---- stubdom/grub/config.h	2013-10-30 16:18:28.000000000 +0800
-+++ stubdom/grub/config.h	2013-12-09 17:12:14.209783970 +0800
-@@ -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 -ur xen-4.3.1.orig/xen/include/xen/libelf.h xen-4.3.1/xen/include/xen/libelf.h
---- xen/include/xen/libelf.h	2013-10-30 16:18:28.000000000 +0800
-+++ xen/include/xen/libelf.h	2013-12-09 17:14:09.249788085 +0800
-@@ -37,6 +37,7 @@
- #ifdef __XEN__
- #include <public/elfnote.h>
- #include <public/features.h>
-+#include <xen/string.h>
- #include <xen/stdbool.h>
- #else
- #include <xen/elfnote.h>
-@@ -44,6 +45,7 @@
- 
- #include <stdarg.h>
- #include <stdbool.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/xen-pvgrub-4.6.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild
deleted file mode 100644
index eb54859..0000000
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
-
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=mirror://gnu-alpha/grub
-SRC_URI="
-		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
-		$GRUB_URL/grub-0.97.tar.gz
-		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
-		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
-		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
-		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
-		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
-
-S="${WORKDIR}/xen-${PV}"
-
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="custom-cflags"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
-	sys-devel/bin86
-	sys-apps/texinfo
-	x11-libs/pixman"
-
-RDEPEND=">=app-emulation/xen-tools-${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-retar-externals() {
-	# Purely to unclutter src_prepare
-	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
-
-	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
-	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-		-i "${WORKDIR}"/zlib-1.2.3/configure
-	sed -e 's:^AR=ar rc:AR=ar:' \
-		-e s':$(AR) $@:$(AR) rc $@:' \
-		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
-	einfo "zlib Makefile edited"
-
-	cd "${WORKDIR}"
-	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
-	tar czp grub-0.97 -f grub-0.97.tar.gz
-	tar czp lwip -f lwip-1.3.0.tar.gz
-	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
-	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
-	mv $set "${S}"/stubdom/
-	einfo "tarballs moved to source"
-}
-
-src_prepare() {
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \;
-	fi
-
-	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
-	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
-
-	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
-	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
-
-	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
-
-	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
-	retar-externals || die "re-tar procedure failed"
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
-
-	if use x86; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-	elif use amd64; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
-		if has_multilib_profile; then
-			multilib_toolchain_setup x86
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-		fi
-	fi
-}
-
-src_install() {
-	if use x86; then
-		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-	fi
-	if use amd64; then
-		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
-		if has_multilib_profile; then
-			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-}

diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild
deleted file mode 100644
index bf577ad..0000000
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.6.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml,threads'
-
-inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
-
-XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
-LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
-GRUB_URL=mirror://gnu-alpha/grub
-SRC_URI="
-		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
-		$GRUB_URL/grub-0.97.tar.gz
-		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
-		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
-		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
-		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
-		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
-
-S="${WORKDIR}/xen-${PV}"
-
-DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
-HOMEPAGE="http://xen.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="custom-cflags"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="sys-devel/gettext
-	sys-devel/bin86
-	sys-apps/texinfo
-	x11-libs/pixman"
-
-RDEPEND=">=app-emulation/xen-tools-${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-retar-externals() {
-	# Purely to unclutter src_prepare
-	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
-
-	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
-	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-		-i "${WORKDIR}"/zlib-1.2.3/configure
-	sed -e 's:^AR=ar rc:AR=ar:' \
-		-e s':$(AR) $@:$(AR) rc $@:' \
-		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
-	einfo "zlib Makefile edited"
-
-	cd "${WORKDIR}"
-	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
-	tar czp grub-0.97 -f grub-0.97.tar.gz
-	tar czp lwip -f lwip-1.3.0.tar.gz
-	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
-	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
-	mv $set "${S}"/stubdom/
-	einfo "tarballs moved to source"
-}
-
-src_prepare() {
-	# if the user *really* wants to use their own custom-cflags, let them
-	if use custom-cflags; then
-		einfo "User wants their own CFLAGS - removing defaults"
-		# try and remove all the default custom-cflags
-		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-			-i {} \;
-	fi
-
-	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
-	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
-
-	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
-	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
-
-	# fix jobserver in Makefile
-	epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
-
-	#Substitute for internal downloading. pciutils copied only due to the only .bz2
-	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
-	retar-externals || die "re-tar procedure failed"
-}
-
-src_configure() {
-	local myconf="--prefix=${PREFIX}/usr \
-		--libdir=${PREFIX}/usr/$(get_libdir) \
-		--libexecdir=${PREFIX}/usr/libexec \
-		--disable-werror \
-		--disable-xen"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	use custom-cflags || unset CFLAGS
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
-
-	if use x86; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-	elif use amd64; then
-		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
-		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
-		if has_multilib_profile; then
-			multilib_toolchain_setup x86
-			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
-			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
-		fi
-	fi
-}
-
-src_install() {
-	if use x86; then
-		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-	fi
-	if use amd64; then
-		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
-		if has_multilib_profile; then
-			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
-		fi
-	fi
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "http://wiki.xen.org/wiki/Main_Page"
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-pvgrub/files/, app-emulation/xen-pvgrub/
@ 2016-10-11  7:43 Yixun Lan
  0 siblings, 0 replies; 4+ messages in thread
From: Yixun Lan @ 2016-10-11  7:43 UTC (permalink / raw
  To: gentoo-commits

commit:     732369cdddba45a22cc9cb6a124bd523f12aa05c
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 07:42:53 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 07:43:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732369cd

app-emulation/xen-pvgrub: fix boot certain guest kernel

pvgrub: fix crash when booting kernel with p2m list outside kernel mapping
https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=9714f6b87e19b32d3a6663a20df6610265c4bfe5

Gentoo-Bug: 595354

Package-Manager: portage-2.3.1

 .../files/xen-pvgrub-4.7.0-fix-boot-p2m.patch      |  36 +++++
 .../xen-pvgrub/xen-pvgrub-4.7.0-r1.ebuild          | 164 +++++++++++++++++++++
 2 files changed, 200 insertions(+)

diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.7.0-fix-boot-p2m.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.7.0-fix-boot-p2m.patch
new file mode 100644
index 00000000..e9c8040
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.7.0-fix-boot-p2m.patch
@@ -0,0 +1,36 @@
+From 9714f6b87e19b32d3a6663a20df6610265c4bfe5 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Wed, 28 Sep 2016 06:02:44 +0200
+Subject: [PATCH] pvgrub: fix crash when booting kernel with p2m list outside
+ kernel mapping
+
+When trying to boot a kernel with the p2m list not mapped by the
+initial kernel mapping it can happen that pvgrub is failing as it is
+keeping some page tables mapped.
+
+Unmap the additional page tables created for the special p2m mapping
+will avoid this failure.
+
+Reported-by: Sven Koehler <sven.koehler@gmail.com>
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Acked-by: Wei Liu <wei.liu2@citrix.com>
+---
+ stubdom/grub/kexec.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/stubdom/grub/kexec.c b/stubdom/grub/kexec.c
+index 8fd9ff9..71c2f3f 100644
+--- a/stubdom/grub/kexec.c
++++ b/stubdom/grub/kexec.c
+@@ -347,6 +347,8 @@ void kexec(void *kernel, long kernel_size, void *module, long module_size, char
+     /* Unmap libxc's projection of the boot page table */
+     seg = xc_dom_seg_to_ptr(dom, &dom->pgtables_seg);
+     munmap(seg, dom->pgtables_seg.vend - dom->pgtables_seg.vstart);
++    seg = xc_dom_seg_to_ptr(dom, &dom->p2m_seg);
++    munmap(seg, dom->p2m_seg.vend - dom->p2m_seg.vstart);
+ 
+     /* Unmap day0 pages to avoid having a r/w mapping of the future page table */
+     for (pfn = 0; pfn < allocated; pfn++)
+-- 
+2.10.0
+

diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.7.0-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.7.0-r1.ebuild
new file mode 100644
index 00000000..0f9ab30
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.7.0-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+		${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND=">=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
+
+	# bug 595354
+	epatch "${FILESDIR}"/${P}-fix-boot-p2m.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-pvgrub/files/, app-emulation/xen-pvgrub/
@ 2016-12-08  3:19 Yixun Lan
  0 siblings, 0 replies; 4+ messages in thread
From: Yixun Lan @ 2016-12-08  3:19 UTC (permalink / raw
  To: gentoo-commits

commit:     413741d0dc3a2ce905e69108df6b3ec2873d2aa1
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 03:03:19 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 03:19:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=413741d0

app-emulation/xen-pvgrub: version bump

Package-Manager: portage-2.3.3

 app-emulation/xen-pvgrub/Manifest                  |   1 +
 .../xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch  |  13 ++
 app-emulation/xen-pvgrub/xen-pvgrub-4.8.0.ebuild   | 161 +++++++++++++++++++++
 3 files changed, 175 insertions(+)

diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index f765334..f29f79a 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -5,4 +5,5 @@ DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9
 DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
 DIST xen-4.6.4.tar.gz 19709274 SHA256 b795d5631a85fb68295361067195ecd00003656dacede4ec57533fce33ab5109 SHA512 e6278061a16829628030579e115a500970ff575eb6796189bfa1e2d7a8cbbf8aec2c2bd04c77cdc87226d6cc5eaee59d6c62cacb4e74b06e1f1379734b872938 WHIRLPOOL a982f7bbf2ba16781ac0f310ef27a32e9115596e91117609d22827bc1999facb12df4f33d1ba0b7015cbfae90a24302243d508e8c38ba45ea998341b76ba0567
 DIST xen-4.7.1.tar.gz 20706864 SHA256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe SHA512 eb03244f5fa7b54402fcc1d38f1e69c0ea4536d5ab2f9859b41b5e94920ad9db20fb146e3c3d3635e9ca1d12e93ce0429e57f24bf53d4a2c4b69babc76ec724e WHIRLPOOL 5d7ba29ea58bdedb6a237f7cb1c0aacf361dc35ebb07ec8e55773e07b1f38c1b151615b526e14daeca7c2db235114bde0b6d124219e8818c6e529873b5151fec
+DIST xen-4.8.0.tar.gz 22499917 SHA256 1e15c713ab7ba3bfda8b4a285ed973529364fd1100e6dd5a61f29583dc667b04 SHA512 70b95553f9813573b12e52999a4df8701dec430f23c36a8dc70d25a46bb4bc9234e5b7feb74a04062af4c8d6b6bcfe947d90b2b172416206812e54bac9797454 WHIRLPOOL 1296c25a05e3ab81730a2587ea1c07c7c022f05cfefc580224185c8d5fc9853531031c1292f69eff944ae2752492c4b95f13e160be3c449a7626aeadf1a21102
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276

diff --git a/app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch
new file mode 100644
index 00000000..aebc1ee
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch
@@ -0,0 +1,13 @@
+diff --git a/tools/firmware/vgabios/Makefile b/tools/firmware/vgabios/Makefile
+index 3284812..ef242b3 100644
+--- a/tools/firmware/vgabios/Makefile
++++ b/tools/firmware/vgabios/Makefile
+@@ -30,7 +30,7 @@ distclean: clean
+ 
+ .PHONY: release
+ release: 
+-	VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios
++	VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" $(MAKE) bios cirrus-bios
+ 	/bin/rm -f  *.o *.s *.ld86 \
+           temp.awk.* vgabios.*.orig _vgabios_.*.c core *.bak .#*
+ 	cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin

diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.8.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.8.0.ebuild
new file mode 100644
index 00000000..0dea6a8
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.8.0.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+		http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+		${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="http://xen.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND=">=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
+
+	# fix jobserver in Makefile
+	epatch "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "http://wiki.xen.org/wiki/Main_Page"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-pvgrub/files/, app-emulation/xen-pvgrub/
@ 2018-10-02 11:03 Thomas Deutschmann
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2018-10-02 11:03 UTC (permalink / raw
  To: gentoo-commits

commit:     d453d858c6647c8e2ead875cb96a9a348cc95d78
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Sep 27 08:18:15 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 11:03:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d453d858

app-emulation/xen-pvgrub: bump to 4.10.2

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-emulation/xen-pvgrub/Manifest                  |   1 +
 .../xen-pvgrub/files/xen-4.10-externals.patch      |  74 ++++++++++
 app-emulation/xen-pvgrub/xen-pvgrub-4.10.2.ebuild  | 163 +++++++++++++++++++++
 3 files changed, 238 insertions(+)

diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index e7131adde7f..a701d239cfc 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -5,6 +5,7 @@ DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f
 DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
 DIST xen-4.10.1-upstream-patches-2.tar.xz 117588 BLAKE2B ddcd58964117652b50f3524d89089e2e9b14a8399fb5bd2db5d12827035ab94cedbfd5d65134d8953e4062a50e0e8a9b320e9c34008db8fd364456f47fd9cd26 SHA512 49ee8497af3753f3d611bf12c65fb7a79abb018862f1af096e9dde3ddfe8780bb95fc3da338c8d5f16a5d6d233d606d4cf8025a3d0e2897bf2668a1d5b27b198
 DIST xen-4.10.1.tar.gz 24674240 BLAKE2B f9a7e0c637db865ab32ad6b6185ab96022903aff65a18e194286a3fc372d4a45f6682cd636b7ac5b4fa0125e54ed51f8876a411d498cf75791718fd088c4a6d2 SHA512 236c02bee69e33644703ed26d323d4c491a91fc05bd0ee0990a7368579f7c82f5bb4510845bf80348fd923024d7d60d521f593dfd0365d971dc592f8ef10fbea
+DIST xen-4.10.2.tar.gz 24697204 BLAKE2B b331d3ad8d7842446f7d2da5dd31560f636aa1408dd3cc8798dff35b868ef5a609d17e97ef4355e1e5aa825a5abc74103796f9a8015037f0a564ffcebd825722 SHA512 2e301b4d6eb106fcb52203bc1208c8fd1fc7bb5d795166c0f86e4085227050301f7daa6f21db440c47bc2ca2c7f87d9b96753cfdf3fa724e0416b5679b84c163
 DIST xen-4.11.0-upstream-patches-1.tar.xz 56664 BLAKE2B 27579f4e628bb0d3fdd59f7e133e9134d4ca175842dfdae3a3f765b133254239ae3bca94d75dd655735b5bcbd67f9b8d444dd227028642e6e459e57ed8a20341 SHA512 e90b8e7fa9433e93b1620a776833a6d3578babebe5d73dcaae11186f473945a2270046932ab314a9c6049d3b460a655456f487a5b59730fe88a4f08d482c47a1
 DIST xen-4.11.0.tar.gz 25131533 BLAKE2B 892639b8bcd9b9956104e4d5137ffd88e17f92d965fa967b4af8d74a4fddcc21c6971c53026e0fb5ce833ab2c25c68f827abcac0b7b1dcebc21dca645c465573 SHA512 33d431c194f10d5ee767558404a1f80a66b3df019012b0bbd587fcbc9524e1bba7ea04269020ce891fe9d211d2f81c63bf78abedcdbe1595aee26251c803a50a
 DIST xen-4.9.2.tar.gz 23392753 BLAKE2B 5f96f0e5062eff8ac2971eef85ea2bae0e94e7542151237937a1cf7e74690bb0ce1c952e830d2fc13b3277f70b9ed1de511afe4f780ad7b3be0c58742ece39b2 SHA512 e06aec25439abcc548c174ba8e271c23031ea704bcc2480905140aa68490064fbb1c58d9c4174f6617b4f7bbcddfda284317df6f480a6e5b5b5a2c71fbe0ac93

diff --git a/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch
new file mode 100644
index 00000000000..b206144e304
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-4.10-externals.patch
@@ -0,0 +1,74 @@
+--- a/stubdom/Makefile	2013-07-09 18:46:56.000000000 +0800
++++ b/stubdom/Makefile	2013-07-21 16:07:08.094663570 +0800
+@@ -68,12 +68,12 @@
+ ##############
+ 
+ newlib-$(NEWLIB_VERSION).tar.gz:
+-	$(FETCHER) $@ $(NEWLIB_URL)/$@
+ 
+ newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
+ 	tar xzf $<
+ 	patch -d $@ -p0 < newlib.patch
+ 	patch -d $@ -p0 < newlib-chk.patch
++	patch -d $@ -p0 < newlib-implicits.patch
+ 	patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch
+ 	find $@ -type f | xargs perl -i.bak \
+ 		-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g'
+@@ -85,7 +85,7 @@
+ $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
+ 	mkdir -p newlib-$(XEN_TARGET_ARCH)
+ 	( cd newlib-$(XEN_TARGET_ARCH) && \
+-	  CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
++	CC_FOR_TARGET="$(CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(NEWLIB_CFLAGS)" AR_FOR_TARGET=$(AR) LD_FOR_TARGET=$(LD) LDFLAGS= RANLIB_FOR_TARGET=$(RANLIB) ../newlib-$(NEWLIB_VERSION)/configure --prefix=$(CROSS_PREFIX) --verbose --target=$(GNU_TARGET_ARCH)-xen-elf --enable-newlib-io-long-long --disable-multilib && \
+ 	  $(MAKE) DESTDIR= && \
+ 	  $(MAKE) DESTDIR= install )
+ 
+@@ -94,7 +94,6 @@
+ ############
+ 
+ zlib-$(ZLIB_VERSION).tar.gz:
+-	$(FETCHER) $@ $(ZLIB_URL)/$@
+ 
+ zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz 
+ 	tar xzf $<
+@@ -105,7 +104,7 @@
+ cross-zlib: $(ZLIB_STAMPFILE)
+ $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
+ 	( cd $< && \
+-	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC=$(CC) ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
++	  CFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" CC="$(CC)" ./configure --prefix=$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf && \
+ 	  $(MAKE) DESTDIR= libz.a && \
+ 	  $(MAKE) DESTDIR= install )
+ 
+@@ -114,7 +113,6 @@
+ ##############
+ 
+ pciutils-$(LIBPCI_VERSION).tar.bz2:
+-	$(FETCHER) $@ $(LIBPCI_URL)/$@
+ 
+ pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
+ 	tar xjf $<
+@@ -142,7 +140,6 @@
+ ######
+ 
+ lwip-$(LWIP_VERSION).tar.gz:
+-	$(FETCHER) $@ $(LWIP_URL)/$@
+ 
+ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
+ 	tar xzf $<
+@@ -180,7 +177,6 @@
+ # cross-polarssl
+ #############
+ polarssl-$(POLARSSL_VERSION)-gpl.tgz:
+-	$(FETCHER) $@ $(POLARSSL_URL)/$@
+ 
+ polarssl-$(XEN_TARGET_ARCH): polarssl-$(POLARSSL_VERSION)-gpl.tgz
+ 	tar xzf $<
+@@ -385,7 +382,6 @@
+ ######
+ 
+ grub-$(GRUB_VERSION).tar.gz:
+-	$(FETCHER) $@ $(GRUB_URL)/$@
+ 
+ grub-upstream: grub-$(GRUB_VERSION).tar.gz
+ 	tar xzf $<

diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.10.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.10.2.ebuild
new file mode 100644
index 00000000000..f4536845d19
--- /dev/null
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.10.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='xml,threads'
+
+inherit flag-o-matic multilib python-single-r1 toolchain-funcs
+
+XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
+LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
+GRUB_URL=mirror://gnu-alpha/grub
+
+UPSTREAM_VER=
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+		https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="
+		https://downloads.xenproject.org/release/xen/${PV}/xen-${PV}.tar.gz
+		$GRUB_URL/grub-0.97.tar.gz
+		$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
+		$LIBPCI_URL/pciutils-2.2.9.tar.bz2
+		$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
+		$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
+		$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz
+		${UPSTREAM_PATCHSET_URI}"
+
+S="${WORKDIR}/xen-${PV}"
+
+DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="custom-cflags"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="sys-devel/gettext
+	sys-devel/bin86
+	sys-apps/texinfo
+	x11-libs/pixman"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-emulation/xen-tools-${PV}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+retar-externals() {
+	# Purely to unclutter src_prepare
+	local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
+
+	# eapply can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
+	sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
+		-i "${WORKDIR}"/zlib-1.2.3/configure
+	sed -e 's:^AR=ar rc:AR=ar:' \
+		-e s':$(AR) $@:$(AR) rc $@:' \
+		-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
+	einfo "zlib Makefile edited"
+
+	cd "${WORKDIR}"
+	tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
+	tar czp grub-0.97 -f grub-0.97.tar.gz
+	tar czp lwip -f lwip-1.3.0.tar.gz
+	tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
+	tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
+	mv $set "${S}"/stubdom/
+	einfo "tarballs moved to source"
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			eapply "${WORKDIR}"/patches-upstream
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \;
+	fi
+
+	# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
+	cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
+
+	# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
+	eapply "${FILESDIR}"/${PN/-pvgrub/}-4.10-externals.patch
+
+	# fix jobserver in Makefile
+	eapply "${FILESDIR}"/${PN}-4.8-jserver.patch
+
+	#Substitute for internal downloading. pciutils copied only due to the only .bz2
+	cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
+	retar-externals || die "re-tar procedure failed"
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--disable-werror \
+		--disable-xen"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	use custom-cflags || unset CFLAGS
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/libs
+
+	if use x86; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+	elif use amd64; then
+		emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
+		XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
+		if has_multilib_profile; then
+			multilib_toolchain_setup x86
+			emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
+			XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
+		fi
+	fi
+}
+
+src_install() {
+	if use x86; then
+		emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+	fi
+	if use amd64; then
+		emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
+		if has_multilib_profile; then
+			emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-10-02 11:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-08  3:19 [gentoo-commits] repo/gentoo:master commit in: app-emulation/xen-pvgrub/files/, app-emulation/xen-pvgrub/ Yixun Lan
  -- strict thread matches above, loose matches on Subject: below --
2018-10-02 11:03 Thomas Deutschmann
2016-10-11  7:43 Yixun Lan
2016-07-28 16:50 Yixun Lan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox