On Sat, 2006-07-22 at 09:31 -0400, Aron Griffis wrote:
> Hi guys,
Hi Aron
> 3. Apply my kernel.spec and config changes at the end of this email.
> This would make it much easier for the ia64 developers to do test
> builds and track down failures. Presently it's a pain for me to
> maintain this out of tree.
Applied everything except this two bits:
> @@ -56,10 +59,14 @@ Summary: The Linux kernel (the core of t
> %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
> %endif
>
> -# Xen and kdump only build on i686 and x86_64 ...
> +# kdump only builds on i686 and x86_64
> %ifnarch i686 x86_64
> +%define buildkdump 0
> +%endif
> +
> +# Xen only builds on i686, x86_64 and ia64 ...
> +%ifnarch i686 x86_64 ia64
> %define buildxen 0
> -%define buildkdump 0
> %endif
Not enable ia64 until I know that it compiles at least :p
> %ifarch ppc64
> @@ -785,17 +797,29 @@ cd linux-%{kversion}.%{_target_cpu}
> #
> %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; \
> done
> # Delete the rest of the backup files, they just confuse the build later
> find -name "*.p.xen" | xargs rm -f
> +
> +# These are fixed in xen-ia64-unstable, they will announce their retirement
> +# automatically when the changes propogate down the chain to Juan
> +if [[ ! -f arch/ia64/kernel/asm-offsets.c ]]; then
> + ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h
> include/asm-ia64/xen/
> +else
> + printf "*\n* please retire asm-xsi-offsets.h symlink from
> kernel-2.6.spec\n*\n"
> +fi
> +if grep -q xenia64_init drivers/xen/core/Makefile; then
> + ln -sf ../../../arch/ia64/xen/drivers/xenia64_init.c drivers/xen/core/
> +else
> + printf "*\n* please retire xenia64_init.c symlink from
> kernel-2.6.spec\n*\n"
> +fi
>
> %patch951 -p1
> %patch952 -p1
I need this to get plain ia64 compiling. I will get an account in an
ia64 machine at some point next week. Once that I check that plain ia64
compiles out of my tree, I remove this bit.
Fair enough?
Comments?
Later, Juan.
|
