pool/xen
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- bnc#863821 - Xen unable to boot paravirtualized VMs installed

Browse Source 
with btrfs.  Add 'Requires: grub2-x86_64-xen' to xen-tools.
- Restore soft links for qemu-system-i386 and qemu-dm
- Cleanup inconsistency in which version of qemu-system-i386 is
  being used (Xen vs qemu-x86).  Use only Xen's version.
  xen.spec

- Add conditionals for SLE12 when defining xend and max_cpus
  xen.spec

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=307
This commit is contained in:
Charles Arnold 2014-03-28 17:53:30 +00:00 committed by Git OBS Bridge
parent 314583a822
commit a094869852
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xen.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Fri Mar 28 11:00:07 MDT 2014 - carnold@suse.com
- bnc#863821 - Xen unable to boot paravirtualized VMs installed
with btrfs. Add 'Requires: grub2-x86_64-xen' to xen-tools.
- Restore soft links for qemu-system-i386 and qemu-dm
- Cleanup inconsistency in which version of qemu-system-i386 is
being used (Xen vs qemu-x86). Use only Xen's version.
xen.spec
-------------------------------------------------------------------
Wed Mar 27 14:18:06 MDT 2014 - carnold@suse.com
- Add conditionals for SLE12 when defining xend and max_cpus
xen.spec
-------------------------------------------------------------------
Wed Mar 19 14:18:06 MDT 2014 - carnold@suse.com

31
xen.spec
View File

@ -41,10 +41,18 @@ ExclusiveArch: %ix86 x86_64 %arm aarch64
%define with_qemu_traditional 1
%define with_xend_tools_pkg 0
%if %suse_version > 1230
%if %suse_version == 1315
%define with_xend_tools_pkg 0
%else
%define with_xend_tools_pkg 1
%endif
%endif
%if %suse_version > 1230
%if %suse_version == 1315
%define with_xend 0
%else
%define with_xend 1
%endif
%else
%define with_xend 1
%endif
@ -56,8 +64,12 @@ ExclusiveArch: %ix86 x86_64 %arm aarch64
#
%define max_cpus 4
%ifarch x86_64
%if %suse_version == 1315
%define max_cpus 1024
%else
%define max_cpus 512
%endif
%endif
#
%define xen_install_suffix %{nil}
%ifarch x86_64
@ -84,19 +96,19 @@ BuildRequires: libfdt1-devel
%ifarch %ix86 x86_64
BuildRequires: dev86
%endif
BuildRequires: flex
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: glib2-devel
BuildRequires: libaio-devel
BuildRequires: libbz2-devel
BuildRequires: libpixman-1-0-devel
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
BuildRequires: libyajl-devel
BuildRequires: libpixman-1-0-devel
%if %{?with_qemu_traditional}0
BuildRequires: SDL-devel
BuildRequires: pciutils-devel
BuildRequires: SDL-devel
%endif
%if %{?with_stubdom}0
%if 0%{?suse_version} < 1230
@ -139,7 +151,7 @@ BuildRequires: xorg-x11-util-devel
%endif
%endif
Version: 4.4.0_10
Version: 4.4.0_12
Release: 0
PreReq: %insserv_prereq %fillup_prereq
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
@ -437,6 +449,7 @@ Requires: python-openssl
Requires: python-pam
Requires: python-xml
Requires: xen-libs = %{version}
Requires: grub2-x86_64-xen
# subpackage existed in 10.3
Provides: xen-tools-ioemu = %{version}
Obsoletes: xen-tools-ioemu < %{version}
@ -833,6 +846,8 @@ export XEN_PYTHON_NATIVE_INSTALL=1
make -C tools install \
DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?_smp_mflags}
rm -f $RPM_BUILD_ROOT/usr/sbin/{qcow-create,img2qcow,qcow2raw}
ln -s /usr/lib/xen/bin/qemu-dm $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm
ln -s /usr/lib/xen/bin/qemu-system-i386 $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-system-i386
echo > xen.files.txt
# EFI depends on gcc47
if test -d $RPM_BUILD_ROOT%{_libdir}/efi
@ -1348,14 +1363,6 @@ fi
%{fillup_and_insserv -y -n xendomains xendomains}
%{fillup_only -n pciback}
%endif
if [ -f /usr/bin/qemu-system-i386 ]; then
rm -f /usr/lib/xen/bin/qemu-system-i386
ln -s /usr/bin/qemu-system-i386 /usr/lib/xen/bin/qemu-system-i386
fi
if [ -f /usr/bin/qemu-system-x86_64 ]; then
rm -f /usr/lib/xen/bin/qemu-system-x86_64
ln -s /usr/bin/qemu-system-x86_64 /usr/lib/xen/bin/qemu-system-x86_64
fi
if [ -f /usr/bin/qemu-img ]; then
if [ -f /usr/bin/qemu-img-xen ]; then
rm /usr/bin/qemu-img-xen