rpms/kernel/devel kernel-2.6.spec,1.2022,1.2023

[fedora-cvs-commits at redhat.com]

Author: sct

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9975

Modified Files:
	kernel-2.6.spec 
Log Message:
Add workaround for non-xen ia64 builds: temporarily back-out the ia64-
specific portions of linux-2.6-xen.patch.

ExclusiveArch: noarch ia64 only for a single build to test it.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2022
retrieving revision 1.2023
diff -u -r1.2022 -r1.2023
--- kernel-2.6.spec	6 Mar 2006 22:14:36 -0000	1.2022
+++ kernel-2.6.spec	6 Mar 2006 22:51:46 -0000	1.2023
@@ -163,7 +163,7 @@
 Version: %{rpmversion}
 Release: %{release}
 #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x
+ExclusiveArch: noarch ia64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -783,9 +783,21 @@
 #%patch691 -p1
 %patch692 -p1
 %patch693 -p1
-%patch700 -p1
 
 #
+# Apply the main xen patch...
+#
+%patch700 -p1 -b .p.xen
+#
+# ... and back out all the ia64-specific sections, as they currently prevent
+# non-xen builds from working.
+for f in `find arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
+    g=`dirname $f`/`basename $f .p.xen`; \
+    mv "$f" "$g"; \
+    if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \
+done
+    
+#
 # Xen includes a patch which moves the vsyscall fixmap into a user-space VA,
 # freeing user-space from reliance on an absolute fixmap area and so allowing
 # the fixmap area to become dynamic.
@@ -1646,6 +1658,8 @@
 - Export mmap-able kva interface for xen to find the xenstore page 
   (xen-unstable cset 9130)
 - Remove stale linux-2.6-xen-module-fault.patch file
+- Add workaround for non-xen ia64 builds: temporarily back-out the ia64-
+  specific portions of linux-2.6-xen.patch.
 
 * Sun Mar  5 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5-git8