aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>2003-10-13 18:48:08 +0000
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>2003-10-13 18:48:08 +0000
commit09d5db490fd6a046534078d3c734e4f946d19296 (patch)
tree03fe16cf46a7c5c1f69a6d4ab339d14a74aa2c67
parent2f2720da7ecaa8ed1da048644c226400b1503665 (diff)
parent7889d846cafab029071545bcc76d33ab2b1b37c0 (diff)
downloadxen-09d5db490fd6a046534078d3c734e4f946d19296.tar.gz
xen-09d5db490fd6a046534078d3c734e4f946d19296.tar.bz2
xen-09d5db490fd6a046534078d3c734e4f946d19296.zip
bitkeeper revision 1.508 (3f8af368AwYbJS7oXYGeDRjPkgCdGQ)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
-rw-r--r--BitKeeper/etc/ignore1
-rwxr-xr-xtools/misc/xen-clone2
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 56ae72ca3c..4ada23afb0 100644
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -471,3 +471,4 @@ xen/arch/i386/nmi.o
xen/drivers/net/dummy.o
tools/misc/miniterm/miniterm
tools/misc/xen_read_console
+extras/mini-os/h/hypervisor-ifs
diff --git a/tools/misc/xen-clone b/tools/misc/xen-clone
index 6b9d7a4c22..3fdd23d5db 100755
--- a/tools/misc/xen-clone
+++ b/tools/misc/xen-clone
@@ -65,7 +65,7 @@ LINUX_VER=`/bin/ls -ld ${DEST_BK_REP}/xenolinux-sparse | sed -e 's!^.*xenolinux-
# copy in the master Linux tree for this kernel
if [ ! -d linux-${LINUX_VER} ]
then
-tar -zxf ${LINUX_DIR}/linux-${LINUX_VER}.tar.gz || tar -zxf ${LINUX_DIR}/linux-${LINUX_VER}.tgz || cp -a ${LINUX_DIR}/linux-${LINUX_VER} . || wget ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${LINUX_VER}.tar.gz -O- | tar -zxf - || exit -1
+tar -jxf ${LINUX_DIR}/linux-${LINUX_VER}.tar.bz2 || tar -zxf ${LINUX_DIR}/linux-${LINUX_VER}.tar.gz || tar -zxf ${LINUX_DIR}/linux-${LINUX_VER}.tgz || cp -a ${LINUX_DIR}/linux-${LINUX_VER} . || wget ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${LINUX_VER}.tar.gz -O- | tar -zxf - || exit -1
fi
# build and install Xen and tools