Thu Jul 5 20:58:24 UTC 2007

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4109

Modified Files:
	kernel-2.6.spec 
Removed Files:
	linux-2.6-crash-driver-xen.patch 
	linux-2.6-debug-sysfs-crash-debugging-xen.patch 
	linux-2.6-devmem-xen.patch 
	linux-2.6-ia64-kexec-kdump-xen-conflict.patch 
	linux-2.6-xen-blktap-cleanup.patch 
	linux-2.6-xen-blktap-dynamic-major.patch 
	linux-2.6-xen-blktap-fixes.patch 
	linux-2.6-xen-blktap-sysfs.patch 
	linux-2.6-xen-execshield-lazy-exec-limit.patch 
	linux-2.6-xen-execshield.patch linux-2.6-xen-pvfb.patch 
	linux-2.6-xen-tux.patch linux-2.6-xen-utrace.patch 
	linux-2.6-xen-x86_64-add-ppoll-pselect.patch 
	linux-2.6-xen-x86_64-silence-up-apic-errors.patch 
	linux-2.6-xen.patch xen-11668-hvm_disable_fix.patch 
	xen-dom0-reboot.patch xen-printf-rate-limit.patch 
Log Message:
Remove dated xen patches. (Xen is now built from a separate package).


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3253
retrieving revision 1.3254
diff -u -r1.3253 -r1.3254

--- kernel-2.6.spec	5 Jul 2007 20:54:21 -0000	1.3253
+++ kernel-2.6.spec	5 Jul 2007 20:57:47 -0000	1.3254
@@ -519,21 +519,6 @@
 # Tux http accelerator.
 Patch910: linux-2.6-tux.patch
 
-# 950 - 999 Xen
-Patch950: linux-2.6-xen.patch
-Patch951: linux-2.6-xen-utrace.patch
-Patch952: linux-2.6-xen-x86_64-silence-up-apic-errors.patch
-Patch953: linux-2.6-xen-x86_64-add-ppoll-pselect.patch
-Patch954: linux-2.6-xen-execshield.patch
-Patch955: linux-2.6-xen-tux.patch
-Patch956: linux-2.6-xen-execshield-lazy-exec-limit.patch
-Patch958: linux-2.6-ia64-kexec-kdump-xen-conflict.patch
-Patch960: linux-2.6-xen-blktap-fixes.patch
-Patch961: linux-2.6-xen-blktap-cleanup.patch
-Patch962: linux-2.6-xen-blktap-dynamic-major.patch
-Patch963: linux-2.6-xen-blktap-sysfs.patch
-Patch990: linux-2.6-xen-pvfb.patch
-
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
 #
@@ -548,15 +533,12 @@
 Patch1020: linux-2.6-debug-no-quiet.patch
 Patch1021: linux-2.6-debug-boot-delay.patch
 Patch1022: linux-2.6-debug-sysfs-crash-debugging.patch
-Patch1023: linux-2.6-debug-sysfs-crash-debugging-xen.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
-Patch1051: linux-2.6-devmem-xen.patch
 
 # Provide read only /dev/crash driver.
 Patch1060: linux-2.6-crash-driver.patch
-Patch1061: linux-2.6-crash-driver-xen.patch
 
 Patch1070: linux-2.6-sleepon.patch
 
@@ -686,11 +668,6 @@
 
 Patch10000: linux-2.6-compile-fixes.patch
 
-# Xen hypervisor patches (20000+)
-Patch20000: xen-printf-rate-limit.patch
-Patch20001: xen-11668-hvm_disable_fix.patch
-Patch20002: xen-dom0-reboot.patch
-
 # END OF PATCH DEFINITIONS
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root-%{_target_cpu}
@@ -1234,7 +1211,6 @@
 %if %{includexen}
 #
 # Apply the main xen patch...
-#%patch951 -p1
 %patch950 -p1 -b .p.xen
 #
 # ... and back out all the tpm additions, they need fixing
@@ -1246,30 +1222,6 @@
 done
 # Delete the rest of the backup files, they just confuse the build later
 find -name "*.p.xen" | xargs rm -f
-
-# Xen utrace
-%patch951 -p1
-%patch952 -p1
-%patch953 -p1
-# Xen exec-shield bits
-%patch954 -p1
-%patch955 -p1
-%patch956 -p1
-# ia64 xen cleanups for kexec/kdump
-%patch958 -p1
-
-# xen blktap fixes
-%patch960 -p1
-# The blktap patch needs to rename a file.  For now, that is far more easily
-# done in the spec file than in the patch itself.
-mv drivers/xen/blktap/blktap.c drivers/xen/blktap/blktapmain.c
-%patch961 -p1
-%patch962 -p1
-%patch963 -p1
-
-# xen framebuffer patches
-%patch990 -p1
-
 %endif
 
 #
@@ -1291,25 +1243,16 @@
 %patch1020 -p1
 %patch1021 -p1
 %patch1022 -p1
-%if %{includexen}
-%patch1023 -p1
-%endif
 
 #
 # Make /dev/mem a need-to-know function
 #
 %patch1050 -p1
-%if %{includexen}
-%patch1051 -p1
-%endif
 
 #
 # /dev/crash driver for the crashdump analysis tool
 #
 %patch1060 -p1
-%if %{includexen}
-%patch1061 -p1
-%endif
 
 #
 # SCSI Bits.


--- linux-2.6-crash-driver-xen.patch DELETED ---


--- linux-2.6-debug-sysfs-crash-debugging-xen.patch DELETED ---


--- linux-2.6-devmem-xen.patch DELETED ---


--- linux-2.6-ia64-kexec-kdump-xen-conflict.patch DELETED ---


--- linux-2.6-xen-blktap-cleanup.patch DELETED ---


--- linux-2.6-xen-blktap-dynamic-major.patch DELETED ---


--- linux-2.6-xen-blktap-fixes.patch DELETED ---


--- linux-2.6-xen-blktap-sysfs.patch DELETED ---


--- linux-2.6-xen-execshield-lazy-exec-limit.patch DELETED ---


--- linux-2.6-xen-execshield.patch DELETED ---


--- linux-2.6-xen-pvfb.patch DELETED ---


--- linux-2.6-xen-tux.patch DELETED ---


--- linux-2.6-xen-utrace.patch DELETED ---


--- linux-2.6-xen-x86_64-add-ppoll-pselect.patch DELETED ---


--- linux-2.6-xen-x86_64-silence-up-apic-errors.patch DELETED ---


--- linux-2.6-xen.patch DELETED ---


--- xen-11668-hvm_disable_fix.patch DELETED ---


--- xen-dom0-reboot.patch DELETED ---


--- xen-printf-rate-limit.patch DELETED ---


