[Xen-changelog] [xen-unstable] Allow the i386 ramdisk to be used on x86_64. Part of a patch from Yu Ping Y.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID 9ba12ce7f938ced22efde41cebdde2a4cfd88119
# Parent  f3f4d24178cccc83febbd052a3f53f3e235c7e92
Allow the i386 ramdisk to be used on x86_64.  Part of a patch from Yu Ping Y.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 tools/xm-test/runtest.sh |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

diff -r f3f4d24178cc -r 9ba12ce7f938 tools/xm-test/runtest.sh
--- a/tools/xm-test/runtest.sh  Wed Nov 01 08:43:54 2006 +0000
+++ b/tools/xm-test/runtest.sh  Wed Nov 01 09:21:27 2006 +0000
@@ -78,7 +78,13 @@ runnable_tests() {
     eval $(./lib/XmTestReport/xmtest.py)
     ARCH=$(uname -m | sed -e s/i.86/i386/ -e 's/ppc\(64\)*/powerpc/')
     rrdver="initrd-${XM_TEST_MAJ}.${XM_TEST_MIN}-${ARCH}.img"
-    if [ "$realrd" != "$rrdver" ]; then
+    exp_flag=0
+    realarch=`echo $realrd | awk -F- '{print $3}' | awk -F. '{print $1}'`
+    rrdarch=`echo $rrdver | awk -F- '{print $3}' | awk -F. '{print $1}'`
+    if [ "$realarch" = "i386" -a "$rrdarch" = "x86_64" ]; then
+       exp_flag=1
+    fi
+    if [ $exp_flag -eq 0 -a "$realrd" != "$rrdver" ]; then
        echo "Error: ramdisk/initrd.img is from an old version, or is not for 
this "
         echo "architecture ($ARCH)."
        echo "You need to build a ramdisk from at least 
${XM_TEST_MAJ}.${XM_TEST_MIN}"

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog