bump: qemu-5.0.0-49ee115552

qemu upstream has merged mremap patch as of 49ee115552

closes #4

Author: mikdusan

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.11.6
+FROM alpine:3.12.0
 
 RUN apk update
 RUN apk upgrade
@@ -15,7 +15,7 @@ RUN apk add\
  zlib-dev zlib-static
 
 # additional
-RUN apk add bash xz
+RUN apk add bash xz git patch
 
 WORKDIR /work
 

command/base

@@ -8,14 +8,24 @@ HOST_ARCH=${HOST_ARCH_RAW,,}
 
 QEMU_NAME="qemu"
 QEMU_REV="5.0.0"
-QEMU_SRC_BASENAME="${QEMU_NAME}-${QEMU_REV}"
-QEMU_SRC_URL="https://download.qemu.org/${QEMU_SRC_BASENAME}.tar.xz"
-QEMU_SRC_PREFIX="${QEMU_REV}"
-
-# blank when QEMU_REV bumps, otherwise begin count from 1
-QEMU_REV_ZIG_SERIAL=2
-QEMU_REV_ZIG=${QEMU_REV_ZIG_SERIAL:+-z$QEMU_REV_ZIG_SERIAL}
-QEMU_ARTIFACT_BASENAME="${QEMU_NAME}-${HOST_OS}-${HOST_ARCH}-${QEMU_REV}${QEMU_REV_ZIG}"
+
+# when not empty use `git clone` instead of downloading source tarball
+QEMU_GIT_COMMIT="49ee115552"
+
+# reset to blank when QEMU_REV/GIT_COMMIT bumps, otherwise begin count from 1
+QEMU_REV_ZIG_SERIAL=
+
+if [ -n $QEMU_GIT_COMMIT ]; then
+    QEMU_SRC_BASENAME="${QEMU_NAME}-${QEMU_REV}-${QEMU_GIT_COMMIT}"
+else
+    QEMU_SRC_BASENAME="${QEMU_NAME}-${QEMU_REV}"
+    QEMU_SRC_URL="https://download.qemu.org/${QEMU_SRC_BASENAME}.tar.xz"
+fi
+
+QEMU_ARTIFACT_F0=${QEMU_GIT_COMMIT:+-$QEMU_GIT_COMMIT}
+QEMU_ARTIFACT_F1=${QEMU_REV_ZIG_SERIAL:+-z$QEMU_REV_ZIG_SERIAL}
+
+QEMU_ARTIFACT_BASENAME="${QEMU_NAME}-${HOST_OS}-${HOST_ARCH}-${QEMU_REV}${QEMU_ARTIFACT_F0}${QEMU_ARTIFACT_F1}"
 
 WORKDIR() {
     mkdir -p $1

command/extract

@@ -4,5 +4,9 @@ set -e
 
 . $(dirname $0)/base
 
+if [ -n $QEMU_GIT_COMMIT ]; then
+    exit 0
+fi
+
 WORKDIR /work/src
 RUN tar xf "$(basename ${QEMU_SRC_URL})"

command/fetch

@@ -5,4 +5,11 @@ set -e
 . $(dirname $0)/base
 
 WORKDIR /work/src
-RUN wget "${QEMU_SRC_URL}"
+
+if [ -n $QEMU_GIT_COMMIT ]; then
+    git clone --no-checkout https://github.com/qemu/qemu.git $QEMU_SRC_BASENAME
+    cd $QEMU_SRC_BASENAME
+    git checkout $QEMU_GIT_COMMIT
+else
+    RUN wget "${QEMU_SRC_URL}"
+fi

command/patch

@@ -6,4 +6,3 @@ set -e
 
 WORKDIR "/work/src/${QEMU_SRC_BASENAME}"
 RUN patch -p1 -i "${WORK_ROOT}/patch/qemu.diff"
-RUN patch -p1 -i "${WORK_ROOT}/patch/mremap-underflow.diff"