rpms/kernel/devel kernel-2.6.spec,1.2484,1.2485

[fedora-cvs-commits redhat com]

Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
- disable blktap for xen-ia64 (don't compile).
- enable ia64-xen (it compiles, but still don't boot).



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2484
retrieving revision 1.2485
diff -u -r1.2484 -r1.2485
--- kernel-2.6.spec	31 Jul 2006 21:31:30 -0000	1.2484
+++ kernel-2.6.spec	31 Jul 2006 22:33:49 -0000	1.2485
@@ -65,8 +65,7 @@
 %endif
 
 # Xen only builds on i686, x86_64 and ia64 ...
-#%ifnarch i686 x86_64 ia64
-%ifnarch i686 x86_64
+%ifnarch i686 x86_64 ia64
 %define buildxen 0
 %endif
 
@@ -811,11 +810,9 @@
 #%patch951 -p1
 %patch950 -p1 -b .p.xen
 #
-# ... and back out all the ia64-specific sections, as they currently prevent
-# non-xen builds from working.
-# Now also with tpm
+# ... and back out all the tpm additions, they need fixing
 #
-for f in `find drivers/char/tpm arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
+for f in `find drivers/char/tpm -type f -name "*.p.xen"` ; do \
     g=`dirname $f`/`basename $f .p.xen`; \
     mv "$f" "$g"; \
     if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \
@@ -1662,6 +1659,13 @@
 %endif
 
 %changelog
+* Tue Aug  1 2006 Juan Quintela <quintela redhat com>
+- disable blktap for xen-ia64 (don't compile).
+- enable ia64-xen (it compiles, but still don't boot).
+
+* Tue Aug  1 2006 Juan Quintela <quintela redhat com>
+- Fix dlm s/u.generic_ip/i_private/.
+
 * Mon Jul 31 2006 Don Zickus <dzickus redhat com>
 - IA64 compile fixes