OBS User unknown
2008-08-17 22:24:29 +00:00
committed by Git OBS Bridge
parent f5d6338f4d
commit 8cefe055e5
67 changed files with 1102 additions and 2615 deletions

144
xen.spec
View File

@@ -1,10 +1,17 @@
#
# spec file for package xen (Version 3.3.0_17990_01)
# spec file for package xen (Version 3.3.0_18314_02)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -14,14 +21,14 @@
Name: xen
%define xvers 3.3
%define xvermaj 3
%define changeset 17990
%define changeset 18314
%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 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 git 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,7 +40,7 @@ BuildRequires: glibc-32bit glibc-devel-32bit
%if %{?with_kmp}0
BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11
%endif
Version: 3.3.0_17990_01
Version: 3.3.0_18314_02
Release: 1
License: GPL v2 only
Group: System/Kernel
@@ -66,11 +73,11 @@ Patch101: xend-config.diff
Patch102: xen-destdir.diff
Patch103: xen-rpmoptflags.diff
Patch104: xen-warnings.diff
Patch105: xen-changeset.diff
Patch106: xen-paths.diff
Patch107: xen-xmexample.diff
Patch108: xen-xmexample-nbd.diff
Patch109: xen-fixme-doc.diff
Patch106: xen-changeset.diff
Patch107: xen-paths.diff
Patch108: xen-xmexample.diff
Patch109: xen-xmexample-nbd.diff
Patch110: xen-fixme-doc.diff
Patch111: xen-domUloader.diff
Patch112: xen-no-dummy-nfs-ip.diff
Patch113: serial-split.patch
@@ -93,8 +100,7 @@ Patch134: xenapi-console-protocol.patch
Patch135: xen-disable-qemu-monitor.diff
Patch136: supported_module.diff
Patch137: qemu-security-etch1.diff
Patch138: vnc-i18n-keys.diff
Patch139: rpmlint.diff
Patch138: rpmlint.diff
Patch140: cdrom-removable.patch
Patch150: bridge-opensuse.patch
Patch151: bridge-vlan.diff
@@ -104,33 +110,24 @@ Patch154: bridge-record-creation.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
Patch158: xen-qemu-iscsi-fix.patch
# Patches for snapshot support
Patch169: ioemu-blktap-fix-open.patch
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
Patch175: build-tapdisk-ioemu.patch
Patch176: blktapctrl-default-to-ioemu.patch
Patch177: ioemu-blktap-barriers.patch
# Jim's domain lock patch
Patch190: xend-domain-lock.patch
# Patches from Jan
Patch240: xenctx.patch
Patch241: const-callback-arg.patch
Patch242: const-set-trap-table-arg.patch
Patch243: pv-drv-mkbuildtree.patch
Patch244: x86-compat-vcpu-op.patch
Patch245: x86-show-page-walk-early.patch
Patch246: svm-lmsl.patch
Patch247: x86_emulate.patch
Patch248: x86-pgtable-no-biglock.patch
Patch249: x86-extra-trap-info.patch
Patch240: x86-show-page-walk-early.patch
Patch241: svm-lmsl.patch
Patch242: x86-extra-trap-info.patch
Patch250: 32on64-extra-mem.patch
Patch251: x86-domain-shutdown-latency.patch
# PV Driver Patches
Patch350: pv-driver-build.patch
Patch351: xen-ioemu-hvm-pv-support.diff
@@ -139,8 +136,6 @@ Patch352: pvdrv_emulation_control.patch
Patch400: ns_tools.patch
Patch401: ns_xen_base.patch
Patch402: ns_xen_extension.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()")
@@ -257,7 +252,7 @@ License: GPL v2 or later
Summary: Xen Virtualization: Control tools for domain 0
Group: System/Kernel
Requires: xen-libs = %{version}
Requires: bridge-utils multipath-tools python python-curses python-pam python-xml pyxml
Requires: bridge-utils multipath-tools python python-curses python-openssl python-pam python-xml pyxml
#Requires: ipcalc
# subpackage existed in 10.3
Provides: xen-tools-ioemu = 3.2
@@ -476,11 +471,11 @@ Authors:
%patch102 -p1
%patch103 -p1
%patch104 -p1
%patch105 -p1
%patch106 -p1
%patch107 -p1
%patch108 -p1
%patch109 -p1
#%patch109 -p1 Not Needed
%patch110 -p1
%patch111 -p1
%patch112 -p1
%patch113 -p1
@@ -504,20 +499,17 @@ Authors:
%patch136 -p1
%patch137 -p1
%patch138 -p1
%patch139 -p1
%patch140 -p1
%patch150 -p1
%patch151 -p1
%patch152 -p1
#%patch153 -p1
#%patch153 -p1 hostonly
%patch154 -p1
%patch155 -p1
%patch156 -p1
%patch157 -p1
%patch158 -p1
%patch159 -p1
%patch160 -p1
%patch161 -p1
%patch169 -p1
%patch170 -p1
%patch171 -p1
%patch172 -p1
@@ -525,19 +517,12 @@ Authors:
%patch174 -p1
%patch175 -p1
%patch176 -p1
#%patch200 -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 Upstream?
#%patch251 -p1 Upstream?
%patch177 -p1
%patch190 -p1
%patch240 -p1
%patch241 -p1
%patch242 -p1
%patch250 -p1
%patch350 -p1
%patch351 -p1
%patch352 -p1
@@ -547,7 +532,6 @@ Authors:
#%patch401 -p1
#%patch402 -p1
#%endif
%patch900 -p1
%build
XEN_EXTRAVERSION=%version-%release
@@ -652,12 +636,12 @@ ln -s /etc/init.d/xendomains $RPM_BUILD_ROOT/usr/sbin/rcxendomains
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
install -m644 %SOURCE18 $RPM_BUILD_ROOT/etc/modprobe.d/xen_loop
# example config
mkdir -p $RPM_BUILD_ROOT/etc/xen/{vm,examples}
mkdir -p $RPM_BUILD_ROOT/etc/xen/{vm,examples,scripts}
mv $RPM_BUILD_ROOT/etc/xen/xmexample* $RPM_BUILD_ROOT/etc/xen/examples
rm $RPM_BUILD_ROOT/etc/xen/examples/*nbd
rm -f $RPM_BUILD_ROOT/etc/xen/examples/*nbd
install -m644 %SOURCE9 %SOURCE10 $RPM_BUILD_ROOT/etc/xen/examples/
# scripts
rm $RPM_BUILD_ROOT/etc/xen/scripts/block-*nbd
rm -f $RPM_BUILD_ROOT/etc/xen/scripts/block-*nbd
install -m755 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE16 %SOURCE17 $RPM_BUILD_ROOT/etc/xen/scripts/
# Xen API remote authentication files
install -d $RPM_BUILD_ROOT/etc/pam.d
@@ -680,15 +664,19 @@ ln -s /var/lib/xen/images $RPM_BUILD_ROOT/etc/xen/images
# Bootloader
install -m755 %SOURCE8 $RPM_BUILD_ROOT/usr/lib/xen/boot/
# udev support
mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
mv $RPM_BUILD_ROOT/etc/udev/rules.d/xen-backend.rules $RPM_BUILD_ROOT/etc/udev/rules.d/40-xen.rules
#%find_lang xen-vm # po files are misnamed upstream
# Clean up unpackaged files
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/qemu/
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xen/qemu/
rm -rf $RPM_BUILD_ROOT/%{_defaultdocdir}/xen/ps
rm $RPM_BUILD_ROOT/%{_mandir}/man1/qemu.*
rm $RPM_BUILD_ROOT/usr/sbin/netfix
rm $RPM_BUILD_ROOT/usr/lib*/xen/bin/qemu-dm.debug
rm -rf $RPM_BUILD_ROOT/usr/share/xen/man/man1/qemu/qemu*
rm -f $RPM_BUILD_ROOT/usr/share/xen/qemu/openbios-sparc32
rm -f $RPM_BUILD_ROOT/usr/share/xen/qemu/openbios-sparc64
rm -f $RPM_BUILD_ROOT/usr/sbin/netfix
rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
rm -rf $RPM_BUILD_ROOT/html
rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
%files
%defattr(-,root,root)
@@ -721,6 +709,8 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
/usr/bin/xenstore*
/usr/bin/xentrace*
/usr/bin/pygrub
/usr/bin/qemu-img-xen
/usr/bin/tapdisk-ioemu
/usr/sbin/blktapctrl
/usr/sbin/flask-loadpolicy
/usr/sbin/img2qcow
@@ -729,10 +719,10 @@ 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
/usr/sbin/fs-backend
%dir %{_libdir}/xen
%dir %{_libdir}/xen/bin
%ifarch x86_64
@@ -771,6 +761,7 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
/etc/xen/images
/etc/xen/qemu-ifup
/etc/xen/scripts
/etc/xen/README*
%config /etc/xen/vm
%config /etc/xen/*.sxp
%config /etc/xen/*.xml
@@ -791,9 +782,12 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
%dir %pysite/grub
# formerly tools-ioemu
%dir %{_datadir}/xen
%dir %{_datadir}/xen/man
%dir %{_datadir}/xen/man/man1
%dir %{_datadir}/xen/qemu
%dir %{_datadir}/xen/qemu/keymaps
%{_datadir}/xen/qemu/keymaps/*
%{_datadir}/xen/qemu/*
%{_datadir}/xen/man/man1/*
%{_libdir}/xen/bin/qemu-dm
%ifarch x86_64
/usr/lib/xen/bin/qemu-dm
@@ -860,6 +854,26 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
/sbin/ldconfig
%changelog
* Thu Aug 14 2008 jfehlig@novell.com
- Added patch to prevent starting same domU from multiple hosts.
Feature is disabled by default - see /etc/xen/xend-config.sxp.
fate#305062
* Mon Aug 11 2008 jfehlig@novell.com
- Added python-openssl to Requires list for xen-tools. This
package is required if SSL relocation is enabled by user.
* Mon Aug 11 2008 carnold@novell.com
- Updated to xen-unstable changeset 18309. Pre 3.3.0-rc4.
* Sat Aug 09 2008 jfehlig@novell.com
- Disabled xend-relocation-ssl-server for now. Certificates must
be created and feature needs testing.
* Fri Aug 08 2008 carnold@novell.com
- Update to xen-unstable changeset 18269 post RC3. Reverse
version back to 3.3.0 from 4.0.0.
* Wed Aug 06 2008 carnold@novell.com
- Updated to xen-unstable changeset 18242. Version changes from
3.3.0 to 4.0.0
* Mon Aug 04 2008 carnold@novell.com
- Updated to xen-unstable changeset 18210. Post 3.3.0-rc2.
* Tue Jul 08 2008 carnold@novell.com
- Updated to xen-unstable changeset 17990.
* Tue Jul 08 2008 kwolf@suse.de