[[XSATOOL]] repo: Add missing spaces in the configure cmdline for "xentools"

Julien Grall posted 1 patch 1 week ago
Failed in applying to current master (apply log)
repo.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

[[XSATOOL]] repo: Add missing spaces in the configure cmdline for "xentools"

Posted by Julien Grall 1 week ago
From: Julien Grall <jgrall@amazon.com>

The operator + will just concatenate two strings. As the result, the
configure cmdline for "xentools" will look like:

./configure --disable-stubdom --disable-qemu-traditional--with-system-qemu=/bin/false --with-system-seabios=/bin/false--disable-ovmf

This can be avoided by explicitely adding the spaces.

Signed-off-by: Julien Grall <jgrall@amazon.com>
---
 repo.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repo.go b/repo.go
index 1e7802f8142c..f00b7469101f 100644
--- a/repo.go
+++ b/repo.go
@@ -139,8 +139,8 @@ func MainRepoInit(unused *XSAMeta, args []string) (ret int) {
 	G.config.Tool.BuildSequences = map[string]BuildSequence{
 		"simple": {"./configure", "make -j 8"},
 		"xen":    {"make -j 8 xen"},
-		"xentools": {"./configure --disable-stubdom --disable-qemu-traditional" +
-			"--with-system-qemu=/bin/false --with-system-seabios=/bin/false" +
+		"xentools": {"./configure --disable-stubdom --disable-qemu-traditional " +
+			"--with-system-qemu=/bin/false --with-system-seabios=/bin/false " +
 			"--disable-ovmf",
 			"make -j 8"},
 	}
-- 
2.17.1


Re: [[XSATOOL]] repo: Add missing spaces in the configure cmdline for "xentools"

Posted by Julien Grall 1 week ago
Hmmm I forgot to CC George. Sorry for that.

On 27/07/2020 17:04, Julien Grall wrote:
> From: Julien Grall <jgrall@amazon.com>
> 
> The operator + will just concatenate two strings. As the result, the
> configure cmdline for "xentools" will look like:
> 
> ./configure --disable-stubdom --disable-qemu-traditional--with-system-qemu=/bin/false --with-system-seabios=/bin/false--disable-ovmf
> 
> This can be avoided by explicitely adding the spaces.
> 
> Signed-off-by: Julien Grall <jgrall@amazon.com>
> ---
>   repo.go | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/repo.go b/repo.go
> index 1e7802f8142c..f00b7469101f 100644
> --- a/repo.go
> +++ b/repo.go
> @@ -139,8 +139,8 @@ func MainRepoInit(unused *XSAMeta, args []string) (ret int) {
>   	G.config.Tool.BuildSequences = map[string]BuildSequence{
>   		"simple": {"./configure", "make -j 8"},
>   		"xen":    {"make -j 8 xen"},
> -		"xentools": {"./configure --disable-stubdom --disable-qemu-traditional" +
> -			"--with-system-qemu=/bin/false --with-system-seabios=/bin/false" +
> +		"xentools": {"./configure --disable-stubdom --disable-qemu-traditional " +
> +			"--with-system-qemu=/bin/false --with-system-seabios=/bin/false " +
>   			"--disable-ovmf",
>   			"make -j 8"},
>   	}
> 

-- 
Julien Grall

Re: [[XSATOOL]] repo: Add missing spaces in the configure cmdline for "xentools"

Posted by George Dunlap 1 week ago

> On Jul 27, 2020, at 5:04 PM, Julien Grall <julien@xen.org> wrote:
> 
> Hmmm I forgot to CC George. Sorry for that.
> 
> On 27/07/2020 17:04, Julien Grall wrote:
>> From: Julien Grall <jgrall@amazon.com>
>> The operator + will just concatenate two strings. As the result, the
>> configure cmdline for "xentools" will look like:
>> ./configure --disable-stubdom --disable-qemu-traditional--with-system-qemu=/bin/false --with-system-seabios=/bin/false--disable-ovmf
>> This can be avoided by explicitely adding the spaces.
>> Signed-off-by: Julien Grall <jgrall@amazon.com>

Oops — thanks.

Reviewed-by: George Dunlap <george.dunlap@citrix.com>