From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Williamson <alex.williamson@hp.com>
Subject: Re: [Xen-staging] [xen-unstable] If we find a Linux
	repository in $(LINUX_SRC_PATH) then symlink it
Date: Mon, 04 Jun 2007 12:49:34 -0600
Message-ID: <1180982974.6221.151.camel@bling>
References: <200706041442.l54EgKQp007662@latara.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <200706041442.l54EgKQp007662@latara.uk.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Ian Campbell <Ian.Campbell@XenSource.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

On Mon, 2007-06-04 at 15:42 +0100, Xen staging patchbot-unstable wrote:
> # HG changeset patch
> # User Ian Campbell <ian.campbell@xensource.com>
> # Date 1180968092 -3600
> # Node ID c09dbe98e4d61d29138e8a2918d9ee8a85e1d6cf
> # Parent  5710c94e65394daadafd7a6780450e01a26bf32d
> If we find a Linux repository in $(LINUX_SRC_PATH) then symlink it
> instead of cloning it. This enables developers to keep a linux tree
> separate to their xen repository and to make changes there which are
> picked up by the Xen build.

   I don't like this at all, especially without an environment variable
I can use to disable it.  My standard mode of operation is to have a
directory with repos that exactly mirror upstream.  To work on code or
apply patches, I clone those and work from there.  I don't want the
default to be symlink'ing to my 'pristine' upstream repo copies.
Thanks,

	Alex

> ---
>  buildconfigs/src.hg-clone |   21 ++++++++++++++-------
>  1 files changed, 14 insertions(+), 7 deletions(-)
> 
> diff -r 5710c94e6539 -r c09dbe98e4d6 buildconfigs/src.hg-clone
> --- a/buildconfigs/src.hg-clone	Mon Jun 04 15:32:11 2007 +0100
> +++ b/buildconfigs/src.hg-clone	Mon Jun 04 15:41:32 2007 +0100
> @@ -20,17 +20,24 @@ XEN_LINUX_HGREV  ?= tip
>  XEN_LINUX_HGREV  ?= tip
>  
>  $(LINUX_SRCDIR)/.valid-src: $(__XEN_LINUX_UPDATE)
> -	set -e ; __repo=$(XEN_LINUX_HGREPO) ; \
> -	if [ ! -d $(LINUX_SRCDIR) ] ; then \
> -	    echo "Cloning $${__repo} to $(LINUX_SRCDIR)." ; \
> -	    $(HG) clone $${__repo} $(LINUX_SRCDIR) ; \
> +	set -e ; \
> +	if [ ! -e $(LINUX_SRCDIR)/.hg ] ; then \
> +	    __repo=$(XEN_LINUX_HGREPO) ; \
> +	    if [ -d $${__repo} ] ; then \
> +	        echo "Linking $${__repo} to $(LINUX_SRCDIR)." ; \
> +	        ln -s $${__repo} $(LINUX_SRCDIR) ; \
> +	    else \
> +	        echo "Cloning $${__repo} to $(LINUX_SRCDIR)." ; \
> +	        $(HG) clone $${__repo} $(LINUX_SRCDIR) ; \
> +	    fi ; \
>  	else \
> -	    echo "Pulling changes from $${__repo} into $(LINUX_SRCDIR)." ; \
> -	    $(HG) -R $(LINUX_SRCDIR) pull $${__repo} ; \
> +	    __parent=$$($(HG) -R $(LINUX_SRCDIR) path default) ; \
> +	    echo "Pulling changes from $${__parent} into $(LINUX_SRCDIR)." ; \
> +	    $(HG) -R $(LINUX_SRCDIR) pull $${__parent} ; \
>  	fi
>  	if [ -n "$(XEN_LINUX_HGREV)" ] ; then \
>  	    echo "Updating $(LINUX_SRCDIR) to revision $(XEN_LINUX_HGREV)." ; \
> -	    $(HG) update -R $(LINUX_SRCDIR) $(XEN_LINUX_HGREV) ; \
> +	    ( cd $(LINUX_SRCDIR) && $(HG) update $(XEN_LINUX_HGREV) ); \
>  	fi
>  	touch $@
>  
> 
> _______________________________________________
> Xen-staging mailing list
> Xen-staging@lists.xensource.com
> http://lists.xensource.com/xen-staging
> 
-- 
Alex Williamson                             HP Open Source & Linux Org.