[Fedora-ia64-list] Re: [Fedora-xen] [PATCH-UPDATE] Enable building xen on ia64

[Aron Griffis]

Hi Juan,

Please don't forget to apply these spec changes once you've updated
linux-2.6-xen.patch.

- First, enable building xen on ia64.  

- Second, get rid of the redundant buildkdump setting for ppc64 and
  ppc64iseries, since buildkdump=1 is already the default (for that
  reason, cc'd Don Zickus who seems to have added it)

- Third, update config-xen-ia64.  It was originally written assuming
  inheritance of config-xen-xen which has now gone away.

Thanks,
Aron

 configs/config-xen-ia64 |   21 ++++++++++-----------
 kernel-2.6.spec         |   15 ++++-----------
 2 files changed, 14 insertions(+), 22 deletions(-)

Signed-off-by: Aron Griffis <aron at hp.com>

diff -r bfc3d0da96c9 devel/kernel-2.6.spec
--- a/devel/kernel-2.6.spec	Fri Jul 28 07:26:52 2006 -0400
+++ b/devel/kernel-2.6.spec	Fri Jul 28 07:58:50 2006 -0400
@@ -65,14 +65,8 @@ Summary: The Linux kernel (the core of t
 %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
-
-
-%ifarch ppc64 ppc64iseries
-%define buildkdump 1
 %endif
 
 # Second, per-architecture exclusions (ifarch)
@@ -818,11 +812,10 @@ cd linux-%{kversion}.%{_target_cpu}
 #%patch951 -p1
 %patch950 -p1 -b .p.xen
 #
-# ... and back out all the ia64-specific sections, as they currently prevent
+# ... and back out all the tpm-specific sections, as they currently prevent
 # non-xen builds from working.
-# Now also with tpm
-#
-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; \
diff -r bfc3d0da96c9 devel/configs/config-xen-ia64
--- a/devel/configs/config-xen-ia64	Fri Jul 28 07:26:52 2006 -0400
+++ b/devel/configs/config-xen-ia64	Fri Jul 28 07:58:50 2006 -0400
@@ -1,14 +1,3 @@
-# override i686 xen
-
-# CONFIG_X86 is not set
-# CONFIG_X86_XEN is not set
-CONFIG_IA64=y
-CONFIG_XEN=y
-CONFIG_XEN_IA64_DOM0_VP=y
-CONFIG_XEN_DISABLE_SERIAL=y
-
-# override ia64 generic
-
 # CONFIG_IA64_GENERIC is not set
 CONFIG_IA64_DIG=y
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -16,5 +5,15 @@ CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 
+CONFIG_XEN=y
+CONFIG_XEN_IA64_DOM0_VP=y
+CONFIG_XEN_DISABLE_SERIAL=y
+# CONFIG_XEN_BLKDEV_TAP is not set
+# CONFIG_XEN_PCIDEV_BACKEND is not set
+# CONFIG_XEN_PCIDEV_BACKEND_VPCI is not set
+# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
+# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+
 # internal #defines conflict with xen-ia64
 # CONFIG_FB_NEOMAGIC is not set