WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-ia64-devel

[Xen-ia64-devel] [PATCH] minor fix for sparse-merge

To: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-ia64-devel] [PATCH] minor fix for sparse-merge
From: Aron Griffis <aron@xxxxxx>
Date: Fri, 19 May 2006 09:51:55 -0400
Delivery-date: Fri, 19 May 2006 07:02:11 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-ia64-devel-request@lists.xensource.com?subject=help>
List-id: Discussion of the ia64 port of Xen <xen-ia64-devel.lists.xensource.com>
List-post: <mailto:xen-ia64-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ia64-devel>, <mailto:xen-ia64-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ia64-devel>, <mailto:xen-ia64-devel-request@lists.xensource.com?subject=unsubscribe>
Mail-followup-to: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx
User-agent: Mutt/1.5.11
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>

diff -r 2fa8573b248f 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  Fri May 19 10:08:05 2006 -0400
@@ -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-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel

<Prev in Thread] Current Thread [Next in Thread>