Merge pull request #590 from chavafg/topic/static-qemu-prefix

static-build: qemu: be able to change prefix variable
This commit is contained in:
Jose Carlos Venegas Munoz
2019-06-20 19:27:11 -05:00
committed by GitHub
2 changed files with 4 additions and 1 deletions

View File

@@ -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
@@ -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)

View File

@@ -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