diff options
| author | Philippe Mathieu-Daudé | 2017-06-02 20:56:08 +0200 |
|---|---|---|
| committer | Alex Bennée | 2017-06-21 16:01:48 +0200 |
| commit | 4c84f662c2c7507220689d743d1c1fd32a9bbc2f (patch) | |
| tree | 8abd9d0aecf1365c26a4cd1afcd3d6e5cba0d974 /tests/docker/Makefile.include | |
| parent | docker: let _copy_with_mkdir() sub_path argument be optional (diff) | |
| download | qemu-4c84f662c2c7507220689d743d1c1fd32a9bbc2f.tar.gz qemu-4c84f662c2c7507220689d743d1c1fd32a9bbc2f.tar.xz qemu-4c84f662c2c7507220689d743d1c1fd32a9bbc2f.zip | |
docker: add --include-files argument to 'build' command
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker/Makefile.include')
| -rw-r--r-- | tests/docker/Makefile.include | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0ed8c3d323..61cc0d14e2 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -51,6 +51,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(SRC_PATH)/tests/docker/docker.py build qemu:$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ $(if $(NOUSER),,--add-current-user) \ + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ "BUILD","$*") @@ -107,6 +108,8 @@ docker: @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.' + @echo ' EXTRA_FILES="<path> [... <path>]"' + @echo ' Include extra files in image.' # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make |