From: awilliam@xenbuild.aw <awilliam@xenbuild.aw>
Date: Sun, 21 May 2006 13:22:58 +0000 (-0600)
Subject: [IA64] minor fix for sparse-merge
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16053
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c4f94309946f97fc54d96de03d9a4cc955ec2029;p=xen.git

[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>
---

diff --git a/xen/arch/ia64/tools/sparse-merge b/xen/arch/ia64/tools/sparse-merge
index 09b2a9b663..dbca0c99be 100755
--- a/xen/arch/ia64/tools/sparse-merge
+++ b/xen/arch/ia64/tools/sparse-merge
@@ -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 @@ for t in $OLDTAG $NEWTAG; do
 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)}' | grep $SPARSEDIR | grep ia64); do
 	fi
 done
 cd $LINUXPATH
-hg up $OLDCSET
+hg up -C $OLDCSET
 cd $WD