From 0d1810feb7e8de734f961a6a2aa17ccc8a406ea0 Mon Sep 17 00:00:00 2001 From: Salvador Fuentes Date: Wed, 19 Jun 2019 16:22:51 -0500 Subject: [PATCH] static-build: qemu: be able to change prefix variable Instead of always having `prefix` hardcoded to `/opt/kata`, change the script to be able to take the value from an enviroment variable. Fixes: #589. Signed-off-by: Salvador Fuentes --- static-build/qemu/Dockerfile | 3 ++- static-build/qemu/build-static-qemu.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/static-build/qemu/Dockerfile b/static-build/qemu/Dockerfile index daecb6cc1..cdac59916 100644 --- a/static-build/qemu/Dockerfile +++ b/static-build/qemu/Dockerfile @@ -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) diff --git a/static-build/qemu/build-static-qemu.sh b/static-build/qemu/build-static-qemu.sh index eae0d4163..f887d0cb7 100755 --- a/static-build/qemu/build-static-qemu.sh +++ b/static-build/qemu/build-static-qemu.sh @@ -32,12 +32,14 @@ info "Build ${qemu_repo} version: ${qemu_version}" http_proxy="${http_proxy:-}" https_proxy="${https_proxy:-}" +prefix="${prefix:-"/opt/kata"}" 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