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

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

[Fam Zheng]

The following changes since commit 6181478f6395cdd9d6ffd99623d0c9f39ea53606:

  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-02-28 08:46:03 +0000)

are available in the git repository at:

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

for you to fetch changes up to 1ed9251515382a1fc9c6187fee8d7d7bf141dc90:

  .shippable: add s390x-cross target (2017-02-28 20:31:01 +0800)

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

Two more test/build automation patches from Alex for the freeze. Theoretically
these are okay to merge even after freeze but on the other hand I see no reason
to delay them.

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

Alex Bennée (2):
  new: dockerfiles/debian-s390-cross
  .shippable: add s390x-cross target

 .shippable.yml                                     |  2 ++
 tests/docker/dockerfiles/debian-s390x-cross.docker | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 tests/docker/dockerfiles/debian-s390x-cross.docker

-- 
2.9.3

[Qemu-devel] [PULL 1/2] new: dockerfiles/debian-s390-cross

[Fam Zheng]

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

This adds an s390 cross build target to our library of docker setups.
There is an issue with the xfslibs-dev:s390x package having a clash so
we do a || apt-get -f install to fixup the rest of the dependencies.

This doesn't build on the debian.docker file as we are using the
multilib compiler which is only available in stretch (the current
testing repo).

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
CC: Christian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20170227143028.16428-2-alex.bennee@linaro.org>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 tests/docker/dockerfiles/debian-s390x-cross.docker | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 tests/docker/dockerfiles/debian-s390x-cross.docker

diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
new file mode 100644
index 0000000..bbb21ed
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -0,0 +1,22 @@
+#
+# Docker s390 cross-compiler target
+#
+# This docker target is based on stretch (testing) as the stable build
+# doesn't have the cross compiler available.
+#
+FROM debian:testing-slim
+
+# Duplicate deb line as deb-src
+RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
+
+# Add the s390x architecture
+RUN dpkg --add-architecture s390x
+
+# Grab the updated list of packages
+RUN apt update
+RUN apt dist-upgrade -yy
+RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install
+RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch
+
+# Specify the cross prefix for this image (see tests/docker/common.rc)
+ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu-
-- 
2.9.3

[Qemu-devel] [PULL 2/2] .shippable: add s390x-cross target

[Fam Zheng]

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

Use the new debian-s390x-cross.docker target to cross compile for
s390.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20170227143028.16428-3-alex.bennee@linaro.org>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 .shippable.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.shippable.yml b/.shippable.yml
index 1a1fd7a..653bd75 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -5,6 +5,8 @@ env:
       TARGET_LIST=arm-softmmu,arm-linux-user
     - IMAGE=debian-arm64-cross
       TARGET_LIST=aarch64-softmmu,aarch64-linux-user
+    - IMAGE=debian-s390x-cross
+      TARGET_LIST=s390x-softmmu,s390x-linux-user
 build:
   pre_ci:
     - make docker-image-${IMAGE}
-- 
2.9.3

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

[Peter Maydell]

On 28 February 2017 at 12:44, Fam Zheng <famz@redhat.com> wrote:
> The following changes since commit 6181478f6395cdd9d6ffd99623d0c9f39ea53606:
>
>   Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-02-28 08:46:03 +0000)
>
> are available in the git repository at:
>
>   git://github.com/famz/qemu.git tags/docker-pull-request
>
> for you to fetch changes up to 1ed9251515382a1fc9c6187fee8d7d7bf141dc90:
>
>   .shippable: add s390x-cross target (2017-02-28 20:31:01 +0800)
>
> ----------------------------------------------------------------
>
> Two more test/build automation patches from Alex for the freeze. Theoretically
> these are okay to merge even after freeze but on the other hand I see no reason
> to delay them.
>
> ----------------------------------------------------------------
>
> Alex Bennée (2):
>   new: dockerfiles/debian-s390-cross
>   .shippable: add s390x-cross target
>
>  .shippable.yml                                     |  2 ++
>  tests/docker/dockerfiles/debian-s390x-cross.docker | 22 ++++++++++++++++++++++
>  2 files changed, 24 insertions(+)
>  create mode 100644 tests/docker/dockerfiles/debian-s390x-cross.docker

