Re: [XenPPC] heads up: large nasty merge
On Wed, 2006-09-06 at 07:57 -0400, Jimi Xenidis wrote: On Sep 6, 2006, at 6:48 AM, Jimi Xenidis wrote: Fortunately for me this is hollis' oops. I cannot completely build either, I only have a slight mod of tony's changes below. I'm sure the missing files probably come from the sparse tree, but I can wait, so can you :) Just in case this was not clear: The Linux repository does not build and the new Xen that pairs with it no longer has a Linux. Therefore the safe revision levels are: Linux: a2d836b6ab41 Xen: e7ea062a5086 Sorry all, there were in fact a whole bunch of files I forgot to check in. (It doesn't help that hg status on a built tree is full of noise.) Anyways, this should be fixed now. -- Hollis Blanchard IBM Linux Technology Center ___ Xen-ppc-devel mailing list Xen-ppc-devel@lists.xensource.com http://lists.xensource.com/xen-ppc-devel
Re: [XenPPC] heads up: large nasty merge
On Wed, Sep 06, 2006 at 09:16:01AM -0500, Hollis Blanchard wrote:
Sorry all, there were in fact a whole bunch of files I forgot to check
in. (It doesn't help that hg status on a built tree is full of noise.)
I do my linux builds into a scratch area, for just this reason. I've
included my xen_build script in case it's of any use as a base for
everyone else.
Anyways, this should be fixed now.
All builds and boots.
Thanks Hollis.
---
#!/bin/bash
_clean=0
_debug=0
_path=~/Xen
_full=0
_kbuild_dom0='/scratch/tony/xen_kernels/dom0'
_kbuild_domU='/scratch/tony/xen_kernels/domU'
set -- $( getopt cdp: [EMAIL PROTECTED] )
while [ -n $1 ] ; do
case $1 in
-c) _clean=1 ;;
-d) _debug=1 ;;
-p) _path=$2
shift
;;
-f) _full=1 ;;
esac
shift
done
set -x
pushd .
# Build Linux dom{0,U} and Xen
# Linux - dom0
cd ${_path}/linux-ppc-2.6.hg.working
# don't make mrpropper, as that kills the .config with my custom
# default commandline
if [ $_clean -ne 0 ] ; then
make O=${_kbuild_dom0} ARCH=powerpc clean
fi
make O=${_kbuild_dom0} ARCH=powerpc zImage
## FIXME: why? this seems just plain wrong.
# The built in commandline seems to break domU, so build a bog
# std. domU kernel.
# Linux - domU
cd ${_path}/linux-ppc-2.6.hg.working
if [ $_clean -ne 0 ] ; then
make O=${_kbuild_domU} ARCH=powerpc mrproper
make O=${_kbuild_domU} ARCH=powerpc xen_maple_defconfig
fi
make O=${_kbuild_domU} ARCH=powerpc zImage
# Build XEN
cd ${_path}/xenppc-unstable.hg.working/
[ $_clean -ne 0 ] make clean
make debug=y optimize=0 crash_debug=y \
CMDLINE=console=com1 gdb=com1 earlygdb=y \
DOM0_IMAGE=${_kbuild_dom0}/arch/powerpc/boot/zImage dist-xen
# Always rebuilf the tools.
make debug=y optimize=0 crash_debug=y -C tools clean
make debug=y optimize=0 crash_debug=y dist-tools
# If asked nicely builkd the debug stuff aswell
if [ $_debug -ne 0 ] ; then
make cscope
make debug
fi
# Display status data for quick checking
# Linux - dom0
cd ${_path}/linux-ppc-2.6.hg.working
readelf -a ${_kbuild_dom0}/vmlinux | egrep xen_guest
# Linux - domU
# Xen
cd ${_path}/xenppc-unstable.hg.working/xen
md5sum xen
# Distribute files
# Linux - dom0
# Linux - domU
rsync -aze ssh ${_kbuild_domU}/vmlinux.strip [EMAIL PROTECTED]:/root
# Xen
cd ${_path}/xenppc-unstable.hg.working
rsync -aze ssh xen/xen bran:
rsync -aze ssh dist install.sh [EMAIL PROTECTED]:/scratch/xen_install/
popd
---
Yours Tony
linux.conf.au http://linux.conf.au/ || http://lca2007.linux.org.au/
Jan 15-20 2007 The Australian Linux Technical Conference!
___
Xen-ppc-devel mailing list
Xen-ppc-devel@lists.xensource.com
http://lists.xensource.com/xen-ppc-devel
Re: [XenPPC] heads up: large nasty merge
BTW: WRT __XEN_INTERFACE_VERSION__, IMHO, Tony's patch got it right.
I was not able to quickly figure out how Hollis did it, here is the
diff from Tony:
diff -r 0d95131b439e arch/powerpc/Makefile
--- a/arch/powerpc/Makefile Tue Sep 05 18:00:40 2006 -0500
+++ b/arch/powerpc/Makefile Wed Sep 06 15:43:54 2006 +1000
@@ -60,6 +60,8 @@ endif
LDFLAGS_vmlinux:= -Bstatic
+CPPFLAGS-$(CONFIG_XEN) += \
+ -D__XEN_INTERFACE_VERSION__=$(CONFIG_XEN_INTERFACE_VERSION)
# The -Iarch/$(ARCH)/include is temporary while we are merging
CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -Iarch/$(ARCH)/include
AFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH)
On Sep 6, 2006, at 6:39 PM, Tony Breeds wrote:
On Wed, Sep 06, 2006 at 09:16:01AM -0500, Hollis Blanchard wrote:
Sorry all, there were in fact a whole bunch of files I forgot to
check
in. (It doesn't help that hg status on a built tree is full of
noise.)
I do my linux builds into a scratch area, for just this reason. I've
included my xen_build script in case it's of any use as a base for
everyone else.
Anyways, this should be fixed now.
All builds and boots.
Thanks Hollis.
---
#!/bin/bash
_clean=0
_debug=0
_path=~/Xen
_full=0
_kbuild_dom0='/scratch/tony/xen_kernels/dom0'
_kbuild_domU='/scratch/tony/xen_kernels/domU'
set -- $( getopt cdp: [EMAIL PROTECTED] )
while [ -n $1 ] ; do
case $1 in
-c) _clean=1 ;;
-d) _debug=1 ;;
-p) _path=$2
shift
;;
-f) _full=1 ;;
esac
shift
done
set -x
pushd .
# Build Linux dom{0,U} and Xen
# Linux - dom0
cd ${_path}/linux-ppc-2.6.hg.working
# don't make mrpropper, as that kills the .config with my custom
# default commandline
if [ $_clean -ne 0 ] ; then
make O=${_kbuild_dom0} ARCH=powerpc clean
fi
make O=${_kbuild_dom0} ARCH=powerpc zImage
## FIXME: why? this seems just plain wrong.
# The built in commandline seems to break domU, so build a bog
# std. domU kernel.
# Linux - domU
cd ${_path}/linux-ppc-2.6.hg.working
if [ $_clean -ne 0 ] ; then
make O=${_kbuild_domU} ARCH=powerpc mrproper
make O=${_kbuild_domU} ARCH=powerpc xen_maple_defconfig
fi
make O=${_kbuild_domU} ARCH=powerpc zImage
# Build XEN
cd ${_path}/xenppc-unstable.hg.working/
[ $_clean -ne 0 ] make clean
make debug=y optimize=0 crash_debug=y \
CMDLINE=console=com1 gdb=com1 earlygdb=y \
DOM0_IMAGE=${_kbuild_dom0}/arch/powerpc/boot/zImage dist-xen
# Always rebuilf the tools.
make debug=y optimize=0 crash_debug=y -C tools clean
make debug=y optimize=0 crash_debug=y dist-tools
# If asked nicely builkd the debug stuff aswell
if [ $_debug -ne 0 ] ; then
make cscope
make debug
fi
# Display status data for quick checking
# Linux - dom0
cd ${_path}/linux-ppc-2.6.hg.working
readelf -a ${_kbuild_dom0}/vmlinux | egrep xen_guest
# Linux - domU
# Xen
cd ${_path}/xenppc-unstable.hg.working/xen
md5sum xen
# Distribute files
# Linux - dom0
# Linux - domU
rsync -aze ssh ${_kbuild_domU}/vmlinux.strip [EMAIL PROTECTED]:/root
# Xen
cd ${_path}/xenppc-unstable.hg.working
rsync -aze ssh xen/xen bran:
rsync -aze ssh dist install.sh [EMAIL PROTECTED]:/scratch/xen_install/
popd
---
Yours Tony
linux.conf.au http://linux.conf.au/ || http://
lca2007.linux.org.au/
Jan 15-20 2007 The Australian Linux Technical Conference!
___
Xen-ppc-devel mailing list
Xen-ppc-devel@lists.xensource.com
http://lists.xensource.com/xen-ppc-devel
___
Xen-ppc-devel mailing list
Xen-ppc-devel@lists.xensource.com
http://lists.xensource.com/xen-ppc-devel
