Accepting request 286540 from Virtualization

Fix to spec file to not build KMPs for pvops kernel flavor - resubmit

OBS-URL: https://build.opensuse.org/request/show/286540
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=200
This commit is contained in:
2015-02-18 19:36:09 +00:00
committed by Git OBS Bridge
2 changed files with 20 additions and 8 deletions

View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Feb 17 10:48:56 MST 2015 - carnold@suse.com
- bnc#918169 - XEN fixes required to work with Kernel 3.19.0
xen.spec
-------------------------------------------------------------------
Tue Feb 10 16:06:40 UTC 2015 - ohering@suse.de
- Package xen.changes because its referenced in xen.spec
-------------------------------------------------------------------
Wed Jan 28 08:44:32 MST 2015 - carnold@suse.com

View File

@@ -149,7 +149,7 @@ BuildRequires: xorg-x11-util-devel
%endif
%endif
Version: 4.5.0_02
Version: 4.5.0_03
Release: 0
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
License: GPL-2.0
@@ -160,6 +160,7 @@ Source2: qemu-xen-traditional-dir-remote.tar.bz2
Source3: qemu-xen-dir-remote.tar.bz2
Source4: seabios-dir-remote.tar.bz2
Source5: ipxe.tar.bz2
Source9: xen.changes
Source10: README.SUSE
Source11: boot.xen
Source12: boot.local.xenU
@@ -285,7 +286,7 @@ Url: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define pyver %(python -c "import sys; print sys.version[:3]")
%if %{?with_kmp}0
%suse_kernel_module_package -n xen um xen -f kmp_filelist
%suse_kernel_module_package -n xen um pv xen -f kmp_filelist
%endif
%description
@@ -594,13 +595,13 @@ XEN_BUILD_TIME="`date -u -d '1970-01-01' +%%T`"
SMBIOS_DATE="`date -u -d '1970-01-01' +%%m/%%d/%%Y`"
RELDATE="`date -u -d '1970-01-01' '+%%d %%b %%Y'`"
SEABIOS_DATE="`date -u -d '1970-01-01' '+?-%%Y%%m%%d_%%H%%M%%S-buildhost'`"
if test -r $RPM_SOURCE_DIR/xen.changes
if test -r %{S:9}
then
XEN_BUILD_DATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' $RPM_SOURCE_DIR/xen.changes)\" `"
XEN_BUILD_TIME="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' $RPM_SOURCE_DIR/xen.changes)\" +%%T`"
SMBIOS_DATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' $RPM_SOURCE_DIR/xen.changes)\" +%%m/%%d/%%Y`"
RELDATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' $RPM_SOURCE_DIR/xen.changes)\" '+%%d %%b %%Y'`"
SEABIOS_DATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' $RPM_SOURCE_DIR/xen.changes)\" '+?-%%Y%%m%%d_%%H%%M%%S-buildhost'`"
XEN_BUILD_DATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' %{S:9})\" `"
XEN_BUILD_TIME="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' %{S:9})\" +%%T`"
SMBIOS_DATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' %{S:9})\" +%%m/%%d/%%Y`"
RELDATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' %{S:9})\" '+%%d %%b %%Y'`"
SEABIOS_DATE="` date -u -d \"$(sed -n '/@/{s/ - .*$//p;q}' %{S:9})\" '+?-%%Y%%m%%d_%%H%%M%%S-buildhost'`"
fi
cat > .our_xenversion <<_EOV_
export WGET=$(type -P false)