ia64/xen-unstable

changeset 10023:03424ac6fd58

[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@hp.com>
author awilliam@xenbuild.aw
date Sun May 21 07:22:58 2006 -0600 (2006-05-21)
parents 2fa8573b248f
children 2e85df9329f8
files xen/arch/ia64/tools/sparse-merge
line diff
     1.1 --- a/xen/arch/ia64/tools/sparse-merge	Thu May 18 14:05:30 2006 -0600
     1.2 +++ b/xen/arch/ia64/tools/sparse-merge	Sun May 21 07:22:58 2006 -0600
     1.3 @@ -10,6 +10,8 @@
     1.4  # Tag of new upstream base to go to
     1.5  : ${NEWTAG:=v$(wget -O- -o/dev/null http://kernel.org/kdist/finger_banner \
     1.6      | awk '/latest stable/{print $NF}')}
     1.7 +# Restrict merge to specific arch (set to . for all)
     1.8 +: ${ARCH:=ia64}
     1.9  
    1.10  SPARSEDIR=linux-2.6-xen-sparse
    1.11  
    1.12 @@ -35,7 +37,7 @@ for t in $OLDTAG $NEWTAG; do
    1.13  done
    1.14  hg up -C $OLDTAG || exit 1
    1.15  cd $WD
    1.16 -for i in $(hg manifest | awk '{print($3)}' | grep $SPARSEDIR | grep ia64); do
    1.17 +for i in $(hg manifest | awk '{print($3)}' | grep $SPARSEDIR | grep "$ARCH"); do
    1.18  	cd $WD
    1.19  
    1.20  	FILENAME=$(basename $i)
    1.21 @@ -133,5 +135,5 @@ for i in $(hg manifest | awk '{print($3)
    1.22  	fi
    1.23  done
    1.24  cd $LINUXPATH
    1.25 -hg up $OLDCSET
    1.26 +hg up -C $OLDCSET
    1.27  cd $WD