[Xen-changelog] [IA64] minor fix for sparse-merge

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

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 03424ac6fd58106092784351c9b46d7185897d7a
# Parent  2fa8573b248f78f716a8926b29e294f97e99e631
[IA64] minor fix for sparse-merge

Here's another sparse-merge patch to allow ARCH to be set on the
command-line, and to add -C to the final hg update since it's probably
switching between branches.

Signed-off-by: Aron Griffis <aron@xxxxxx>
---
 xen/arch/ia64/tools/sparse-merge |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff -r 2fa8573b248f -r 03424ac6fd58 xen/arch/ia64/tools/sparse-merge
--- a/xen/arch/ia64/tools/sparse-merge  Thu May 18 14:05:30 2006 -0600
+++ b/xen/arch/ia64/tools/sparse-merge  Sun May 21 07:22:58 2006 -0600
@@ -10,6 +10,8 @@
 # Tag of new upstream base to go to
 : ${NEWTAG:=v$(wget -O- -o/dev/null http://kernel.org/kdist/finger_banner \
     | awk '/latest stable/{print $NF}')}
+# Restrict merge to specific arch (set to . for all)
+: ${ARCH:=ia64}
 
 SPARSEDIR=linux-2.6-xen-sparse
 
@@ -35,7 +37,7 @@ done
 done
 hg up -C $OLDTAG || exit 1
 cd $WD
-for i in $(hg manifest | awk '{print($3)}' | grep $SPARSEDIR | grep ia64); do
+for i in $(hg manifest | awk '{print($3)}' | grep $SPARSEDIR | grep "$ARCH"); 
do
        cd $WD
 
        FILENAME=$(basename $i)
@@ -133,5 +135,5 @@ for i in $(hg manifest | awk '{print($3)
        fi
 done
 cd $LINUXPATH
-hg up $OLDCSET
+hg up -C $OLDCSET
 cd $WD

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