Accepting request 228913 from home:dirkmueller:branches:Virtualization

- fix build for armv7l and aarch64

OBS-URL: https://build.opensuse.org/request/show/228913
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=308
This commit is contained in:
Charles Arnold 2014-04-03 16:28:32 +00:00 committed by Git OBS Bridge
parent a094869852
commit f1e74a471f
2 changed files with 11 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 3 16:21:03 UTC 2014 - dmueller@suse.com
- fix build for armv7l and aarch64
-------------------------------------------------------------------
Fri Mar 28 11:00:07 MDT 2014 - carnold@suse.com

View File

@ -96,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: pciutils-devel
BuildRequires: SDL-devel
BuildRequires: pciutils-devel
%endif
%if %{?with_stubdom}0
%if 0%{?suse_version} < 1230
@ -441,6 +441,7 @@ Authors:
Summary: Xen Virtualization: Control tools for domain 0
Group: System/Kernel
Requires: bridge-utils
Requires: grub2-x86_64-xen
Requires: multipath-tools
Requires: python
Requires: python-curses
@ -449,7 +450,6 @@ 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}
@ -846,8 +846,6 @@ 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
@ -855,6 +853,8 @@ then
echo %{_libdir}/efi >> xen.files.txt
fi
%ifarch x86_64
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
cp -avL xenalyze.hg/dump-raw $RPM_BUILD_ROOT/%{_bindir}/xenalyze.dump-raw
cp -avL xenalyze.hg/xenalyze $RPM_BUILD_ROOT/%{_bindir}
%endif