- Upstream patches from Jan

23955-x86-pv-cpuid-xsave.patch
  23957-cpufreq-error-paths.patch 

- Upstream patches from Jan
  23933-pt-bus2bridge-update.patch
  23726-x86-intel-flexmigration-v2.patch
  23925-x86-AMD-ARAT-Fam12.patch
  23246-x86-xsave-enable.patch
  23897-x86-mce-offline-again.patch 

- Update to Xen 4.1.2_rc3 c/s 23171

- bnc#720054 - Changed /etc/udev/rules.d/40-xen.rules to not run
  Xen's vif-bridge script when not running Xen.  This is not a
  solution to the bug but an improvement in the rules regardless.
  Updated udev-rules.patch

- Upstream patches from Jan
  23868-vtd-RMRR-validation.patch
  23871-x86-microcode-amd-silent.patch
  23898-cc-option-grep.patch 

- Add pciback init script and sysconf file, giving users a simple
  mechanism to configure pciback.
  init.pciback sysconfig.pciback

- update scripts to use xl -f, or xm if xend is running:
  xen-updown.sh, init.xendomains, xmclone.sh

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=146
This commit is contained in:
Charles Arnold
2011-10-18 14:16:28 +00:00
committed by Git OBS Bridge
parent 800917b5a2
commit edf6bf0381
36 changed files with 1229 additions and 573 deletions

View File