Applied, thanks.

-- PMM

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

[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

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

[Peter Maydell]

On 10 November 2017 at 13:42, Fam Zheng <famz@redhat.com> wrote:
> The following changes since commit b0fbe46ad82982b289a44ee2495b59b0bad8a842:
>
>   Update version for v2.11.0-rc0 release (2017-11-07 16:05:28 +0000)
>
> are available in the git repository at:
>
>   git://github.com/famz/qemu.git tags/docker-pull-request
>
> for you to fetch changes up to 6423795efc5b665c595d9a0bf93cfbbca00362e9:
>
>   docker: correctly escape $BACKEND in the help output (2017-11-08 10:59:42 +0800)
>
> ----------------------------------------------------------------
>
> Hi Peter,
>
> Here are two fixes on docker testing (the one saying "improved" is to
> make it actually "correct"). Thanks.
>
> Fam
>
> ----------------------------------------------------------------
>
> Fam Zheng (1):
>   docker: Improved image checksum
>
> Philippe Mathieu-Daudé (1):
>   docker: correctly escape $BACKEND in the help output
>
>  tests/docker/Makefile.include |  2 +-
>  tests/docker/docker.py        | 24 +++++++++++++++++++++++-
>  2 files changed, 24 insertions(+), 2 deletions(-)
>

Applied, thanks.

-- PMM

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

[Fam Zheng]

The following changes since commit b0fbe46ad82982b289a44ee2495b59b0bad8a842:

  Update version for v2.11.0-rc0 release (2017-11-07 16:05:28 +0000)

are available in the git repository at:

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

for you to fetch changes up to 6423795efc5b665c595d9a0bf93cfbbca00362e9:

  docker: correctly escape $BACKEND in the help output (2017-11-08 10:59:42 +0800)

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

Hi Peter,

Here are two fixes on docker testing (the one saying "improved" is to
make it actually "correct"). Thanks.

Fam

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

Fam Zheng (1):
  docker: Improved image checksum

Philippe Mathieu-Daudé (1):
  docker: correctly escape $BACKEND in the help output

 tests/docker/Makefile.include |  2 +-
 tests/docker/docker.py        | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

-- 
2.13.6

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

[Peter Maydell]

On 5 August 2016 at 10:04, Fam Zheng <famz@redhat.com> wrote:
> The following changes since commit 42e0d60f1615ef63d16e41bb1668805560c37870:
>
>   Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160804' into staging (2016-08-04 18:36:05 +0100)
>
> are available in the git repository at:
>
>   git@github.com:famz/qemu tags/docker-pull-request
>
> for you to fetch changes up to 4a93f78ed086d6f0bceb3f0b281009e6026935b7:
>
>   docker: Add "--enable-werror" to configure command line (2016-08-05 16:34:55 +0800)
>
> ----------------------------------------------------------------
>
> Two bug fixes. One fixes breakage on RHEL 7, reported by Paolo, the other one
> fixes the missing --enable-werror in docker build, which was intended since the
> beginning, but was left behind during later iterations of the initial patch
> series (lost .git in the docker src copy).
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

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

[Fam Zheng]

The following changes since commit 42e0d60f1615ef63d16e41bb1668805560c37870:

  Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160804' into staging (2016-08-04 18:36:05 +0100)

are available in the git repository at:

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

for you to fetch changes up to 4a93f78ed086d6f0bceb3f0b281009e6026935b7:

  docker: Add "--enable-werror" to configure command line (2016-08-05 16:34:55 +0800)

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

Two bug fixes. One fixes breakage on RHEL 7, reported by Paolo, the other one
fixes the missing --enable-werror in docker build, which was intended since the
beginning, but was left behind during later iterations of the initial patch
series (lost .git in the docker src copy).

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

Fam Zheng (2):
  docker: Be compatible with older docker
  docker: Add "--enable-werror" to configure command line

 tests/docker/Makefile.include | 5 ++---
 tests/docker/common.rc        | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.7.4