SHA256
1
0
forked from pool/xen

- BuildRequire libfdt1-devel on ARM

- fate#311487: remove modprobe.conf files for autoloading of
  pv-on-hvm files.
  Rely on core kernel to skip initialization of emulated hardware
  Handle xen_emul_unplug= from xenlinux based core kernel-default

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=291
This commit is contained in:
Charles Arnold
2014-01-23 18:54:00 +00:00
committed by Git OBS Bridge
parent 03a37ddd87
commit bff807c26a
8 changed files with 129 additions and 63 deletions

View File

@@ -60,17 +60,20 @@ ExclusiveArch: %ix86 x86_64 %arm aarch64
%else
%define with_systemd 0
%endif
%ifnarch %arm aarch64
%ifarch %arm aarch64
BuildRequires: libfdt1-devel
%endif
%ifarch %ix86 x86_64
BuildRequires: dev86
%endif
BuildRequires: fdupes
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
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: python-devel
@@ -79,10 +82,10 @@ BuildRequires: transfig
BuildRequires: texinfo
BuildRequires: texlive
%if %suse_version > 1220
BuildRequires: texlive-latex
BuildRequires: texlive-courier
BuildRequires: texlive-dvips
BuildRequires: texlive-helvetic
BuildRequires: texlive-latex
BuildRequires: texlive-psnfss
BuildRequires: texlive-times
BuildRequires: tex(a4.sty)
@@ -105,7 +108,7 @@ BuildRequires: xz-devel
%if %suse_version <= 1110
BuildRequires: pmtools
%else
%ifnarch %arm aarch64
%ifarch %ix86 x86_64
BuildRequires: acpica
%endif
%endif
@@ -157,7 +160,6 @@ Source23: block-npiv-vport
Source24: xmclone.sh
Source26: init.xen_loop
%if %{?with_kmp}0
Source27: xen_pvdrivers.conf
Source28: kmp_filelist
%endif
Source29: block-dmmd
@@ -252,6 +254,7 @@ Patch381: ioemu-disable-scsi.patch
Patch382: ioemu-disable-emulated-ide-if-pv.patch
Patch383: xenpaging.qemu.flush-cache.patch
Patch384: qemu-xen-upstream-blkif-discard.patch
Patch385: xen_pvonhvm.xen_emul_unplug.patch
# Xend
Patch400: xen.migrate.tools_set_migration_constraints_from_cmdline.patch
Patch401: xen.migrate.tools_add_xm_migrate_--log_progress_option.patch
@@ -598,6 +601,7 @@ Authors:
%patch382 -p1
%patch383 -p1
%patch384 -p1
%patch385 -p1
# Xend
%if %{?with_xend}0
%patch400 -p1
@@ -703,7 +707,7 @@ configure_flags="${configure_flags} --disable-xend"
--enable-blktap1 ${configure_flags}
%if %{?with_dom0_support}0
CFLAGS_SAVE=$CFLAGS
%ifnarch %arm aarch64
%ifarch %ix86 x86_64
make -C xenalyze.hg CC="gcc -I../xen/include -DMAX_CPUS=%{max_cpus} ${RPM_OPT_FLAGS}" %{?_smp_mflags} -k
%endif
make -C tools/include/xen-foreign %{?_smp_mflags}
@@ -802,7 +806,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
for flavor in %flavors_to_build; do
make -C /usr/src/linux-obj/%_target_cpu/$flavor modules_install \
M=$PWD/obj/$flavor
install -m644 %SOURCE27 $RPM_BUILD_ROOT/etc/modprobe.d/xen_pvdrivers-$flavor.conf
done
%endif