docker: correctly escape $BACKEND in the help output

[Qemu-devel] [PATCH] docker: correctly escape $BACKEND in the help output

Philippe Mathieu-Daudé posted 1 patch 6 years, 5 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20171108024719.8389-1-f4bug@amsat.org

Test checkpatch passed

Test docker passed

Test ppc passed

Test s390x passed

tests/docker/Makefile.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] docker: correctly escape $BACKEND in the help output

Posted by Philippe Mathieu-Daudé 6 years, 5 months ago

In Makefiles the $ must be escaped as $$ in shell uses.

Since 8a2390a4f47:

 $ make docker
     [...]
     NETWORK=1            Enable virtual network interface with default backend.
     NETWORK=ACKEND     Enable virtual network interface with ACKEND.

Once escaped:

 $ make docker
     [...]
     NETWORK=1            Enable virtual network interface with default backend.
     NETWORK=$BACKEND     Enable virtual network interface with $BACKEND.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tests/docker/Makefile.include | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index f1a398e9fa..de87341528 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -109,7 +109,7 @@ docker:
 	@echo '    DEBUG=1              Stop and drop to shell in the created container'
 	@echo '                         before running the command.'
 	@echo '    NETWORK=1            Enable virtual network interface with default backend.'
-	@echo '    NETWORK=$BACKEND     Enable virtual network interface with $BACKEND.'
+	@echo '    NETWORK=$$BACKEND     Enable virtual network interface with $$BACKEND.'
 	@echo '    NOUSER               Define to disable adding current user to containers passwd.'
 	@echo '    NOCACHE=1            Ignore cache when build images.'
 	@echo '    EXECUTABLE=<path>    Include executable in image.'
-- 
2.15.0

Re: [Qemu-devel] [PATCH] docker: correctly escape $BACKEND in the help output

Posted by Fam Zheng 6 years, 5 months ago

On Tue, 11/07 23:47, Philippe Mathieu-Daudé wrote:
> In Makefiles the $ must be escaped as $$ in shell uses.
> 
> Since 8a2390a4f47:
> 
>  $ make docker
>      [...]
>      NETWORK=1            Enable virtual network interface with default backend.
>      NETWORK=ACKEND     Enable virtual network interface with ACKEND.
> 
> Once escaped:
> 
>  $ make docker
>      [...]
>      NETWORK=1            Enable virtual network interface with default backend.
>      NETWORK=$BACKEND     Enable virtual network interface with $BACKEND.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Queued, thanks!

Fam