diff options
| author |   Yixun Lan <dlan@gentoo.org> | 2014-02-18 10:37:12 +0000 |
|---|---|---|
| committer | Yixun Lan <dlan@gentoo.org> | 2014-02-18 10:37:12 +0000 |
| commit | b8ad5d510dd0e7ce65cebfbec3965738d6fb7b71 (patch) | |
| tree | 144444a45396112cef1e8cb0cfea961433fc4afb /app-emulation/xen-tools/files | |
| parent | Version bump (diff) | |
| download | gentoo-2-b8ad5d510dd0e7ce65cebfbec3965738d6fb7b71.tar.gz gentoo-2-b8ad5d510dd0e7ce65cebfbec3965738d6fb7b71.tar.bz2 gentoo-2-b8ad5d510dd0e7ce65cebfbec3965738d6fb7b71.zip | |
fix 496708, thanks Radoslaw Szkodzinski; drop idella4 from metadata.xml
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
Diffstat (limited to 'app-emulation/xen-tools/files')
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch | 33 | ||||
| -rw-r--r-- | app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch | 22 |
2 files changed, 55 insertions, 0 deletions
diff --git a/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch b/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch new file mode 100644 index 000000000000..902c9ac4efbd --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-4-unbundle-ipxe.patch @@ -0,0 +1,33 @@ +--- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig 2012-05-27 21:57:04.481812859 +0100 ++++ xen-4.2.0/tools/firmware/hvmloader/Makefile 2012-06-02 18:52:44.935034128 +0100 +@@ -48,7 +48,7 @@ + else + CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin + endif +-ETHERBOOT_ROMS := $(addprefix ../etherboot/ipxe/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) ++ETHERBOOT_ROMS := $(addprefix /usr/share/ipxe/, $(addsuffix .rom, $(ETHERBOOT_NICS))) + endif + + ROMS := +--- xen-4.2.0/Config.mk.orig 2012-05-27 21:57:04.479812884 +0100 ++++ xen-4.2.0/Config.mk 2012-06-02 18:55:14.087169469 +0100 +@@ -206,7 +206,7 @@ + # Wed Jun 26 16:30:45 2013 +0100 + # xen: Don't perform SMP setup. + +-ETHERBOOT_NICS ?= rtl8139 8086100e ++ETHERBOOT_NICS ?= 10ec8139 8086100e + + # Specify which qemu-dm to use. This may be `ioemu' to use the old + # Mercurial in-tree version, or a local directory, or a git URL. +--- xen-4.2.0/tools/firmware/Makefile.orig 2012-05-27 21:57:04.480812871 +0100 ++++ xen-4.2.0/tools/firmware/Makefile 2012-06-02 19:03:52.254691484 +0100 +@@ -10,7 +10,7 @@ + #SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir + SUBDIRS-$(CONFIG_ROMBIOS) += rombios + SUBDIRS-$(CONFIG_ROMBIOS) += vgabios +-SUBDIRS-$(CONFIG_ROMBIOS) += etherboot ++#SUBDIRS-$(CONFIG_ROMBIOS) += etherboot + SUBDIRS-y += hvmloader + + ovmf: diff --git a/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch b/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch new file mode 100644 index 000000000000..86d46aa40de4 --- /dev/null +++ b/app-emulation/xen-tools/files/xen-tools-4-unbundle-seabios.patch @@ -0,0 +1,22 @@ +--- xen-4.2.0/tools/firmware/Makefile.orig 2012-05-12 16:40:47.000000000 +0100 ++++ xen-4.2.0/tools/firmware/Makefile 2012-05-27 21:55:23.438076078 +0100 +@@ -7,7 +7,7 @@ + + SUBDIRS-y := + SUBDIRS-$(CONFIG_OVMF) += ovmf +-SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir ++#SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir + SUBDIRS-$(CONFIG_ROMBIOS) += rombios + SUBDIRS-$(CONFIG_ROMBIOS) += vgabios + SUBDIRS-$(CONFIG_ROMBIOS) += etherboot +--- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig 2012-05-12 16:40:47.000000000 +0100 ++++ xen-4.2.0/tools/firmware/hvmloader/Makefile 2012-05-27 21:53:45.625298906 +0100 +@@ -70,7 +70,7 @@ + ifeq ($(CONFIG_SEABIOS),y) + OBJS += seabios.o + CFLAGS += -DENABLE_SEABIOS +-SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin ++SEABIOS_ROM := /usr/share/seabios/bios.bin + ROMS += $(SEABIOS_ROM) + endif + |