Re: [PATCH v4 09/11] osstest: make ts-xen-build work on FreeBSD

[Ian Campbell <ian.campbell@citrix.com>]

On Wed, 2015-02-18 at 17:18 +0100, Roger Pau Monne wrote:
> This patch contains a new subroutine that guesses the right make
> command to use (gmake on BSDs, make otherwise).

Will this also be needed from e.g. the ts-libvirt-build script? (I
assume you don't care about ts-kernel-build AKA ts-linux-build)

> 
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> ---
>  ts-xen-build | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/ts-xen-build b/ts-xen-build
> index 661f186..d800396 100755
> --- a/ts-xen-build
> +++ b/ts-xen-build
> @@ -28,6 +28,16 @@ selectbuildhost(\@ARGV);
>  # remaining arguments are passed as targets to "make"
>  builddirsprops();
>      
> +sub get_make_cmd() {
> +    my $uname = target_cmd_output_root($ho, 'uname -a', 200);
> +
> +    if ($uname =~ m/BSD/) {
> +        return "gmake";
> +    } else {
> +        return "make";
> +    }
> +}
> +
>  sub checkout () {
>      prepbuilddirs();
>  
> @@ -91,6 +101,7 @@ END
>  }
>  
>  sub build () {
> +    my $make_cmd = get_make_cmd();
>      my $xend_opt= $r{enable_xend} =~ m/true/ ? "--enable-xend" : "--disable-xend";
>      my $ovmf_opt= $r{enable_ovmf} =~ m/true/ ? "--enable-ovmf" : "--disable-ovmf";
>  
> @@ -112,7 +123,7 @@ END
>  END
>  #/;
>      buildcmd_stamped_logged(9000, 'build', '',<<END,'');
> -            $make_prefix make $makeflags @ARGV
> +            $make_prefix $make_cmd $makeflags @ARGV
>  END
>  }
>  



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel