From 7a79c5e8a9966e517918d1d08ca0e62027f575f5 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sun, 1 Dec 2019 19:01:40 +0100 Subject: [PATCH] updated qemu-user-static to 4.1.0-1 --- Makefile | 4 ++-- build/amd64-alpine-builder.dockerfile | 3 --- build/amd64-ubuntu-builder.dockerfile | 4 ---- build/arm32v7-alpine-builder.dockerfile | 2 +- build/arm32v7-ubuntu-builder.dockerfile | 2 +- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index b182fb8..5b3aeaf 100644 --- a/Makefile +++ b/Makefile @@ -74,11 +74,11 @@ FETCH_TARGETS += $(FETCHDIR)/jansson-$(JANSSON_VERSION).tar.gz $(FETCHDIR)/jansson-$(JANSSON_VERSION).tar.gz: URL := https://github.com/akheron/jansson/archive/v$(JANSSON_VERSION).tar.gz $(SKIP_MD5SUM)$(FETCHDIR)/jansson-$(JANSSON_VERSION).tar.gz: MD5 := c4b106528d5ffb521178565de1ba950d -QEMU_VERSION ?= v3.1.0-2 +QEMU_VERSION ?= v4.1.0-1 DOCKER_BUILDARGS += QEMU_VERSION_=$(QEMU_VERSION) FETCH_TARGETS += $(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION) $(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION): URL := https://github.com/multiarch/qemu-user-static/releases/download/$(QEMU_VERSION)/qemu-arm-static -$(SKIP_MD5SUM)$(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION): MD5 := 8ebd24e63fdfa07c557d45373bd831b1 +$(SKIP_MD5SUM)$(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION): MD5 := e508e6e4dd7f3a851207aac245a4653f ####################################################################################################################### # Architecture-specific rule target configuration diff --git a/build/amd64-alpine-builder.dockerfile b/build/amd64-alpine-builder.dockerfile index 2961a54..c2a3096 100644 --- a/build/amd64-alpine-builder.dockerfile +++ b/build/amd64-alpine-builder.dockerfile @@ -106,6 +106,3 @@ RUN set -x \ WORKDIR "$OUTDIR" ENTRYPOINT ["dumb-init", "--"] - -# unused -ARG QEMU_VERSION_=v3.1.0-2 diff --git a/build/amd64-ubuntu-builder.dockerfile b/build/amd64-ubuntu-builder.dockerfile index 0ca147f..bd0f707 100644 --- a/build/amd64-ubuntu-builder.dockerfile +++ b/build/amd64-ubuntu-builder.dockerfile @@ -104,7 +104,3 @@ RUN set -x \ WORKDIR "$OUTDIR" ENTRYPOINT ["dumb-init", "--"] - -# unused -ARG QEMU_VERSION_=v3.1.0-2 - diff --git a/build/arm32v7-alpine-builder.dockerfile b/build/arm32v7-alpine-builder.dockerfile index 035ff6c..3405ee9 100644 --- a/build/arm32v7-alpine-builder.dockerfile +++ b/build/arm32v7-alpine-builder.dockerfile @@ -3,7 +3,7 @@ ARG CODENAME=3.9 FROM ${REGISTRY_PREFIX}arm32v7/alpine:${CODENAME} as builder -ARG QEMU_VERSION_=v3.1.0-2 +ARG QEMU_VERSION_=v4.1.0-1 COPY docker/qemu-arm-static-$QEMU_VERSION_ /usr/bin/qemu-arm-static diff --git a/build/arm32v7-ubuntu-builder.dockerfile b/build/arm32v7-ubuntu-builder.dockerfile index 212eb90..efb2957 100644 --- a/build/arm32v7-ubuntu-builder.dockerfile +++ b/build/arm32v7-ubuntu-builder.dockerfile @@ -3,7 +3,7 @@ ARG CODENAME=bionic FROM ${REGISTRY_PREFIX}arm32v7/ubuntu:${CODENAME} as builder -ARG QEMU_VERSION_=v3.1.0-2 +ARG QEMU_VERSION_=v4.1.0-1 COPY docker/qemu-arm-static-$QEMU_VERSION_ /usr/bin/qemu-arm-static