Hi Juan,
After you apply the patch bomb I sent last night, here is the kernel-2.6.spec patch to enable building xen on ia64. If possible, we (Prarit and I) would like these patches applied ASAP so that xen-ia64 can land in today's rpms.
Additionally this patch removes a redundant buildkdump setting for ppc64. Since buildkdump defaults to 1 at the top of the spec, there's no reason for ppc64 to have the special case.
Regards, Aron
# HG changeset patch # User agriffis@cheo.zko.hp.com # Node ID 0d2d750a9002f1ecc354a352b1b88602485ba8f6 # Parent 4cf516051efbc66f7fa32fd289780328785a6ba9 Enable building xen on ia64. Also remove redundant buildkdump setting for ppc64.
Signed-off-by: Aron Griffis aron@hp.com
diff -r 4cf516051efb -r 0d2d750a9002 devel/kernel-2.6.spec --- a/devel/kernel-2.6.spec Thu Jul 27 07:19:58 2006 -0400 +++ b/devel/kernel-2.6.spec Thu Jul 27 10:39:44 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 -%define buildkdump 1 %endif
# Second, per-architecture exclusions (ifarch) @@ -812,11 +806,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; \
On Thu, 2006-07-27 at 11:14 -0400, Aron Griffis wrote:
Hi Juan,
After you apply the patch bomb I sent last night, here is the kernel-2.6.spec patch to enable building xen on ia64. If possible, we (Prarit and I) would like these patches applied ASAP so that xen-ia64 can land in today's rpms.
Additionally this patch removes a redundant buildkdump setting for ppc64. Since buildkdump defaults to 1 at the top of the spec, there's no reason for ppc64 to have the special case.
Get the two rawhide xen bugs fixed 1h ago. Next kernel should work well on i386 & x86_64.
I have to go now, bu next on the queue is integration of your patches, I hope they will appear tonight, tomorrow morning the later.
Later, Juan.
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@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
On Fri, Jul 28, 2006 at 08:06:54AM -0400, Aron Griffis wrote:
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)
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
NAK. You missed the couple of lines above the #Xen only.. where buildkudmp is disabled. With Juan's recent change of moving the 'buildxen' definition, I can consolidate the ppc64.. stuff and the x86.. stuff together. That is the better fix. But PLEASE do not remove the buildkdump line.
Cheers, Don
Don Zickus wrote: [Fri Jul 28 2006, 10:40:06AM EDT]
NAK. You missed the couple of lines above the #Xen only.. where buildkudmp is disabled. With Juan's recent change of moving the 'buildxen' definition, I can consolidate the ppc64.. stuff and the x86.. stuff together. That is the better fix. But PLEASE do not remove the buildkdump line.
Gah, sorry I misread that! I should have paid attention to that bad feeling about "fixing" something outside of the ia64 sections... :-|
Aron
Juan,
Thanks for integrating the ia64 spec changes. It's great to have xen-ia64 building in Fedora now! :-)
The only trivial part which was missing is the config patch. Here it is again.
Regards, Aron
config-xen-ia64 | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-)
Signed-off-by: Aron Griffis aron@hp.com
diff -r 2ae0ced4cbb9 -r 9a7b86afa187 devel/configs/config-xen-ia64 --- a/devel/configs/config-xen-ia64 Tue Aug 01 06:56:23 2006 -0400 +++ b/devel/configs/config-xen-ia64 Tue Aug 01 07:38:24 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,9 +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 - -# don't compile -# error: implicit declaration of function 'create_lookup_pte_addr' -# CONFIG_XEN_BLKDEV_TAP is not set
-
Aron Griffis -
Don Zickus -
Juan Quintela