| 1 |
idella4 13/01/28 05:29:05 |
| 2 |
|
| 3 |
Modified: xen-4.2.0-externals.patch |
| 4 |
Added: xen-4.2.1-externals.patch |
| 5 |
Removed: xen-4.2.0-newlib.patch |
| 6 |
Log: |
| 7 |
rm redundant xen-4.2.0-newlib.patch, rm corrupted & redundant 1st. hunk of xen-4.2.0-externals.patch, add adjusted xen-4.2.1-externals.patch, version bump |
| 8 |
|
| 9 |
(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.2 app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch?rev=1.2&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch?rev=1.2&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch?r1=1.1&r2=1.2 |
| 17 |
|
| 18 |
Index: xen-4.2.0-externals.patch |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/files/xen-4.2.0-externals.patch,v |
| 21 |
retrieving revision 1.1 |
| 22 |
retrieving revision 1.2 |
| 23 |
diff -u -r1.1 -r1.2 |
| 24 |
--- xen-4.2.0-externals.patch 4 Dec 2012 16:31:20 -0000 1.1 |
| 25 |
+++ xen-4.2.0-externals.patch 28 Jan 2013 05:29:05 -0000 1.2 |
| 26 |
@@ -1,46 +1,5 @@ |
| 27 |
# Patch Makefile to patch insource newlib, |
| 28 |
# Prevent internal downloading of external packages |
| 29 |
-diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile |
| 30 |
---- stubdom/Makefile 2012-09-17 18:21:17.000000000 +0800 |
| 31 |
-+++ stubdom/Makefile 2012-12-05 14:01:10.694260256 +0800 |
| 32 |
-@@ -8,30 +8,30 @@ |
| 33 |
- include $(XEN_ROOT)/Config.mk |
| 34 |
- |
| 35 |
- #ZLIB_URL?=http://www.zlib.net |
| 36 |
--ZLIB_URL=$(XEN_EXTFILES_URL) |
| 37 |
-+ZLIB_URL=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir |
| 38 |
- ZLIB_VERSION=1.2.3 |
| 39 |
- |
| 40 |
- #LIBPCI_URL?=http://www.kernel.org/pub/software/utils/pciutils |
| 41 |
--LIBPCI_URL?=$(XEN_EXTFILES_URL) |
| 42 |
-+LIBPCI_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir |
| 43 |
- LIBPCI_VERSION=2.2.9 |
| 44 |
- |
| 45 |
- #NEWLIB_URL?=ftp://sources.redhat.com/pub/newlib |
| 46 |
--NEWLIB_URL?=$(XEN_EXTFILES_URL) |
| 47 |
-+NEWLIB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir |
| 48 |
- NEWLIB_VERSION=1.16.0 |
| 49 |
- |
| 50 |
- #LWIP_URL?=http://download.savannah.gnu.org/releases/lwip |
| 51 |
--LWIP_URL?=$(XEN_EXTFILES_URL) |
| 52 |
-+LWIP_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir |
| 53 |
- LWIP_VERSION=1.3.0 |
| 54 |
- |
| 55 |
- #GRUB_URL?=http://alpha.gnu.org/gnu/grub |
| 56 |
--GRUB_URL?=$(XEN_EXTFILES_URL) |
| 57 |
-+GRUB_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir |
| 58 |
- GRUB_VERSION=0.97 |
| 59 |
- |
| 60 |
--#OCAML_URL?=$(XEN_EXTFILES_URL) |
| 61 |
-+#OCAML_URL?=/mnt/gen2/TmpDir/portage/app-emulation/xen-pvgrub-4.2.0/distdir |
| 62 |
- OCAML_URL?=http://caml.inria.fr/pub/distrib/ocaml-3.11 |
| 63 |
- OCAML_VERSION=3.11.0 |
| 64 |
- |
| 65 |
--WGET=wget -c |
| 66 |
-+WGET=cp -t . |
| 67 |
- |
| 68 |
- GNU_TARGET_ARCH:=$(XEN_TARGET_ARCH) |
| 69 |
- ifeq ($(XEN_TARGET_ARCH),x86_32) |
| 70 |
@@ -95,12 +95,13 @@ |
| 71 |
############## |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.1 app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch?rev=1.1&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-pvgrub/files/xen-4.2.1-externals.patch?rev=1.1&content-type=text/plain |
| 80 |
|
| 81 |
Index: xen-4.2.1-externals.patch |
| 82 |
=================================================================== |
| 83 |
# Patch Makefile to patch insource newlib, |
| 84 |
# Prevent internal downloading of external packages |
| 85 |
diff -ur xen-4.2.0.orig/stubdom/Makefile xen-4.2.0/stubdom/Makefile |
| 86 |
--- stubdom/Makefile 2012-09-17 18:21:17.000000000 +0800 |
| 87 |
+++ stubdom/Makefile 2012-12-05 14:01:10.694260256 +0800 |
| 88 |
@@ -95,12 +95,13 @@ |
| 89 |
############## |
| 90 |
|
| 91 |
newlib-$(NEWLIB_VERSION).tar.gz: |
| 92 |
- $(WGET) $(NEWLIB_URL)/$@ |
| 93 |
+# $(WGET) $(NEWLIB_URL)/$@ |
| 94 |
|
| 95 |
newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz |
| 96 |
tar xzf $< |
| 97 |
patch -d $@ -p0 < newlib.patch |
| 98 |
patch -d $@ -p0 < newlib-chk.patch |
| 99 |
+ patch -d $@ -p0 < newlib-implicits.patch |
| 100 |
patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch |
| 101 |
find $@ -type f | xargs perl -i.bak \ |
| 102 |
-pe 's/\b_(tzname|daylight|timezone)\b/$$1/g' |
| 103 |
@@ -110,7 +110,7 @@ |
| 104 |
$(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION) |
| 105 |
mkdir -p newlib-$(XEN_TARGET_ARCH) |
| 106 |
( cd newlib-$(XEN_TARGET_ARCH) && \ |
| 107 |
- 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 && \ |
| 108 |
+ 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 && \ |
| 109 |
$(MAKE) DESTDIR= && \ |
| 110 |
$(MAKE) DESTDIR= install ) |
| 111 |
|
| 112 |
@@ -121,7 +122,7 @@ |
| 113 |
############ |
| 114 |
|
| 115 |
zlib-$(ZLIB_VERSION).tar.gz: |
| 116 |
- $(WGET) $(ZLIB_URL)/$@ |
| 117 |
+# $(WGET) $(ZLIB_URL)/$@ |
| 118 |
|
| 119 |
zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz |
| 120 |
tar xzf $< |
| 121 |
@@ -141,7 +142,7 @@ |
| 122 |
############## |
| 123 |
|
| 124 |
pciutils-$(LIBPCI_VERSION).tar.bz2: |
| 125 |
- $(WGET) $(LIBPCI_URL)/$@ |
| 126 |
+# $(WGET) $(LIBPCI_URL)/$@ |
| 127 |
|
| 128 |
pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2 |
| 129 |
tar xjf $< |
| 130 |
@@ -169,7 +170,7 @@ |
| 131 |
###### |
| 132 |
|
| 133 |
lwip-$(LWIP_VERSION).tar.gz: |
| 134 |
- $(WGET) $(LWIP_URL)/$@ |
| 135 |
+# $(WGET) $(LWIP_URL)/$@ |
| 136 |
|
| 137 |
lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz |
| 138 |
tar xzf $< |
| 139 |
@@ -325,7 +326,7 @@ |
| 140 |
###### |
| 141 |
|
| 142 |
grub-$(GRUB_VERSION).tar.gz: |
| 143 |
- $(WGET) $(GRUB_URL)/$@ |
| 144 |
+#$(WGET) $(GRUB_URL)/$@ |
| 145 |
|
| 146 |
grub-upstream: grub-$(GRUB_VERSION).tar.gz |
| 147 |
tar xzf $< |
| 148 |
@@ -392,7 +393,7 @@ |
| 149 |
$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" |
| 150 |
$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz" |
| 151 |
|
| 152 |
-install-grub: pv-grub |
| 153 |
+install-grub: |
| 154 |
$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" |
| 155 |
$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-grub/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/pv-grub-$(XEN_TARGET_ARCH).gz" |
Archives