File tree Expand file tree Collapse file tree 4 files changed +9
-3
lines changed Expand file tree Collapse file tree 4 files changed +9
-3
lines changed Original file line number Diff line number Diff line change 1
1
.git /
2
+ LICENSE
3
+ README.md
2
4
artifact /
3
5
qemu.cid
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ docker build --tag qemu .
12
12
## run container, save ID, copy artifact(s)
13
13
```
14
14
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
16
16
```
17
17
18
18
## review final artifact(s)
Original file line number Diff line number Diff line change @@ -11,7 +11,11 @@ QEMU_REV="5.0.0"
11
11
QEMU_SRC_BASENAME="${QEMU_NAME}-${QEMU_REV}"
12
12
QEMU_SRC_URL="https://download.qemu.org/${QEMU_SRC_BASENAME}.tar.xz"
13
13
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}"
15
19
16
20
WORKDIR() {
17
21
mkdir -p $1
Original file line number Diff line number Diff line change 5
5
. $( dirname $0 ) /base
6
6
7
7
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"
9
9
RUN patch -p1 -i " ${WORK_ROOT} /patch/mremap-underflow.diff"
You can’t perform that action at this time.
0 commit comments