[Qemu-devel] [PULL 0/2] Docker patches

[Qemu-devel] [PULL 0/2] Docker patches

[Fam Zheng]

The following changes since commit 392fba9f583223786f844dce9b2e7f9a0ce0147a:

  Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-updates-010618-1' into staging (2018-06-01 17:32:30 +0100)

are available in the Git repository at:

  git://github.com/famz/qemu.git tags/docker-pull-request

for you to fetch changes up to 63dba573fa65bf830ec3f78a8f3a6b0697ce1637:

  docker: Update fedora image to 28 (2018-06-04 14:39:18 +0800)

----------------------------------------------------------------

Hi Peter,

One improvement from Alex and one patch to track the Fedora latest
release.

----------------------------------------------------------------

Alex Bennée (1):
  tests/docker/Makefile.include: handle empty TARGET_LIST

Fam Zheng (1):
  docker: Update fedora image to 28

 rules.mak                              | 3 +++
 tests/docker/Makefile.include          | 2 +-
 tests/docker/dockerfiles/fedora.docker | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

-- 
2.17.0

[Qemu-devel] [PULL 1/2] tests/docker/Makefile.include: handle empty TARGET_LIST

[Fam Zheng]

From: Alex Bennée <alex.bennee@linaro.org>

If the user doesn't specify a TARGET_LIST they get the current
configuration but with spaces and hilarity ensues. This adds some make
magic to turn the TARGET_LIST back into a comma separated list.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Message-Id: <20180521103504.26432-1-alex.bennee@linaro.org>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 rules.mak                     | 3 +++
 tests/docker/Makefile.include | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules.mak b/rules.mak
index 04c7f74d07..bbb2667928 100644
--- a/rules.mak
+++ b/rules.mak
@@ -1,4 +1,7 @@
 
+# These are used when we want to do substitutions without confusing Make
+NULL  :=
+SPACE := $(NULL) #
 COMMA := ,
 
 # Don't use implicit rules or variables
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index 31f21a43f5..9d5749887a 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -140,7 +140,7 @@ docker-run: docker-qemu-src
 			$(if $V,,--rm) 					\
 			$(if $(DEBUG),-ti,)				\
 			$(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \
-			-e TARGET_LIST=$(TARGET_LIST) 			\
+			-e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST))	\
 			-e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \
 			-e V=$V -e J=$J -e DEBUG=$(DEBUG)		\
 			-e SHOW_ENV=$(SHOW_ENV) 			\
-- 
2.17.0

[Qemu-devel] [PULL 2/2] docker: Update fedora image to 28

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20180601023557.9770-1-famz@redhat.com>
---
 tests/docker/dockerfiles/fedora.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index b706f42405..65d7761cf5 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,4 +1,4 @@
-FROM fedora:27
+FROM fedora:28
 ENV PACKAGES \
     ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname \
     gcc gcc-c++ llvm clang make perl which bc findutils glib2-devel \
-- 
2.17.0

Re: [Qemu-devel] [PULL 0/2] Docker patches

[Peter Maydell]

On 4 June 2018 at 08:10, Fam Zheng <famz@redhat.com> wrote:
> The following changes since commit 392fba9f583223786f844dce9b2e7f9a0ce0147a:
>
>   Merge remote-tracking branch 'remotes/stsquad/tags/pull-travis-updates-010618-1' into staging (2018-06-01 17:32:30 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/famz/qemu.git tags/docker-pull-request
>
> for you to fetch changes up to 63dba573fa65bf830ec3f78a8f3a6b0697ce1637:
>
>   docker: Update fedora image to 28 (2018-06-04 14:39:18 +0800)
>
> ----------------------------------------------------------------
>
> Hi Peter,
>
> One improvement from Alex and one patch to track the Fedora latest
> release.
>
> ----------------------------------------------------------------
>
> Alex Bennée (1):
>   tests/docker/Makefile.include: handle empty TARGET_LIST
>
> Fam Zheng (1):
>   docker: Update fedora image to 28
>
>  rules.mak                              | 3 +++
>  tests/docker/Makefile.include          | 2 +-
>  tests/docker/dockerfiles/fedora.docker | 2 +-
>  3 files changed, 5 insertions(+), 2 deletions(-)
>

Applied, thanks.

-- PMM