reinit the tree, so we can have metadata

4 files changed, 269 insertions, 0 deletions

diff --git a/app-emulation/xen-pvgrub/files/newlib-implicits.patch b/app-emulation/xen-pvgrub/files/newlib-implicits.patch
new file mode 100644
index 000000000000..73c04931b31d
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/newlib-implicits.patch
@@ -0,0 +1,149 @@
+diff -ur newlib-1.16.0.orig/newlib/libc/stdlib/wcstoull.c newlib-1.16.0/newlib/libc/stdlib/wcstoull.c
+--- newlib/libc/stdlib/wcstoull.c	2007-07-07 04:03:28.000000000 +0800
++++ newlib/libc/stdlib/wcstoull.c	2012-12-02 14:19:40.905136553 +0800
+@@ -124,7 +124,7 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <reent.h>
+-
++#include <wchar.h>
+ #ifndef _REENT_ONLY
+ 
+ unsigned long long
+diff -ur newlib-1.16.0.orig/newlib/doc/makedoc.c 
+newlib-1.16.0/newlib/doc/makedoc.c
+--- newlib/doc/makedoc.c	2007-01-03 01:59:59.000000000 +0900
++++ newlib/doc/makedoc.c	2012-12-02 16:53:42.700289294 +0800
+@@ -39,7 +39,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+-
++#include <string.h>
+ #define DEF_SIZE 5000
+ #define STACK 50
+ 
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/lseek64r.c newlib-1.16.0/newlib/libc/reent/lseek64r.c
+--- newlib/libc/reent/lseek64r.c	2003-06-04 03:48:07.000000000 +0800
++++ newlib/libc/reent/lseek64r.c	2012-12-02 18:29:45.435760985 +0800
+@@ -1,8 +1,8 @@
+ /* Reentrant versions of lseek system call. */
+
+-#include <reent.h>
++#include "../include/reent.h"
+ #include <unistd.h>
+-#include <_syslist.h>
++#include "../include/_syslist.h"
+
+ /* Some targets provides their own versions of this functions.  Those
+    targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
+diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/fseeko64.c newlib-1.16.0/newlib/libc/stdio64/fseeko64.c
+--- newlib/libc/stdio64/fseeko64.c	2007-07-14 04:37:53.000000000 +0800
++++ newlib/libc/stdio64/fseeko64.c	2012-12-02 18:26:29.955778906 +0800
+@@ -119,7 +119,7 @@
+ 	  ptr->_errno = EOVERFLOW;
+ 	  return EOF;
+ 	}
+-      return (_off64_t) _fseeko_r (ptr, fp, offset, whence);
++      return (_off64_t) _fseeko64_r (ptr, fp, offset, whence);
+     }
+ 
+   /* Make sure stdio is set up.  */
+
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/fstat64r.c newlib-1.16.0/newlib/libc/reent/fstat64r.c
+--- newlib/libc/reent/fstat64r.c	2012-12-03 13:17:26.569703981 +0800
++++ newlib/libc/reent/fstat64r.c	2003-06-04 03:48:07.000000000 +0800
+@@ -1,10 +1,10 @@
+ /* Reentrant versions of fstat system call.  This implementation just
+    calls the fstat system call.  */
+ 
+-#include <reent.h>
++#include "../include/reent.h">
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <_syslist.h>
++#include "../include/_syslist.h"
+ 
+ #ifdef __LARGE64_FILES
+ 
+diff -ur newlib-1.16.0.orig/libgloss/i386/cygmon-gmon.c newlib-1.16.0/libgloss/i386/cygmon-gmon.c
+--- libgloss/i386/cygmon-gmon.c	2002-10-26 03:18:46.000000000 +0800
++++ libgloss/i386/cygmon-gmon.c	2012-12-03 14:38:41.454257066 +0800
+@@ -68,6 +68,9 @@
+ 
+ #include "cygmon-gmon.h"
+
++#include <unistd.h>
++#include <stdlib.h>
++#include <strings.h>
+ /*
+  *	froms is actually a bunch of unsigned shorts indexing tos
+ */
+@@ -78,6 +78,8 @@
+ static char		*s_lowpc = 0;
+ static char		*s_highpc = 0;
+ static unsigned long	s_textsize = 0;
++extern void profil_write(int, char*, int);
++extern int moncontrol (int);
+ 
+ static int	ssiz;
+ static char	*sbuf;
+diff -ur newlib-1.16.0.orig/newlib/libc/include/_syslist.h 
+newlib-1.16.0/newlib/libc/include/_syslist.h
+--- newlib/libc/include/_syslist.h   2005-08-23 05:13:35.000000000 +0800
++++ newlib/libc/include/_syslist.h        2012-12-03 17:20:03.092369483 +0800
+@@ -2,6 +2,7 @@
+    and only provide C names, so that we end up in violation of ANSI */
+ #ifndef __SYSLIST_H
+ #define __SYSLIST_H
++#include <sys/types.h>
+
+ #ifdef MISSING_SYSCALL_NAMES
+ #define _close close
+
+#diff -ur newlib-1.16.0.orig/newlib/libc/Makefile.in newlib-1.16.0/newlib/libc/Makefile.in
+#--- newlib/libc/Makefile.in	2007-05-25 01:33:30.000000000 +0800
+#+++ newlib/libc/Makefile.in	2012-12-03 21:52:05.621873084 +0800
+diff -ur newlib-1.16.0.orig/newlib/libc/stdio64/ftello64.c newlib-1.16.0/newlib/libc/stdio64/ftello64.c
+--- newlib/libc/stdio64/ftello64.c	2007-07-14 04:37:53.000000000 +0800
++++ newlib/libc/stdio64/ftello64.c	2012-12-04 18:34:46.491509484 +0800
+@@ -93,7 +93,7 @@
+ 
+   /* Only do 64-bit tell on large file.  */
+   if (!(fp->_flags & __SL64))
+-    return (_off64_t) _ftello_r (ptr, fp);
++    return (_off64_t) _ftello64_r (ptr, fp);
+ 
+   /* Ensure stdio is set up.  */
+ 
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/open64r.c newlib-1.16.0/newlib/libc/reent/open64r.c
+--- newlib/libc/reent/open64r.c	2002-08-27 02:56:06.000000000 +0800
++++ newlib/libc/reent/open64r.c	2012-12-04 20:06:10.044006769 +0800
+@@ -1,8 +1,8 @@
+ /* Reentrant versions of open system call. */
+
+-#include <reent.h>
++#include "../include/reent.h">
+ #include <unistd.h>
+-#include <fcntl.h>
++#include <sys/_default_fcntl.h>
+ #include <_syslist.h>
+ 
+ #ifdef __LARGE64_FILES
+diff -ur newlib-1.16.0.orig/newlib/libc/reent/signalr.c newlib-1.16.0/newlib/libc/reent/signalr.c
+--- newlib/libc/reent/signalr.c 2012-12-05 07:33:25.623393126 +0800
++++ newlib/libc/reent/signalr.c 2012-12-05 07:34:03.943389613 +0800
+@@ -1,10 +1,10 @@
+ /* Reentrant versions of syscalls need to support signal/raise.
+    These implementations just call the usual system calls.  */
+
+-#include <reent.h>
++#include "../include/reent.h"
+ #include <signal.h>
+ #include <unistd.h>
+-#include <_syslist.h>
++#include "../include/_syslist.h"
+
+ /* Some targets provides their own versions of these functions.  Those
+    targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS.  */
+
diff --git a/app-emulation/xen-pvgrub/files/xen-4.3-externals.patch b/app-emulation/xen-pvgrub/files/xen-4.3-externals.patch
new file mode 100644
index 000000000000..0d8956fac098
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-4.3-externals.patch
@@ -0,0 +1,75 @@
+diff -ur xen-4.3.0.orig/stubdom/Makefile xen-4.3.0/stubdom/Makefile
+--- stubdom/Makefile	2013-07-09 18:46:56.000000000 +0800
++++ 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/files/xen-pvgrub-4.2-jserver.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2-jserver.patch
new file mode 100644
index 000000000000..514fd0575b23
--- /dev/null
+++ b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.2-jserver.patch
@@ -0,0 +1,32 @@
+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 -ur xen-4.2.0.orig/tools/firmware/vgabios/Makefile xen-4.2.0/tools/firmware/vgabios/Makefile
+--- tools/firmware/vgabios/Makefile	2013-02-04 13:56:50.973533544 +0800
++++ tools/firmware/vgabios/Makefile	2013-02-04 13:57:21.380535958 +0800
+@@ -27,7 +27,7 @@
+ 
+ .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/files/xen-pvgrub-4.8-jserver.patch b/app-emulation/xen-pvgrub/files/xen-pvgrub-4.8-jserver.patch
new file mode 100644
index 000000000000..aebc1ee5926e
--- /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