@@ -22,7 +22,7 @@ Name: xen
ExclusiveArch: %ix86 x86_64
%define xvers 4.1
%define xvermaj 4
%define changeset 23152
%define changeset 23171
%define xen_build_dir xen-4.1.2-testing
%define with_kmp 1
%define with_stubdom 1
@@ -96,7 +96,7 @@ BuildRequires: glibc-devel
%if %{?with_kmp}0
BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11
%endif
Version: 4.1.2_01
Version: 4.1.2_03
Release: 1
License: GPLv2+
Group: System/Kernel
@@ -135,6 +135,9 @@ Source24: xenapiusers
Source25: xen-updown.sh
# Firewall service file for xend relocation server
Source26: xend-relocation-server.fw
# init script and sysconf file for pciback
Source27: init.pciback
Source28: sysconfig.pciback
Source99: baselibs.conf
# http://xenbits.xensource.com/ext/xenalyze
Source20000: xenalyze.hg.tar.bz2
@@ -153,42 +156,48 @@ Patch11: 23234-svm-decode-assist-base.patch
Patch12: 23235-svm-decode-assist-crs.patch
Patch13: 23236-svm-decode-assist-invlpg.patch
Patch14: 23238-svm-decode-assist-insn-fetch.patch
Patch15: 23303-cpufreq-misc.patch
Patch16: 23304-amd-oprofile-strings.patch
Patch17: 23305-amd-fam15-xenoprof.patch
Patch18: 23306-amd-fam15-vpmu.patch
Patch19: 23334-amd-fam12+14-vpmu.patch
Patch20: 23383-libxc-rm-static-vars.patch
Patch21: 23437-amd-fam15-TSC-scaling.patch
Patch22: 23462-libxc-cpu-feature.patch
Patch23: 23508-vmx-proc-based-ctls-probe.patch
Patch24: 23511-amd-fam15-no-flush-for-C3.patch
Patch25: 23571-vtd-fault-verbosity.patch
Patch26: 23574-x86-dom0-compressed-ELF.patch
Patch27: 23575-x86-DMI.patch
Patch28: 23610-x86-topology-info.patch
Patch29: 23611-amd-fam15-topology.patch
Patch30: 23613-EFI-headers.patch
Patch31: 23614-x86_64-EFI-boot.patch
Patch32: 23615-x86_64-EFI-runtime.patch
Patch33: 23616-x86_64-EFI-MPS.patch
Patch34: 23676-x86_64-image-map-bounds.patch
Patch35: 23685-libxl-segfault-fix.patch
Patch15: 23246-x86-xsave-enable.patch
Patch16: 23303-cpufreq-misc.patch
Patch17: 23304-amd-oprofile-strings.patch
Patch18: 23305-amd-fam15-xenoprof.patch
Patch19: 23306-amd-fam15-vpmu.patch
Patch20: 23334-amd-fam12+14-vpmu.patch
Patch21: 23383-libxc-rm-static-vars.patch
Patch22: 23437-amd-fam15-TSC-scaling.patch
Patch23: 23462-libxc-cpu-feature.patch
Patch24: 23508-vmx-proc-based-ctls-probe.patch
Patch25: 23511-amd-fam15-no-flush-for-C3.patch
Patch26: 23571-vtd-fault-verbosity.patch
Patch27: 23574-x86-dom0-compressed-ELF.patch
Patch28: 23575-x86-DMI.patch
Patch29: 23610-x86-topology-info.patch
Patch30: 23611-amd-fam15-topology.patch
Patch31: 23613-EFI-headers.patch
Patch32: 23614-x86_64-EFI-boot.patch
Patch33: 23615-x86_64-EFI-runtime.patch
Patch34: 23616-x86_64-EFI-MPS.patch
Patch35: 23676-x86_64-image-map-bounds.patch
Patch36: 23723-x86-CMOS-lock.patch
Patch37: 23724-x86-smpboot-x2apic.patch
Patch38: 23735-guest-dom0-cap.patch
Patch39: 23747-mmcfg-base-address.patch
Patch40: 23749-mmcfg-reservation.patch
Patch41: 23771-x86-ioapic-clear-pin.patch
Patch42: 23772-x86-trampoline.patch
Patch43: 23774-x86_64-EFI-EDD.patch
Patch44: 23781-pm-wide-ACPI-ids.patch
Patch45: 23782-x86-ioapic-clear-irr.patch
Patch46: 23783-ACPI-set-_PDC-bits.patch
Patch47: 23795-intel-ich10-quirk.patch
Patch48: 23800-x86_64-guest-addr-range.patch
Patch49: 23804-x86-IPI-counts.patch
Patch50: 23833-x86-IO-APIC-EOI.patch
Patch38: 23726-x86-intel-flexmigration-v2.patch
Patch39: 23735-guest-dom0-cap.patch
Patch40: 23747-mmcfg-base-address.patch
Patch41: 23749-mmcfg-reservation.patch
Patch42: 23771-x86-ioapic-clear-pin.patch
Patch43: 23772-x86-trampoline.patch
Patch44: 23774-x86_64-EFI-EDD.patch
Patch45: 23781-pm-wide-ACPI-ids.patch
Patch46: 23782-x86-ioapic-clear-irr.patch
Patch47: 23783-ACPI-set-_PDC-bits.patch
Patch48: 23795-intel-ich10-quirk.patch
Patch49: 23800-x86_64-guest-addr-range.patch
Patch50: 23804-x86-IPI-counts.patch
Patch51: 23853-x86-pv-cpuid-xsave.patch
Patch52: 23897-x86-mce-offline-again.patch
Patch53: 23925-x86-AMD-ARAT-Fam12.patch
Patch54: 23933-pt-bus2bridge-update.patch
Patch55: 23955-x86-pv-cpuid-xsave.patch
Patch56: 23957-cpufreq-error-paths.patch
# Upstream qemu patches
# Our patches
Patch300: xen-config.diff
@@ -292,6 +301,7 @@ Patch453: tools-watchdog-support.patch
Patch454: xend-console-port-restore.patch
Patch455: xencommons-proc-xen.patch
Patch456: xend-vcpu-affinity-fix.patch
Patch457: xenstored.XS_RESET_WATCHES.patch
# Jim's domain lock patch
Patch480: xend-domain-lock.patch
Patch481: xend-domain-lock-sfex.patch
@@ -336,6 +346,7 @@ Patch1103: xenpaging.return-void.patch
Patch1104: xenpaging.catch-xc_mem_paging_resume-error.patch
Patch1105: xenpaging.xenpaging_populate_page-gfn.patch
Patch1106: xenpaging.autostart.patch
Patch1107: xenpaging.23817-mem_event_check_ring.patch
# xenalyze
Patch20000: xenalyze.gcc46.patch
# Build patch
@@ -729,6 +740,12 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch48 -p1
%patch49 -p1
%patch50 -p1
%patch51 -p1
%patch52 -p1
%patch53 -p1
%patch54 -p1
%patch55 -p1
%patch56 -p1
%patch300 -p1
%patch301 -p1
%patch302 -p1
@@ -826,6 +843,7 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch454 -p1
%patch455 -p1
%patch456 -p1
%patch457 -p1
%patch480 -p1
%patch481 -p1
%patch500 -p1
@@ -868,6 +886,7 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch1104 -p1
%patch1105 -p1
%patch1106 -p1
%patch1107 -p1
#
%patch99998 -p1
%patch99999 -p1
@@ -1012,6 +1031,9 @@ install %SOURCE6 $RPM_BUILD_ROOT/etc/init.d/xend
ln -s /etc/init.d/xend $RPM_BUILD_ROOT/usr/sbin/rcxend
install %SOURCE7 $RPM_BUILD_ROOT/etc/init.d/xendomains
ln -s /etc/init.d/xendomains $RPM_BUILD_ROOT/usr/sbin/rcxendomains
install %SOURCE27 $RPM_BUILD_ROOT/etc/init.d/pciback
ln -s /etc/init.d/pciback $RPM_BUILD_ROOT/usr/sbin/rcpciback
install %SOURCE28 $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pciback
mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d
install -m644 %SOURCE19 $RPM_BUILD_ROOT/etc/modprobe.d/xen_loop.conf
# example config
@@ -1145,6 +1167,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
/usr/sbin/flask-setenforce
/usr/sbin/rcxend
/usr/sbin/rcxendomains
/usr/sbin/rcpciback
/usr/sbin/tapdisk
/usr/sbin/xen*
/usr/sbin/xm
@@ -1325,6 +1348,7 @@ fi
%endif
#
%{fillup_and_insserv -y -n xendomains xendomains}
%{fillup_only -n pciback}
if [ -f /usr/bin/qemu-img ]; then
if [ -f /usr/bin/qemu-img-xen ]; then
rm /usr/bin/qemu-img-xen