SHA256
1
0
forked from pool/xen
OBS User unknown
2008-07-18 23:04:37 +00:00
committed by Git OBS Bridge
parent 8ae8ea2a74
commit f5d6338f4d
101 changed files with 2069 additions and 10556 deletions

237
xen.spec
View File

@@ -1,5 +1,5 @@
#
# spec file for package xen (Version 3.2.1_16881_04)
# spec file for package xen (Version 3.3.0_17990_01)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,16 @@
Name: xen
%define xvers 3.2
%define xvers 3.3
%define xvermaj 3
%define changeset 16881
%define xen_build_dir xen-3.2.1-testing
%define changeset 17990
%define xen_build_dir xen-3.3.0-testing
%if %sles_version
%define with_kmp 1
%else
%define with_kmp 0
%endif
BuildRequires: LibVNCServer-devel SDL-devel autoconf automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel transfig
BuildRequires: LibVNCServer-devel SDL-devel automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel transfig
%if %suse_version >= 1030
BuildRequires: texlive texlive-latex
%else
@@ -33,14 +33,14 @@ BuildRequires: glibc-32bit glibc-devel-32bit
%if %{?with_kmp}0
BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11
%endif
Version: 3.2.1_16881_04
Release: 5
Version: 3.3.0_17990_01
Release: 1
License: GPL v2 only
Group: System/Kernel
AutoReqProv: on
PreReq: %insserv_prereq %fillup_prereq
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
Source0: xen-3.2.1-testing-src.tar.bz2
Source0: xen-3.3.0-testing-src.tar.bz2
Source2: README.SuSE
Source3: boot.xen
Source4: boot.local.xenU
@@ -60,41 +60,6 @@ Source18: init.xen_loop
Source23: etc_pam.d_xen-api
Source24: xenapiusers
# Upstream patches
Patch0: 16716-xend-version.patch
Patch1: 16718-batched-mmu-updates.patch
Patch2: 16740-suse-ifup.patch
Patch3: 16769-pci-high-memory-resource.patch
Patch4: 16873-net-nat.patch
Patch5: 16877-blktap.patch
Patch6: 16883-xend-crashed-state.patch
Patch7: 16884-xend-rename-restart.patch
Patch8: 16885-xend-config-comments.patch
Patch9: 16886-xenstore-leak.patch
Patch10: 16890-xenapi-version.patch
Patch11: 16931-hvm-hap-param.patch
Patch12: 16933-hvm-hap-fix.patch
Patch13: 16939-hvm-hap-fix.patch
Patch14: 16947-fvmachine-xenstore.patch
Patch15: 16977-xend-restart-count.patch
Patch16: 16989-xend-coredump.patch
Patch17: 17006-make-aio-optional.patch
Patch18: 17017-hpet-configuration.patch
Patch19: 17124-numa-free-memory-size.patch
Patch20: 17131-numa-set-vcpu-affinity.patch
Patch21: 17190-remove-hap-boot-param.patch
Patch22: 17191-remove-hap-boot-param-doc.patch
Patch23: 17209-xentop.patch
Patch24: 17210-xenapi-defaults.patch
Patch25: 17211-xenapi-defaults.patch
Patch26: 17212-xenapi-defaults.patch
Patch27: 17233-hap-check.patch
Patch28: 17246-numa-node-selection-fix.patch
Patch29: 17248-hvm-ignore-USB-RMRR.patch
Patch30: 17315-windows-bug-check-0x101-fix.patch
Patch31: 17500-hvm-load-diags.patch
Patch32: 17505-shadow-l1e-table-fix.patch
Patch33: 17526-variable-delay-timestamps-fix.patch
Patch34: 17532-xenstored-abort-fix.patch
# Our patches
Patch100: xen-config.diff
Patch101: xend-config.diff
@@ -136,20 +101,21 @@ Patch151: bridge-vlan.diff
Patch152: bridge-bonding.diff
Patch153: bridge-hostonly.diff
Patch154: bridge-record-creation.patch
Patch155: xen-fbback-resize.patch
Patch156: xend-core-dump-loc.diff
Patch157: blktap.patch
Patch158: xen-api-auth.patch
Patch159: pv_32_16_color_trans.patch
Patch160: xen-qemu-iscsi-fix.patch
Patch161: keymap-vm.patch
Patch162: keymap_nl-be.patch
Patch163: key-shift-escape.patch
Patch164: key-altgr.patch
Patch165: xen-shift-key.patch
Patch166: xen-pvfb-security.patch
Patch167: xen-vnc-resize.patch
Patch168: xen-qcow-aio_init.patch
Patch155: xend-core-dump-loc.diff
Patch156: blktap.patch
Patch157: xen-api-auth.patch
Patch158: pv_32_16_color_trans.patch
Patch159: xen-qemu-iscsi-fix.patch
Patch160: keymap-vm.patch
Patch161: xen-vnc-resize.patch
# Patches for snapshot support
Patch170: snapshot-ioemu-save.patch
Patch171: snapshot-ioemu-restore.patch
Patch172: snapshot-xend.patch
Patch173: ioemu-qcow2-multiblock-aio.patch
Patch174: ioemu-blktap-image-format.patch
Patch175: blktapctrl-default-to-ioemu.patch
Patch176: ioemu-blktap-barriers.patch
# Maybe later
Patch200: hvm-ide-flush-o_direct.patch
# Patches from Jan
@@ -173,17 +139,8 @@ Patch352: pvdrv_emulation_control.patch
Patch400: ns_tools.patch
Patch401: ns_xen_base.patch
Patch402: ns_xen_extension.patch
# Intel EPT / VPID patches
Patch500: ept-novell-x64.patch
Patch501: vpid-novell-x64.patch
Patch502: livemig-ept-novell-x64.patch
Patch503: ept-2m-x64.patch
Patch504: ept-novell-i386.patch
Patch505: vpid-novell-i386.patch
Patch506: livemig-ept-novell-i386.patch
Patch507: ept-livemgr-x86-miss.patch
Patch508: vtd-fix.patch
Patch509: ept-supported-fix.patch
# Temporary patch - remove as soon as kernel is updated
Patch900: tmp-revert-blktapctrl.patch
Url: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
@@ -514,41 +471,6 @@ Authors:
%prep
%setup -q -n %xen_build_dir
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
%patch28 -p1
%patch29 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
@@ -572,10 +494,10 @@ Authors:
%patch124 -p1
%patch125 -p1
%patch126 -p1
%patch127 -p1
%patch130 -p1
%patch131 -p1
%patch132 -p1
#%patch127 -p1 Not needed anymore?
#%patch130 -p1 xen/include/public/foreign/ directory no longer exists
#%patch131 -p1
#%patch132 -p1
%patch133 -p1
%patch134 -p1
%patch135 -p1
@@ -596,45 +518,36 @@ Authors:
%patch159 -p1
%patch160 -p1
%patch161 -p1
%patch162 -p1
%patch163 -p1
%patch164 -p1
%patch165 -p1
%patch166 -p1
%patch167 -p1
%patch168 -p1
%patch170 -p1
%patch171 -p1
%patch172 -p1
%patch173 -p1
%patch174 -p1
%patch175 -p1
%patch176 -p1
#%patch200 -p1
%patch240 -p1
%patch241 -p1
%patch242 -p1
%patch243 -p1
%patch244 -p1
%patch245 -p1
%patch246 -p1
%patch247 -p1
%patch248 -p1
#%patch240 -p1 Upstream?
#%patch241 -p1 Upstream?
#%patch242 -p1 Upstream?
#%patch243 -p1 Upstream?
#%patch244 -p1 Upstream?
#%patch245 -p1 Upstream?
#%patch246 -p1 if upstream, has since been modified
#%patch247 -p1 ??
#%patch248 -p1 Upstream?
%patch249 -p1
%patch250 -p1
%patch251 -p1
#%patch250 -p1 Upstream?
#%patch251 -p1 Upstream?
%patch350 -p1
%patch351 -p1
%patch352 -p1
%ifarch x86_64
%patch400 -p1
%patch401 -p1
%patch402 -p1
%patch500 -p1
%patch501 -p1
%patch502 -p1
%patch503 -p1
%else
%patch504 -p1
%patch505 -p1
%patch506 -p1
%patch507 -p1
%endif
%patch508 -p1
%patch509 -p1
# Don't use shim for now
#%ifarch x86_64
#%patch400 -p1
#%patch401 -p1
#%patch402 -p1
#%endif
%patch900 -p1
%build
XEN_EXTRAVERSION=%version-%release
@@ -644,7 +557,7 @@ sed -i "s/XEN_CHANGESET[\t ]*=.*\$/XEN_CHANGESET = %{changeset}/" xen/Makefi
RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/}
export CFLAGS="${RPM_OPT_FLAGS}"
export RPM_OPT_FLAGS
make -C xen/include/public/foreign
make -C tools/include/xen-foreign
make tools docs
%if %{?with_kmp}0
# pv driver modules
@@ -698,7 +611,8 @@ make -C xen clean
%endif
export CFLAGS="$RPM_OPT_FLAGS"
export RPM_OPT_FLAGS
make -C xen/include/public/foreign
#make -C xen/include/public/foreign
make -C tools/include/xen-foreign
# tools
export XEN_PYTHON_NATIVE_INSTALL=1
make -C tools install \
@@ -801,11 +715,12 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
%files tools
%defattr(-,root,root)
/usr/bin/lomount
#/usr/bin/lomount
/usr/bin/xencons
/usr/bin/xenperf
/usr/bin/xenstore*
/usr/bin/xentrace*
/usr/bin/pygrub
/usr/sbin/blktapctrl
/usr/sbin/flask-loadpolicy
/usr/sbin/img2qcow
@@ -814,6 +729,7 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
/usr/sbin/rcxend
/usr/sbin/rcxendomains
/usr/sbin/tapdisk
/usr/sbin/tapdisk-ioemu
/usr/sbin/xen*
/usr/sbin/xm
/usr/sbin/xsview
@@ -830,6 +746,7 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
%{_libdir}/xen/bin/xc_save
%{_libdir}/xen/bin/xenconsole
%{_libdir}/xen/bin/xenctx
%{_libdir}/xen/bin/lsevtchn
%{_mandir}/man1/*.1.gz
%{_mandir}/man5/*.5.gz
%{_mandir}/man8/*.8.gz
@@ -871,6 +788,7 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
%{_defaultdocdir}/xen/boot.xen
%{_defaultdocdir}/xen/misc
%dir %pysite/xen
%dir %pysite/grub
# formerly tools-ioemu
%dir %{_datadir}/xen
%dir %{_datadir}/xen/qemu
@@ -879,13 +797,15 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
%{_libdir}/xen/bin/qemu-dm
%ifarch x86_64
/usr/lib/xen/bin/qemu-dm
/usr/lib64/xen/bin/xc_kexec
#/usr/lib64/xen/bin/xc_kexec
%else
/usr/lib/xen/bin/xc_kexec
#/usr/lib/xen/bin/xc_kexec
%endif
/usr/lib/xen/boot/hvmloader
%pysite/xen/*
/usr/lib/xen/boot/domUloader.py
%pysite/grub/*
%pysite/fsimage.so
%files tools-domU
%defattr(-,root,root)
@@ -940,8 +860,33 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
/sbin/ldconfig
%changelog
* Tue Jul 08 2008 carnold@novell.com
- Updated to xen-unstable changeset 17990.
* Tue Jul 08 2008 kwolf@suse.de
- ioemu: Write barriers for blktap devices
ioemu-blktap-barriers.patch
* Thu Jul 03 2008 kwolf@suse.de
- blktapctrl defaults to using ioemu instead of tapdisk now
blktapctrl-default-to-ioemu.patch
- Now that ioemu is default, it can be called with image paths
starting e.g. with tap:qcow2. If the image format is specified,
it has to be respected and no guessing on the image file must
happen.
ioemu-blktap-image-format.patch
- qcow2: Read/Write multiple sectors at once if possible to
improve performance.
ioemu-qcow2-multiblock-aio.patch
* Thu Jun 12 2008 kwolf@novell.com
- Add snapshot support to ioemu and blktapctrl
snapshot-ioemu-save.patch
snapshot-ioemu-restore.patch
* Fri Jun 06 2008 jfehlig@novell.com
- bnc#397890 - Create and own /var/lib/xen/dump
* Thu Jun 05 2008 kwolf@novell.com
- Fix tapdisk for qcow2 images > 2 GB
1xxxx-qcow2-2gb-bug.patch
* Thu Jun 05 2008 jfehlig@novell.com
- Updated to xen-unstable changeset 17772.
* Tue May 27 2008 plc@novell.com
- bnc#381368 - boot qcow image fix.
* Fri May 23 2008 jfehlig@novell.com