- Upstream patches from Jan

25833-32on64-bogus-pt_base-adjust.patch 25835-adjust-rcu-lock-domain.patch 25836-VT-d-S3-MSI-resume.patch 25850-tmem-xsa-15-1.patch 25851-tmem-xsa-15-2.patch 25852-tmem-xsa-15-3.patch 25853-tmem-xsa-15-4.patch 25854-tmem-xsa-15-5.patch 25855-tmem-xsa-15-6.patch 25856-tmem-xsa-15-7.patch 25857-tmem-xsa-15-8.patch 25858-tmem-xsa-15-9.patch 25859-tmem-missing-break.patch 25860-tmem-cleanup.patch 25861-x86-early-fixmap.patch 25862-sercon-non-com.patch 25863-sercon-ehci-dbgp.patch 25864-sercon-unused.patch 25866-sercon-ns16550-pci-irq.patch 25867-sercon-ns16550-parse.patch 25874-x86-EFI-chain-cfg.patch 25909-xenpm-consistent.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=201
2012-09-21 14:45:08 +00:00
parent ea0e55c00e
commit 17854f1c81
33 changed files with 5038 additions and 677 deletions
--- a/xen.spec
+++ b/xen.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

+
 Name:           xen
 ExclusiveArch:  %ix86 x86_64
 %define xvers 4.2
@@ -162,6 +163,28 @@ Source99:       baselibs.conf
 # http://xenbits.xensource.com/ext/xenalyze
 Source20000:    xenalyze.hg.tar.bz2
 # Upstream patches
+Patch25833:     25833-32on64-bogus-pt_base-adjust.patch
+Patch25835:     25835-adjust-rcu-lock-domain.patch
+Patch25836:     25836-VT-d-S3-MSI-resume.patch
+Patch25850:     25850-tmem-xsa-15-1.patch
+Patch25851:     25851-tmem-xsa-15-2.patch
+Patch25852:     25852-tmem-xsa-15-3.patch
+Patch25853:     25853-tmem-xsa-15-4.patch
+Patch25854:     25854-tmem-xsa-15-5.patch
+Patch25855:     25855-tmem-xsa-15-6.patch
+Patch25856:     25856-tmem-xsa-15-7.patch
+Patch25857:     25857-tmem-xsa-15-8.patch
+Patch25858:     25858-tmem-xsa-15-9.patch
+Patch25859:     25859-tmem-missing-break.patch
+Patch25860:     25860-tmem-cleanup.patch
+Patch25861:     25861-x86-early-fixmap.patch
+Patch25862:     25862-sercon-non-com.patch
+Patch25863:     25863-sercon-ehci-dbgp.patch
+Patch25864:     25864-sercon-unused.patch
+Patch25866:     25866-sercon-ns16550-pci-irq.patch
+Patch25867:     25867-sercon-ns16550-parse.patch
+Patch25874:     25874-x86-EFI-chain-cfg.patch
+Patch25909:     25909-xenpm-consistent.patch
 # Upstream qemu patches
 # Our patches
 Patch301:       xend-config.diff
@@ -268,11 +291,11 @@ Patch481:       xend-domain-lock-sfex.patch
 Patch500:       32on64-extra-mem.patch
 Patch501:       x86-ioapic-ack-default.patch
 Patch502:       x86-cpufreq-report.patch
-Patch504:       dom-print.patch
-Patch505:       pvdrv-import-shared-info.patch
-Patch507:       x86-extra-trap-info.patch
-Patch508:       pvdrv_emulation_control.patch
-Patch509:       blktap-pv-cdrom.patch
+Patch503:       x86-dom-print.patch
+Patch504:       pvdrv-import-shared-info.patch
+Patch505:       x86-extra-trap-info.patch
+Patch506:       pvdrv_emulation_control.patch
+Patch507:       blktap-pv-cdrom.patch
 Patch510:       pv-driver-build.patch
 Patch511:       supported_module.diff
 Patch512:       magic_ioport_compat.patch
@@ -623,6 +646,28 @@ Authors:
 tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch20000 -p1
 # Upstream patches
+%patch25833 -p1
+%patch25835 -p1
+%patch25836 -p1
+%patch25850 -p1
+%patch25851 -p1
+%patch25852 -p1
+%patch25853 -p1
+%patch25854 -p1
+%patch25855 -p1
+%patch25856 -p1
+%patch25857 -p1
+%patch25858 -p1
+%patch25859 -p1
+%patch25860 -p1
+%patch25861 -p1
+%patch25862 -p1
+%patch25863 -p1
+%patch25864 -p1
+%patch25866 -p1
+%patch25867 -p1
+%patch25874 -p1
+%patch25909 -p1
 # Qemu
 # Our patches
 %patch301 -p1
@@ -724,11 +769,11 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch500 -p1
 %patch501 -p1
 %patch502 -p1
+%patch503 -p1
 %patch504 -p1
 %patch505 -p1
+%patch506 -p1
 %patch507 -p1
-%patch508 -p1
-%patch509 -p1
 %if %suse_version < 1220
 %patch510 -p1
 %endif