rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

Don't try to build with spice on SLE11

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=352
This commit is contained in:
Charles Arnold 2015-03-17 21:47:42 +00:00 committed by Git OBS Bridge
parent 54fee29628
commit f79fb3183f
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qemu-xen-enable-spice-support.patch
View File

@ -2,16 +2,7 @@ Index: xen-4.5.0-testing/tools/Makefile
=================================================================== ===================================================================
--- xen-4.5.0-testing.orig/tools/Makefile --- xen-4.5.0-testing.orig/tools/Makefile
+++ xen-4.5.0-testing/tools/Makefile +++ xen-4.5.0-testing/tools/Makefile
@@ -197,6 +197,8 @@ else @@ -222,6 +222,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-fi
QEMU_XEN_ENABLE_DEBUG :=
endif
+QEMU_XEN_ENABLE_SPICE := $(shell if [ `/bin/arch 2>/dev/null` == "x86_64" ]; then echo "--enable-spice --enable-usb-redir"; fi)
+
subdir-all-qemu-xen-dir: qemu-xen-dir-find
if test -d $(QEMU_UPSTREAM_LOC) ; then \
source=$(QEMU_UPSTREAM_LOC); \
@@ -222,6 +224,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-fi
--datadir=$(SHAREDIR)/qemu-xen \ --datadir=$(SHAREDIR)/qemu-xen \
--localstatedir=$(localstatedir) \ --localstatedir=$(localstatedir) \
--disable-kvm \ --disable-kvm \

10
xen.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xen # spec file for package xen
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# needssslcertforbuild # needssslcertforbuild
Name: xen Name: xen
@ -99,10 +98,12 @@ BuildRequires: libuuid-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: libyajl-devel BuildRequires: libyajl-devel
%ifarch x86_64 %ifarch x86_64
%if 0%{?suse_version} > 1230
BuildRequires: libspice-server-devel BuildRequires: libspice-server-devel
BuildRequires: spice-protocol-devel BuildRequires: spice-protocol-devel
BuildRequires: usbredir-devel BuildRequires: usbredir-devel
%endif %endif
%endif
%if %{?with_qemu_traditional}0 %if %{?with_qemu_traditional}0
BuildRequires: SDL-devel BuildRequires: SDL-devel
BuildRequires: pciutils-devel BuildRequires: pciutils-devel
@ -647,6 +648,11 @@ if diff -u xen/Makefile~ xen/Makefile
then then
: no changes? : no changes?
fi fi
%ifarch x86_64
%if 0%{?suse_version} > 1230
export QEMU_XEN_ENABLE_SPICE="--enable-spice --enable-usb-redir"
%endif
%endif
configure_flags= configure_flags=
%if %{?with_stubdom}0 %if %{?with_stubdom}0
configure_flags=--enable-stubdom configure_flags=--enable-stubdom