From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <Ian.Campbell@citrix.com>
Subject: Re: [OSSTEST PATCH] ts-rumpuserxen-build: Cope with
 rumprun-xen rename
Date: Wed, 4 Feb 2015 14:47:17 +0000
Message-ID: <1423061237.24924.7.camel@citrix.com>
References: <21714.11693.286741.909556@mariner.uk.xensource.com>
	<1423060862-23078-1-git-send-email-ian.jackson@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <Ian.Campbell@citrix.com>) id 1YJ1F3-0000D3-FN
	for xen-devel@lists.xenproject.org; Wed, 04 Feb 2015 14:47:45 +0000
In-Reply-To: <1423060862-23078-1-git-send-email-ian.jackson@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: xen-devel@lists.xenproject.org, Martin Lucina <martin@lucina.net>
List-Id: xen-devel@lists.xenproject.org

On Wed, 2015-02-04 at 14:41 +0000, Ian Jackson wrote:
> rumpxen-app-* has been renamed to rumprun-xen-*.  We need to cope with
> either, at least for the transition.
> 
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> CC: Martin Lucina <martin@lucina.net>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> ---
>  ts-rumpuserxen-build |   11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/ts-rumpuserxen-build b/ts-rumpuserxen-build
> index 47bcf76..9e6580a 100755
> --- a/ts-rumpuserxen-build
> +++ b/ts-rumpuserxen-build
> @@ -98,9 +98,14 @@ END
>  }
>  
>  sub recordtools() {
> -    my $apptool = "$rux/app-tools/rumpxen-app";
> -    store_runvar('cmdprefix_configure', "$apptool-configure");
> -    store_runvar('cmdprefix_make',      "$apptool-make");
> +    foreach my $stem (qw(rumprun-xen rumpxen-app)) {
> +	my $apptool = "$rux/app-tools/$stem";
> +	next unless target_file_exists($ho, "$apptool-configure");
> +	store_runvar('cmdprefix_configure', "$apptool-configure");
> +	store_runvar('cmdprefix_make',      "$apptool-make");
> +	return;
> +    }
> +    die "app-tools not found ($rux)";
>  }
>  
>  sub install() {