- make stubdom build optional
- pass -j N to stubdom build - add xenalzye from http://xenbits.xensource.com/ext/xenalyze.hg - hotplug-block-losetup-a.patch allow hardlinked blockdevices - fate#310510 - fix xenpaging xenpaging.paging_prep_enomem.patch - retry page-in if guest is temporary out-of-memory xenpaging.print-arguments.patch - print arguments passed to xenpaging xenpaging.machine_to_phys_mapping.patch - invalidate array during page deallocation xenpaging.autostart_delay.patch - fold xenpaging.enabled.patch into this patch - set xenpaging_delay to 0.0 to start xenpaging right away - blktap2 patch - fix problem that blktap2 device info not cleared when block-attach fail. blktap2.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=88
This commit is contained in:
Charles Arnold
committed by
Git OBS Bridge
Git OBS Bridge
parent
c260563b3f
commit
8f6e1e085f
133
xen.spec
133
xen.spec
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package xen (Version 4.0.1_01)
|
||||
# spec file for package xen (Version 4.0.1_02)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@@ -25,35 +25,36 @@ ExclusiveArch: %ix86 x86_64
|
||||
%define changeset 21326
|
||||
%define xen_build_dir xen-4.0.1-testing
|
||||
%define with_kmp 1
|
||||
BuildRequires: LibVNCServer-devel
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: automake
|
||||
BuildRequires: bin86
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: dev86
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: latex2html
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: openssl
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pciutils-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: texinfo
|
||||
BuildRequires: transfig
|
||||
%define with_stubdom 1
|
||||
BuildRequires: LibVNCServer-devel
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: automake
|
||||
BuildRequires: bin86
|
||||
BuildRequires: curl-devel
|
||||
BuildRequires: dev86
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: latex2html
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: openssl
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pciutils-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: texinfo
|
||||
BuildRequires: transfig
|
||||
%if %suse_version <= 1110
|
||||
BuildRequires: pmtools
|
||||
BuildRequires: pmtools
|
||||
%else
|
||||
BuildRequires: acpica
|
||||
BuildRequires: acpica
|
||||
%endif
|
||||
%if %suse_version >= 1030
|
||||
BuildRequires: texlive
|
||||
BuildRequires: texlive-latex
|
||||
BuildRequires: texlive
|
||||
BuildRequires: texlive-latex
|
||||
%else
|
||||
BuildRequires: te_ams
|
||||
BuildRequires: te_latex
|
||||
BuildRequires: tetex
|
||||
BuildRequires: te_ams
|
||||
BuildRequires: te_latex
|
||||
BuildRequires: tetex
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
BuildRequires: glibc-32bit glibc-devel-32bit
|
||||
@@ -69,7 +70,7 @@ BuildRequires: glibc-devel
|
||||
%if %{?with_kmp}0
|
||||
BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11
|
||||
%endif
|
||||
Version: 4.0.1_01
|
||||
Version: 4.0.1_02
|
||||
Release: 5
|
||||
License: GPLv2+
|
||||
Group: System/Kernel
|
||||
@@ -106,6 +107,8 @@ Source23: etc_pam.d_xen-api
|
||||
Source24: xenapiusers
|
||||
# sysconfig hook script for Xen
|
||||
Source25: xen-updown.sh
|
||||
# http://xenbits.xensource.com/ext/xenalyze.hg
|
||||
Source20000: xenalyze.hg.tar.bz2
|
||||
# Upstream patches
|
||||
Patch0: 21089-x86-startup-irq-from-setup-gsi.patch
|
||||
Patch1: 21235-crashkernel-advanced.patch
|
||||
@@ -252,6 +255,7 @@ Patch437: xenfb_32bpp.patch
|
||||
Patch438: stdvga-cache.patch
|
||||
Patch439: minios-fixups.patch
|
||||
Patch440: bdrv_default_rwflag.patch
|
||||
Patch441: blktap2.patch
|
||||
# Jim's domain lock patch
|
||||
Patch450: xend-domain-lock.patch
|
||||
# Hypervisor and PV driver Patches
|
||||
@@ -280,32 +284,36 @@ Patch704: hv_apic.patch
|
||||
# Build patch
|
||||
Patch999: tmp_build.patch
|
||||
# FATE 310510
|
||||
Patch10001: xenpaging.tools_xenpaging_cleanup.patch
|
||||
Patch10002: xenpaging.pageout_policy.patch
|
||||
Patch10003: xenpaging.xs_daemon_close.patch
|
||||
Patch10004: xenpaging.get_paged_frame.patch
|
||||
Patch10005: xenpaging.makefile.patch
|
||||
Patch10010: xenpaging.policy_linear.patch
|
||||
Patch10011: xenpaging.pagefile.patch
|
||||
Patch10012: xenpaging.xenpaging_init.patch
|
||||
Patch10013: xenpaging.mem_paging_tool_qemu_flush_cache.patch
|
||||
Patch10014: xenpaging.machine_to_phys_mapping.patch
|
||||
Patch10015: xenpaging.populate_only_if_paged.patch
|
||||
Patch10017: xenpaging.autostart.patch
|
||||
Patch10018: xenpaging.signal_handling.patch
|
||||
Patch10019: xenpaging.MRU_SIZE.patch
|
||||
Patch10020: xenpaging.guest_remove_page.patch
|
||||
Patch10021: xenpaging.mem_event_check_ring-free_requests.patch
|
||||
Patch10022: xenpaging.blacklist.patch
|
||||
Patch10023: xenpaging.autostart_delay.patch
|
||||
Patch10024: xenpaging.page_already_populated.patch
|
||||
Patch10025: xenpaging.notify_policy_only_once.patch
|
||||
Patch10026: xenpaging.num_pages_equal_max_pages.patch
|
||||
Patch10027: xenpaging.p2m_mem_paging_populate_if_p2m_ram_paged.patch
|
||||
Patch10028: xenpaging.HVMCOPY_gfn_paged_out.patch
|
||||
Patch10029: xenpaging.optimize_p2m_mem_paging_populate.patch
|
||||
Patch10030: xenpaging.enabled.patch
|
||||
Patch10040: xenpaging.doc.patch
|
||||
Patch902: hotplug-block-losetup-a.patch
|
||||
Patch10001: xenpaging.tools_xenpaging_cleanup.patch
|
||||
Patch10002: xenpaging.pageout_policy.patch
|
||||
Patch10003: xenpaging.xs_daemon_close.patch
|
||||
Patch10004: xenpaging.get_paged_frame.patch
|
||||
Patch10005: xenpaging.makefile.patch
|
||||
Patch10010: xenpaging.policy_linear.patch
|
||||
Patch10011: xenpaging.pagefile.patch
|
||||
Patch10012: xenpaging.xenpaging_init.patch
|
||||
Patch10013: xenpaging.mem_paging_tool_qemu_flush_cache.patch
|
||||
Patch10014: xenpaging.machine_to_phys_mapping.patch
|
||||
Patch10015: xenpaging.populate_only_if_paged.patch
|
||||
Patch10017: xenpaging.autostart.patch
|
||||
Patch10018: xenpaging.signal_handling.patch
|
||||
Patch10019: xenpaging.MRU_SIZE.patch
|
||||
Patch10020: xenpaging.guest_remove_page.patch
|
||||
Patch10021: xenpaging.mem_event_check_ring-free_requests.patch
|
||||
Patch10022: xenpaging.blacklist.patch
|
||||
Patch10023: xenpaging.autostart_delay.patch
|
||||
Patch10024: xenpaging.page_already_populated.patch
|
||||
Patch10025: xenpaging.notify_policy_only_once.patch
|
||||
Patch10026: xenpaging.num_pages_equal_max_pages.patch
|
||||
Patch10027: xenpaging.p2m_mem_paging_populate_if_p2m_ram_paged.patch
|
||||
Patch10028: xenpaging.HVMCOPY_gfn_paged_out.patch
|
||||
Patch10029: xenpaging.optimize_p2m_mem_paging_populate.patch
|
||||
Patch10030: xenpaging.paging_prep_enomem.patch
|
||||
Patch10031: xenpaging.print-arguments.patch
|
||||
Patch10040: xenpaging.doc.patch
|
||||
# xenalyze
|
||||
Patch20000: xenalyze.64bit.patch
|
||||
Url: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()")
|
||||
@@ -637,7 +645,7 @@ Authors:
|
||||
Ian Pratt <ian.pratt@cl.cam.ac.uk>
|
||||
|
||||
%prep
|
||||
%setup -q -n %xen_build_dir -a 1
|
||||
%setup -q -n %xen_build_dir -a 1 -a 20000
|
||||
tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
@@ -779,6 +787,7 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
|
||||
%patch438 -p1
|
||||
%patch439 -p1
|
||||
%patch440 -p1
|
||||
%patch441 -p1
|
||||
%patch450 -p1
|
||||
%patch500 -p1
|
||||
%patch501 -p1
|
||||
@@ -802,6 +811,7 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
|
||||
%patch703 -p1
|
||||
%patch704 -p1
|
||||
%patch999 -p1
|
||||
%patch902 -p1
|
||||
%patch10001 -p1
|
||||
%patch10002 -p1
|
||||
%patch10003 -p1
|
||||
@@ -827,7 +837,11 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
|
||||
%patch10028 -p1
|
||||
%patch10029 -p1
|
||||
%patch10030 -p1
|
||||
%patch10031 -p1
|
||||
%patch10040 -p1
|
||||
#
|
||||
%patch20000 -p1
|
||||
|
||||
|
||||
%build
|
||||
XEN_EXTRAVERSION=%version-%release
|
||||
@@ -837,6 +851,7 @@ sed -i "s/XEN_CHANGESET[\t ]*=.*\$/XEN_CHANGESET = %{changeset}/" xen/Makefi
|
||||
RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/}
|
||||
export CFLAGS="${RPM_OPT_FLAGS}"
|
||||
export RPM_OPT_FLAGS
|
||||
make -C xenalyze.hg CC="gcc -I../xen/include" %{?jobs:-j%{jobs}}
|
||||
make -C tools/include/xen-foreign %{?jobs:-j%{jobs}}
|
||||
make tools docs %{?jobs:-j%{jobs}}
|
||||
cd tools/debugger/gdb
|
||||
@@ -905,6 +920,8 @@ make -C tools/misc/serial-split install \
|
||||
mkdir -p $RPM_BUILD_ROOT/${_libdir}/xen/bin/
|
||||
ln -s /usr/lib/xen/bin/qemu-dm $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm
|
||||
%endif
|
||||
cp -avL xenalyze.hg/dump-raw $RPM_BUILD_ROOT/%{_bindir}/xenalyze.dump-raw
|
||||
cp -avL xenalyze.hg/xenalyze $RPM_BUILD_ROOT/%{_bindir}
|
||||
%if %{?with_kmp}0
|
||||
# pv driver modules
|
||||
export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
|
||||
@@ -916,8 +933,9 @@ done
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
|
||||
install -m644 %SOURCE20 $RPM_BUILD_ROOT/etc/modprobe.d/xen_pvdrivers.conf
|
||||
%endif
|
||||
%if %{?with_stubdom}0
|
||||
# stubdom
|
||||
make stubdom
|
||||
make stubdom %{?jobs:-j%{jobs}}
|
||||
make -C stubdom install \
|
||||
DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} \
|
||||
DOCDIR=%{_defaultdocdir}/xen INCDIR=%{_includedir}
|
||||
@@ -927,6 +945,7 @@ ln -s /usr/lib/xen/boot/pv-grub-x86_32.gz $RPM_BUILD_ROOT/usr/lib/xen/boot/pv-gr
|
||||
ln -s /usr/lib/xen/bin/stubdom-dm $RPM_BUILD_ROOT/usr/lib64/xen/bin/stubdom-dm
|
||||
ln -s /usr/lib/xen/bin/stubdompath.sh $RPM_BUILD_ROOT/usr/lib64/xen/bin/stubdompath.sh
|
||||
%endif
|
||||
%endif
|
||||
# docs
|
||||
make -C docs install \
|
||||
DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} \
|
||||
@@ -1042,6 +1061,8 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug
|
||||
%files tools
|
||||
%defattr(-,root,root)
|
||||
#/usr/bin/lomount
|
||||
/usr/bin/xenalyze
|
||||
/usr/bin/xenalyze.dump-raw
|
||||
/usr/bin/xencons
|
||||
/usr/bin/xenstore*
|
||||
/usr/bin/xentrace*
|
||||
@@ -1150,12 +1171,14 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug
|
||||
%{_datadir}/xen/qemu/*
|
||||
%{_datadir}/xen/man/man1/*
|
||||
%{_datadir}/xen/man/man8/*
|
||||
%if %{?with_stubdom}0
|
||||
/usr/lib/xen/bin/stubdom-dm
|
||||
/usr/lib/xen/bin/stubdompath.sh
|
||||
%ifarch x86_64
|
||||
%{_libdir}/xen/bin/stubdom-dm
|
||||
%{_libdir}/xen/bin/stubdompath.sh
|
||||
%endif
|
||||
%endif
|
||||
%{_libdir}/xen/bin/qemu-dm
|
||||
%ifarch x86_64
|
||||
/usr/lib/xen/bin/qemu-dm
|
||||
@@ -1171,11 +1194,13 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug
|
||||
%{_libdir}/python%{pyver}/site-packages/grub/*
|
||||
#%pysite/fsimage.so
|
||||
%{_libdir}/python%{pyver}/site-packages/fsimage.so
|
||||
%if %{?with_stubdom}0
|
||||
/usr/lib/xen/boot/ioemu-stubdom.gz
|
||||
/usr/lib/xen/boot/pv-grub-x86_32.gz
|
||||
%ifarch x86_64
|
||||
/usr/lib/xen/boot/pv-grub-x86_64.gz
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files tools-domU
|
||||
%defattr(-,root,root)
|
||||
|
||||
Reference in New Issue
Block a user