Skip to content

Commit

Permalink
Merge pull request #590 from chavafg/topic/static-qemu-prefix
Browse files Browse the repository at this point in the history
static-build: qemu: be able to change prefix variable
  • Loading branch information
jcvenegas committed Jun 21, 2019
2 parents bb00e55 + 0d1810f commit 9b25e03
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion static-build/qemu/Dockerfile
Expand Up @@ -3,6 +3,7 @@ from ubuntu:16.04
ARG QEMU_REPO
# commit/tag/branch
ARG QEMU_VERSION
ARG PREFIX

WORKDIR /root/qemu
RUN apt-get update
Expand Down Expand Up @@ -39,7 +40,7 @@ RUN git clone https://github.com/qemu/keycodemapdb.git ui/keycodemapdb

ADD configure-hypervisor.sh /root/configure-hypervisor.sh

RUN PREFIX=/opt/kata /root/configure-hypervisor.sh -s kata-qemu | xargs ./configure \
RUN PREFIX="${PREFIX}" /root/configure-hypervisor.sh -s kata-qemu | xargs ./configure \
--with-pkgversion=kata-static

RUN make -j$(nproc)
Expand Down
2 changes: 2 additions & 0 deletions static-build/qemu/build-static-qemu.sh
Expand Up @@ -36,12 +36,14 @@ info "Build ${qemu_repo} version: ${qemu_version}"

http_proxy="${http_proxy:-}"
https_proxy="${https_proxy:-}"
prefix="${prefix:-"/opt/kata"}"

sudo docker build \
--build-arg http_proxy="${http_proxy}" \
--build-arg https_proxy="${https_proxy}" \
--build-arg QEMU_REPO="${qemu_repo}" \
--build-arg QEMU_VERSION="${qemu_version}" \
--build-arg PREFIX="${prefix}" \
"${config_dir}" \
-f "${script_dir}/Dockerfile" \
-t qemu-static
Expand Down

0 comments on commit 9b25e03

Please sign in to comment.