Skip to content

Commit 5b9eb3a

Browse files
committed
bump: qemu 5.0.0-z1
* artifact serial number is needed when bumping independent of upstream * housekeeping
1 parent c7788e8 commit 5b9eb3a

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
.git/
2+
LICENSE
3+
README.md
24
artifact/
35
qemu.cid

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ docker build --tag qemu .
1212
## run container, save ID, copy artifact(s)
1313
```
1414
docker run -it --cidfile=qemu.cid qemu true
15-
docker cp "$(cat qemu.cid):work/artifact" artifact
15+
docker cp "$(cat qemu.cid):work/artifact/." artifact
1616
```
1717

1818
## review final artifact(s)

command/base

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ QEMU_REV="5.0.0"
1111
QEMU_SRC_BASENAME="${QEMU_NAME}-${QEMU_REV}"
1212
QEMU_SRC_URL="https://download.qemu.org/${QEMU_SRC_BASENAME}.tar.xz"
1313
QEMU_SRC_PREFIX="${QEMU_REV}"
14-
QEMU_ARTIFACT_BASENAME="${QEMU_NAME}-${HOST_OS}-${HOST_ARCH}-${QEMU_REV}"
14+
15+
# blank when QEMU_REV bumps, otherwise begin count from 1
16+
QEMU_REV_ZIG_SERIAL=1
17+
QEMU_REV_ZIG=${QEMU_REV_ZIG_SERIAL:+-z$QEMU_REV_ZIG_SERIAL}
18+
QEMU_ARTIFACT_BASENAME="${QEMU_NAME}-${HOST_OS}-${HOST_ARCH}-${QEMU_REV}${QEMU_REV_ZIG}"
1519

1620
WORKDIR() {
1721
mkdir -p $1

command/patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ set -e
55
. $(dirname $0)/base
66

77
WORKDIR "/work/src/${QEMU_SRC_BASENAME}"
8-
RUN patch -p1 -i "${WORK_ROOT}/patch/${QEMU_NAME}.diff"
8+
RUN patch -p1 -i "${WORK_ROOT}/patch/qemu.diff"
99
RUN patch -p1 -i "${WORK_ROOT}/patch/mremap-underflow.diff"

0 commit comments

Comments
 (0)