This commit is contained in:
committed by
Git OBS Bridge
parent
0477e22fd2
commit
075d47716d
60
xen.spec
60
xen.spec
@@ -15,14 +15,13 @@ Name: xen
|
||||
%define xvermaj 3
|
||||
%define changeset 15042
|
||||
%define xen_build_dir xen-3.1-testing
|
||||
%define with_install 1
|
||||
%if %sles_version
|
||||
%define with_kmp 1
|
||||
%else
|
||||
# openSUSE 10.3 kernel is not yet ready...
|
||||
%define with_kmp 0
|
||||
%endif
|
||||
BuildRequires: LibVNCServer SDL-devel autoconf automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel openssl openssl-devel python-devel transfig update-desktop-files
|
||||
BuildRequires: LibVNCServer SDL-devel autoconf automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel openssl openssl-devel python-devel transfig
|
||||
%if %suse_version >= 1030
|
||||
BuildRequires: texlive texlive-latex
|
||||
%else
|
||||
@@ -35,14 +34,13 @@ BuildRequires: glibc-32bit glibc-devel-32bit
|
||||
BuildRequires: kernel-source kernel-syms xorg-x11
|
||||
%endif
|
||||
Version: 3.1.0_15042
|
||||
Release: 4
|
||||
Release: 5
|
||||
License: GNU General Public License (GPL)
|
||||
Group: System/Kernel
|
||||
Autoreqprov: on
|
||||
PreReq: %insserv_prereq %fillup_prereq
|
||||
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
|
||||
Source0: xen-3.1-testing-src.tar.bz2
|
||||
Source1: xen-vm-install.tar.bz2
|
||||
Source2: README.SuSE
|
||||
Source3: boot.xen
|
||||
Source4: boot.local.xenU
|
||||
@@ -60,13 +58,17 @@ Source17: sysconfig.xend
|
||||
Source18: network-multi
|
||||
# Upstream patches
|
||||
Patch0: 15048-localtime.diff
|
||||
Patch1: 15157_modified.patch
|
||||
Patch2: 00-domain-restore.patch
|
||||
Patch1: 15157_xend_device_destroy.patch
|
||||
Patch2: 15250_xend_device_destroy.patch
|
||||
Patch3: 15273_libxenapi.patch
|
||||
Patch4: 15274_xenapi.patch
|
||||
Patch5: 15275_xenapi.patch
|
||||
Patch6: 15410-domain-restore.patch
|
||||
Patch7: man-page.diff
|
||||
# Our patches
|
||||
Patch100: xen-config.diff
|
||||
Patch101: xend-config.diff
|
||||
Patch102: xen-destdir.diff
|
||||
Patch103: xen-vm-install.diff
|
||||
Patch104: xen-rpmoptflags.diff
|
||||
Patch105: xen-warnings.diff
|
||||
Patch106: xen-changeset.diff
|
||||
@@ -139,6 +141,7 @@ Patch196: x86-extra-trap-info.patch
|
||||
Patch197: x86-machine-check.patch
|
||||
Patch198: x86-emul-rf.patch
|
||||
Patch199: vmx-check-descr.patch
|
||||
Patch200: clear_DF_for_kernel.patch
|
||||
Patch300: xen-enable-hvm-debug.diff
|
||||
URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@@ -256,9 +259,6 @@ Summary: Xen Virtualization: Control tools for domain 0
|
||||
Group: System/Kernel
|
||||
Requires: xen-libs >= 3.1.0_15000
|
||||
Requires: bridge-utils multipath-tools python python-xml pyxml
|
||||
%if %{?with_install}0
|
||||
Requires: python-urlgrabber libxml2-python
|
||||
%endif
|
||||
AutoReqProv: on
|
||||
|
||||
%description tools
|
||||
@@ -515,17 +515,17 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q -n %xen_build_dir
|
||||
%setup -q -c -n %xen_build_dir/tools -D -T -a 1
|
||||
cd ..
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%if %{?with_install}0
|
||||
%patch103 -p1
|
||||
%endif
|
||||
%patch104 -p1
|
||||
%patch105 -p1
|
||||
%patch106 -p1
|
||||
@@ -597,13 +597,13 @@ cd ..
|
||||
%patch197 -p1
|
||||
%patch198 -p1
|
||||
%patch199 -p1
|
||||
%patch200 -p1
|
||||
XEN_EXTRAVERSION=%version-%release
|
||||
XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}}
|
||||
sed -i "s/XEN_EXTRAVERSION[\t ]*.=.*\$/XEN_EXTRAVERSION = $XEN_EXTRAVERSION/" xen/Makefile
|
||||
sed -i "s/XEN_CHANGESET[\t ]*=.*\$/XEN_CHANGESET = %{changeset}/" xen/Makefile
|
||||
|
||||
%build
|
||||
cd ..
|
||||
RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/}
|
||||
export CFLAGS="${RPM_OPT_FLAGS}"
|
||||
export RPM_OPT_FLAGS
|
||||
@@ -623,7 +623,6 @@ done
|
||||
|
||||
%install
|
||||
test ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
|
||||
cd ..
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
export RPM_OPT_FLAGS
|
||||
install_xen()
|
||||
@@ -719,9 +718,6 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/xen/save
|
||||
mkdir -p $RPM_BUILD_ROOT/var/lib/xen/xend-db/domain
|
||||
mkdir -p $RPM_BUILD_ROOT/var/lib/xen/xend-db/migrate
|
||||
mkdir -p $RPM_BUILD_ROOT/var/lib/xen/xend-db/vnet
|
||||
%if %{?with_install}0
|
||||
mkdir -p $RPM_BUILD_ROOT/var/lib/xen/vm-install
|
||||
%endif
|
||||
mkdir -p $RPM_BUILD_ROOT/var/log/xen
|
||||
mkdir -p $RPM_BUILD_ROOT/var/run/xenstored
|
||||
ln -s /var/lib/xen/images $RPM_BUILD_ROOT/etc/xen/images
|
||||
@@ -729,10 +725,7 @@ ln -s /var/lib/xen/images $RPM_BUILD_ROOT/etc/xen/images
|
||||
install -m755 %SOURCE8 $RPM_BUILD_ROOT/usr/lib/xen/boot/
|
||||
# udev support
|
||||
mv $RPM_BUILD_ROOT/etc/udev/rules.d/xen-backend.rules $RPM_BUILD_ROOT/etc/udev/rules.d/40-xen.rules
|
||||
%if %{?with_install}0
|
||||
%find_lang xen-vm-install xen.lang
|
||||
%endif
|
||||
#%find_lang xen-xm xen.lang # po files are misnamed upstream
|
||||
#%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/%{_defaultdocdir}/xen/ps
|
||||
@@ -740,7 +733,6 @@ 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 -f $RPM_BUILD_ROOT/%pysite/*.egg-info
|
||||
%suse_update_desktop_file xen-vm-install X-SuSE-YaST-Virtualization
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@@ -778,7 +770,7 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
|
||||
%{_libdir}/libfsimage.so.*
|
||||
%{_libdir}/libxen*.so.*
|
||||
|
||||
%files tools -f ../xen.lang
|
||||
%files tools
|
||||
%defattr(-,root,root)
|
||||
/usr/bin/lomount
|
||||
/usr/bin/xen-detect
|
||||
@@ -794,13 +786,6 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
|
||||
/usr/sbin/tapdisk
|
||||
/usr/sbin/xen*
|
||||
/usr/sbin/xm
|
||||
%if %{?with_install}0
|
||||
/usr/bin/vm-install*
|
||||
%{_datadir}/xen/install
|
||||
%dir /var/lib/xen/vm-install
|
||||
%dir %{_datadir}/applications/YaST2
|
||||
%{_datadir}/applications/YaST2/xen-vm-install.desktop
|
||||
%endif
|
||||
%dir %{_libdir}/xen
|
||||
%dir %{_libdir}/xen/bin
|
||||
%ifarch x86_64
|
||||
@@ -924,6 +909,15 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
|
||||
/sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Wed Jun 20 2007 - jfehlig@novell.com
|
||||
- Added upstream changesets 15273, 15274, and 15275.
|
||||
- Removed the modified 15157 patch. This patch was actually a
|
||||
consolidation of changesets 15157 and 15250. These changesets
|
||||
are now discrete patches to ease subsequent updates of Xen.
|
||||
* Wed Jun 20 2007 - ccoffing@novell.com
|
||||
- Split vm-install off as a separate package.
|
||||
- Update man page.
|
||||
- Update Ron Terry's network-multi script.
|
||||
* Mon Jun 18 2007 - ccoffing@novell.com
|
||||
- Fix compiler warnings.
|
||||
- Update block-npiv.
|
||||
|
Reference in New Issue
Block a user