[xen] Update to xen-4.2.0
myoung
myoung at fedoraproject.org
Thu Oct 25 00:02:11 UTC 2012
commit c9994c138cb19c99f355f899ce80278a3ef78fa9
Author: Michael Young <m.a.young at durham.ac.uk>
Date: Thu Oct 25 01:00:54 2012 +0100
Update to xen-4.2.0
.gitignore | 3 +-
grub-ext4-support.patch | 474 --
pygrub.size.limits.patch | 116 -
pygrubfix.patch | 4 +-
...-3220480734832a148d26f7a81f90af61c2ecfdd9.patch | 123 -
...-d7d453f51459b591faa96d1c123b5bfff7c5b6b6.patch | 36 -
qemu-xen.tradonly.patch | 11 +
sources | 3 +-
tmpfiles.d.xen.conf | 1 +
upstream-23936:cdb34816a40a-rework | 7924 --------------------
upstream-23937:5173834e8476 | 20 -
upstream-23938:fa04fbd56521-rework | 321 -
upstream-23939:51288f69523f-rework | 1509 ----
upstream-23940:187d59e32a58 | 45 -
xen-4.1-testing.23349.patch | 29 -
xen-4.1-testing.23350.patch | 37 -
xen-4.1-testing.23351.patch | 28 -
xen-4.1-testing.23352.patch | 38 -
xen-backend.rules.patch | 8 -
xen-net-disable-iptables-on-bridge.patch | 4 +-
xen-no-pyxml.patch | 13 -
xen.fedora.efi.build.patch | 46 +
xen.spec | 129 +-
xen.use.fedora.ipxe.patch | 33 +
xen.use.fedora.seabios.patch | 22 +
25 files changed, 203 insertions(+), 10774 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a305564..2eff48a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,4 @@ newlib-1.16.0.tar.gz
lwip-1.3.0.tar.gz
pciutils-2.2.9.tar.bz2
zlib-1.2.3.tar.gz
-/ipxe-git-v1.0.0.tar.gz
-/xen-4.1.3.tar.gz
+/xen-4.2.0.tar.gz
diff --git a/pygrubfix.patch b/pygrubfix.patch
index e039369..2caa7ca 100644
--- a/pygrubfix.patch
+++ b/pygrubfix.patch
@@ -1,9 +1,9 @@
--- xen-4.1.0/tools/pygrub/src/pygrub.orig 2010-12-31 15:24:11.000000000 +0000
+++ xen-4.1.0/tools/pygrub/src/pygrub 2011-01-30 18:58:17.000000000 +0000
-@@ -96,6 +96,7 @@
-
+@@ -97,6 +97,7 @@
fd = os.open(file, os.O_RDONLY)
buf = os.read(fd, 512)
+ os.close(fd)
+ offzerocount = 0
for poff in (446, 462, 478, 494): # partition offsets
diff --git a/qemu-xen.tradonly.patch b/qemu-xen.tradonly.patch
new file mode 100644
index 0000000..e39f3f3
--- /dev/null
+++ b/qemu-xen.tradonly.patch
@@ -0,0 +1,11 @@
+--- xen-4.2.0/tools/Makefile.orig 2012-05-27 20:29:17.372660785 +0100
++++ xen-4.2.0/tools/Makefile 2012-05-27 20:38:24.066826167 +0100
+@@ -35,7 +35,7 @@
+ # do not recurse in to a dir we are about to delete
+ ifneq "$(MAKECMDGOALS)" "distclean"
+ SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-traditional-dir
+-SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
++#SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
+ endif
+
+ SUBDIRS-y += xenpmd
diff --git a/sources b/sources
index 5bf4371..e16cb6f 100644
--- a/sources
+++ b/sources
@@ -3,5 +3,4 @@ bf8f1f9e3ca83d732c00a79a6ef29bc4 newlib-1.16.0.tar.gz
36cc57650cffda9a0269493be2a169bb lwip-1.3.0.tar.gz
cec05e7785497c5e19da2f114b934ffd pciutils-2.2.9.tar.bz2
debc62758716a169df9f62e6ab2bc634 zlib-1.2.3.tar.gz
-fb7df96781d337899066d82059346885 ipxe-git-v1.0.0.tar.gz
-bed929d5c5e5135cab40e2a6aab73fa0 xen-4.1.3.tar.gz
+f4f217969afc38f09251039966d91a87 xen-4.2.0.tar.gz
diff --git a/tmpfiles.d.xen.conf b/tmpfiles.d.xen.conf
new file mode 100644
index 0000000..5041017
--- /dev/null
+++ b/tmpfiles.d.xen.conf
@@ -0,0 +1 @@
+d /run/xen 0755 root root -
diff --git a/xen-net-disable-iptables-on-bridge.patch b/xen-net-disable-iptables-on-bridge.patch
index e7a8930..53383cf 100644
--- a/xen-net-disable-iptables-on-bridge.patch
+++ b/xen-net-disable-iptables-on-bridge.patch
@@ -8,9 +8,9 @@
- handle_iptable
-fi
-
+ call_hooks vif post
+
log debug "Successful vif-bridge $command for $dev, bridge $bridge."
- if [ "$type_if" = vif -a "$command" = "online" ]
- then
--- xen-3.3.0-orig/tools/hotplug/Linux/xen-network-common.sh 2008-08-22 10:49:07.000000000 +0100
+++ xen-3.3.0-new/tools/hotplug/Linux/xen-network-common.sh 2008-08-29 11:29:38.000000000 +0100
@@ -99,6 +99,13 @@ create_bridge () {
diff --git a/xen.fedora.efi.build.patch b/xen.fedora.efi.build.patch
new file mode 100644
index 0000000..1a66098
--- /dev/null
+++ b/xen.fedora.efi.build.patch
@@ -0,0 +1,46 @@
+--- xen-4.2.0/xen/arch/x86/Makefile.orig 2012-05-12 16:40:48.000000000 +0100
++++ xen-4.2.0/xen/arch/x86/Makefile 2012-08-02 21:47:39.849910608 +0100
+@@ -126,18 +126,18 @@
+ $(TARGET).efi: guard = $(if $(shell echo efi/dis* | grep disabled),:)
+ $(TARGET).efi: prelink-efi.o efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc
+ $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
+- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
++ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \
+ $(BASEDIR)/common/symbols-dummy.o -o $(@D)/.$(@F).$(base).0 &&) :
+ $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S
+ $(guard) $(NM) -n $(@D)/.$(@F).$(VIRT_BASE).0 | $(guard) $(BASEDIR)/tools/symbols >$(@D)/.$(@F).0s.S
+ $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o
+ $(foreach base, $(VIRT_BASE) $(ALT_BASE), \
+- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
++ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \
+ $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o -o $(@D)/.$(@F).$(base).1 &&) :
+ $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S
+ $(guard) $(NM) -n $(@D)/.$(@F).$(VIRT_BASE).1 | $(guard) $(BASEDIR)/tools/symbols >$(@D)/.$(@F).1s.S
+ $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o
+- $(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
++ $(guard) $(LD_EFI) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \
+ $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o -o $@
+ if $(guard) false; then rm -f $@; echo 'EFI support disabled'; fi
+ rm -f $(@D)/.$(@F).[0-9]*
+--- xen-4.2.0/xen/arch/x86/efi/Makefile.orig 2012-05-12 16:40:48.000000000 +0100
++++ xen-4.2.0/xen/arch/x86/efi/Makefile 2012-08-02 22:01:43.956357825 +0100
+@@ -6,7 +6,7 @@
+
+ efi := $(filter y,$(x86_64)$(shell rm -f disabled))
+ efi := $(if $(efi),$(shell $(CC) $(filter-out $(CFLAGS-y),$(CFLAGS)) -c check.c 2>disabled && echo y))
+-efi := $(if $(efi),$(shell $(LD) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
++efi := $(if $(efi),$(shell $(LD_EFI) -mi386pep --subsystem=10 -o check.efi check.o 2>disabled && echo y))
+ efi := $(if $(efi),$(shell rm disabled)y,$(shell $(call create,boot.init.o); $(call create,runtime.o)))
+
+ extra-$(efi) += boot.init.o relocs-dummy.o runtime.o compat.o
+--- xen-4.2.0/xen/Makefile.orig 2012-07-30 19:21:20.000000000 +0100
++++ xen-4.2.0/xen/Makefile 2012-08-02 22:07:22.801121685 +0100
+@@ -13,6 +13,8 @@
+ export XEN_ROOT := $(BASEDIR)/..
+
+ EFI_MOUNTPOINT ?= /boot/efi
++EFI_VENDOR=fedora
++LD_EFI ?= $(LD)
+
+ .PHONY: default
+ default: build
diff --git a/xen.spec b/xen.spec
index d653de4..f584b5c 100644
--- a/xen.spec
+++ b/xen.spec
@@ -3,6 +3,13 @@
# or ocamlopt is missing (the xen makefile doesn't build ocaml bits if it isn't there)
%define with_ocaml %{?_without_ocaml: 0} %{?!_without_ocaml: 1}
%define build_ocaml %(test -x %{_bindir}/ocamlopt && echo %{with_ocaml} || echo 0)
+# build an efi boot image (where supported) unless rpmbuild was run with
+# --without efi
+%define build_efi %{?_without_efi: 0} %{?!_without_efi: 1}
+# xen only supports efi boot images on x86_64
+%ifnarch x86_64
+%define build_efi 0
+%endif
%if "%dist" >= ".fc17"
%define with_sysv 0
%else
@@ -15,12 +22,12 @@
%endif
# Hypervisor ABI
-%define hv_abi 4.1
+%define hv_abi 4.2
Summary: Xen is a virtual machine monitor
Name: xen
-Version: 4.1.3
-Release: 6%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
Group: Development/Libraries
License: GPLv2+ and LGPLv2+ and BSD
URL: http://xen.org/
@@ -33,7 +40,6 @@ Source11: newlib-1.16.0.tar.gz
Source12: zlib-1.2.3.tar.gz
Source13: pciutils-2.2.9.tar.bz2
Source14: grub-0.97.tar.gz
-Source15: ipxe-git-v1.0.0.tar.gz
# init.d bits
Source20: init.xenstored
Source21: init.xenconsoled
@@ -53,42 +59,32 @@ Source45: xenconsoled.service
Source46: xen-watchdog.service
Source47: xendomains.service
Source48: libexec.xendomains
+Source49: tmpfiles.d.xen.conf
Patch1: xen-initscript.patch
Patch4: xen-dumpdir.patch
Patch5: xen-net-disable-iptables-on-bridge.patch
-Patch23: grub-ext4-support.patch
Patch28: pygrubfix.patch
Patch34: xend.catchbt.patch
Patch35: xend-pci-loop.patch
-Patch38: xen-backend.rules.patch
Patch39: xend.selinux.fixes.patch
-Patch40: pygrub.size.limits.patch
-Patch45: xen-no-pyxml.patch
-
-Patch50: upstream-23936:cdb34816a40a-rework
-Patch51: upstream-23937:5173834e8476
-Patch52: upstream-23938:fa04fbd56521-rework
-Patch53: upstream-23939:51288f69523f-rework
-Patch54: upstream-23940:187d59e32a58
-
-Patch60: xen-4.1-testing.23349.patch
-Patch61: xen-4.1-testing.23350.patch
-Patch62: xen-4.1-testing.23351.patch
-Patch63: xen-4.1-testing.23352.patch
-Patch64: qemu-xen-4.1-testing.git-3220480734832a148d26f7a81f90af61c2ecfdd9.patch
-Patch65: qemu-xen-4.1-testing.git-d7d453f51459b591faa96d1c123b5bfff7c5b6b6.patch
+Patch46: xen.use.fedora.seabios.patch
+Patch47: xen.use.fedora.ipxe.patch
+Patch48: qemu-xen.tradonly.patch
+Patch49: xen.fedora.efi.build.patch
Patch100: xen-configure-xend.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel
-BuildRequires: libX11-devel python-devel ghostscript
-BuildRequires: texlive-latex texlive-times texlive-courier texlive-helvetic
+BuildRequires: libX11-devel python-devel ghostscript texlive-latex
+%if "%dist" >= ".fc18"
+BuildRequires: texlive-times texlive-courier texlive-helvetic
+%endif
BuildRequires: ncurses-devel gtk2-devel libaio-devel
# for the docs
-BuildRequires: perl texinfo
+BuildRequires: perl texinfo graphviz
# so that the makefile knows to install udev rules
BuildRequires: udev
%ifnarch ia64
@@ -106,10 +102,14 @@ BuildRequires: pciutils-devel
BuildRequires: libuuid-devel
# iasl needed to build hvmloader
BuildRequires: iasl
+# build using Fedora seabios and ipxe packages for roms
+BuildRequires: seabios-bin ipxe-roms-qemu
# modern compressed kernels
BuildRequires: bzip2-devel xz-devel
# libfsimage
BuildRequires: e2fsprogs-devel
+# tools now require yajl
+BuildRequires: yajl-devel
Requires: bridge-utils
Requires: python-lxml
Requires: udev >= 059
@@ -124,6 +124,10 @@ ExclusiveArch: %{ix86} x86_64 ia64
%if %with_ocaml
BuildRequires: ocaml, ocaml-findlib
%endif
+# efi image needs an ld that has -mi386pep option
+%if %build_efi
+BuildRequires: mingw64-binutils
+%endif
%description
This package contains the XenD daemon and xm command line
@@ -227,39 +231,30 @@ manage Xen virtual machines.
%patch28 -p1
%patch34 -p1
%patch35 -p1
-%patch38 -p1
%patch39 -p1
-%patch40 -p1
-%patch45 -p1
-
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1
-%patch64 -p1
-%patch65 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
%patch100 -p1
# stubdom sources
cp -v %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom
-cp -v %{PATCH23} stubdom/grub.patches/99grub-ext4-support.patch
-cp -v %{SOURCE15} tools/firmware/etherboot/ipxe.tar.gz
%build
%if !%build_ocaml
%define ocaml_flags OCAML_TOOLS=n
%endif
+%if %build_efi
+%define efi_flags LD_EFI=/usr/x86_64-w64-mingw32/bin/ld
+mkdir -p dist/install/boot/efi/efi/fedora
+%endif
export XEN_VENDORVERSION="-%{release}"
export CFLAGS="$RPM_OPT_FLAGS"
-make %{?_smp_mflags} prefix=/usr dist-xen
+make %{?_smp_mflags} %{?efi_flags} prefix=/usr dist-xen
+./configure --libdir=%{_libdir}
make %{?_smp_mflags} %{?ocaml_flags} prefix=/usr dist-tools
make prefix=/usr dist-docs
unset CFLAGS
@@ -271,10 +266,16 @@ rm -rf %{buildroot}
%if %build_ocaml
mkdir -p %{buildroot}%{_libdir}/ocaml/stublibs
%endif
-make DESTDIR=%{buildroot} prefix=/usr install-xen
+%if %build_efi
+mkdir -p %{buildroot}/boot/efi/efi/fedora
+%endif
+make DESTDIR=%{buildroot} %{?efi_flags} prefix=/usr install-xen
make DESTDIR=%{buildroot} %{?ocaml_flags} prefix=/usr install-tools
make DESTDIR=%{buildroot} prefix=/usr install-docs
make DESTDIR=%{buildroot} %{?ocaml_flags} prefix=/usr install-stubdom
+%if %build_efi
+mv %{buildroot}/boot/efi/efi %{buildroot}/boot/efi/EFI
+%endif
############ debug packaging: list files ############
@@ -317,6 +318,11 @@ rm -rf %{buildroot}/usr/info
# adhere to Static Library Packaging Guidelines
rm -rf %{buildroot}/%{_libdir}/*.a
+%if %build_efi
+# clean up extra efi files
+rm -rf %{buildroot}/%{_libdir}/efi
+%endif
+
############ fixup files in /etc ############
# udev
@@ -366,6 +372,8 @@ install -m 644 %{SOURCE46} %{buildroot}%{_unitdir}/xen-watchdog.service
install -m 644 %{SOURCE47} %{buildroot}%{_unitdir}/xendomains.service
mkdir -p %{buildroot}%{_libexecdir}
install -m 644 %{SOURCE48} %{buildroot}%{_libexecdir}/xendomains
+mkdir -p %{buildroot}/usr/lib/tmpfiles.d
+install -m 644 %{SOURCE49} %{buildroot}/usr/lib/tmpfiles.d/xen.conf
%endif
# config file only used for hotplug, Fedora uses udev instead
@@ -549,6 +557,7 @@ rm -rf %{buildroot}
%{_unitdir}/blktapctrl.service
%{_unitdir}/xenconsoled.service
%{_unitdir}/xen-watchdog.service
+/usr/lib/tmpfiles.d/xen.conf
%endif
%config(noreplace) %{_sysconfdir}/sysconfig/xenstored
@@ -557,6 +566,7 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/sysconfig/xencommons
%config(noreplace) %{_sysconfdir}/xen/xl.conf
%config(noreplace) %{_sysconfdir}/xen/cpupool
+%config(noreplace) %{_sysconfdir}/xen/xlexample*
# Auto-load xen backend drivers
%attr(0755,root,root) %{_sysconfdir}/sysconfig/modules/%{name}.modules
@@ -577,6 +587,10 @@ rm -rf %{buildroot}
%{_mandir}/man1/xentop.1*
%{_mandir}/man1/xentrace_format.1*
%{_mandir}/man8/xentrace.8*
+%{_mandir}/man1/xl.1*
+%{_mandir}/man5/xl.cfg.5*
+%{_mandir}/man5/xl.conf.5*
+%{_mandir}/man5/xlcpupool.cfg.5*
%{python_sitearch}/fsimage.so
%{python_sitearch}/grub
@@ -591,11 +605,13 @@ rm -rf %{buildroot}
/usr/lib/%{name}/bin/stubdom-dm
/usr/lib/%{name}/bin/qemu-dm
/usr/lib/%{name}/bin/stubdompath.sh
+/usr/lib/%{name}/bin/xenpaging
%endif
%dir /usr/lib/%{name}/boot
# HVM loader is always in /usr/lib regardless of multilib
/usr/lib/xen/boot/hvmloader
/usr/lib/xen/boot/ioemu-stubdom.gz
+/usr/lib/xen/boot/xenstore-stubdom.gz
/usr/lib/xen/boot/pv-grub*.gz
%endif
# General Xen state
@@ -643,7 +659,6 @@ rm -rf %{buildroot}
%{_sbindir}/xenconsoled
%{_sbindir}/xenlockprof
%{_sbindir}/xenmon.py*
-%{_sbindir}/xenpaging
%{_sbindir}/xentop
%{_sbindir}/xentrace_setmask
%{_sbindir}/xenbaked
@@ -654,6 +669,8 @@ rm -rf %{buildroot}
%{_sbindir}/xenwatchdogd
%{_sbindir}/xl
%{_sbindir}/xsview
+%{_sbindir}/xen-lowmemd
+%{_sbindir}/xen-ringwatch
# Xen logfiles
%dir %attr(0700,root,root) %{_localstatedir}/log/xen
@@ -665,6 +682,9 @@ rm -rf %{buildroot}
/boot/xen-syms-*
/boot/xen-*.gz
/boot/xen.gz
+%if %build_efi
+/boot/efi/EFI/fedora/*.efi
+%endif
%files doc
%defattr(-,root,root)
@@ -677,6 +697,8 @@ rm -rf %{buildroot}
%{_includedir}/*.h
%dir %{_includedir}/xen
%{_includedir}/xen/*
+%dir %{_includedir}/xenstore-compat
+%{_includedir}/xenstore-compat/*
%{_libdir}/*.so
%files licenses
@@ -693,6 +715,7 @@ rm -rf %{buildroot}
%{_libdir}/ocaml/stublibs/*.so
%{_libdir}/ocaml/stublibs/*.so.owner
%{_sbindir}/oxenstored
+%config(noreplace) %{_sysconfdir}/xen/oxenstored.conf
%files ocaml-devel
%defattr(-,root,root)
@@ -702,6 +725,22 @@ rm -rf %{buildroot}
%endif
%changelog
+* Thu Oct 25 2012 Michael Young <m.a.young at durham.ac.uk> - 4.2.0-1
+- update to xen-4.2.0
+- rebase xen-net-disable-iptables-on-bridge.patch pygrubfix.patch
+- remove patches that are now upstream or with alternatives upstream
+- use ipxe and seabios from seabios-bin and ipxe-roms-qemu packages
+- xen tools now need ./configure to be run (x86_64 needs libdir set)
+- don't build upstream qemu version
+- amend list of files in package - relocate xenpaging
+ add /etc/xen/xlexample* oxenstored.conf /usr/include/xenstore-compat/*
+ xenstore-stubdom.gz xen-lowmemd xen-ringwatch xl.1.gz xl.cfg.5.gz
+ xl.conf.5.gz xlcpupool.cfg.5.gz
+- use a tmpfiles.d file to create /run/xen on boot
+- add BuildRequires for yajl-devel and graphviz
+- build an efi boot image where it is supported
+- adjust texlive changes so spec file still works on Fedora 17
+
* Thu Oct 18 2012 Michael Young <m.a.young at durham.ac.uk> - 4.1.3-6
- add font packages to build requires due to 2012 version of texlive in F19
- use build requires of texlive-latex instead of tetex-latex which it
diff --git a/xen.use.fedora.ipxe.patch b/xen.use.fedora.ipxe.patch
new file mode 100644
index 0000000..4588474
--- /dev/null
+++ b/xen.use.fedora.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 @@
+ # Sun Mar 11 09:27:07 2012 -0400
+ # Update version to 1.6.3.2
+
+-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/xen.use.fedora.seabios.patch b/xen.use.fedora.seabios.patch
new file mode 100644
index 0000000..86d46aa
--- /dev/null
+++ b/xen.use.fedora.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
+
More information about the scm-commits
mailing list