Merge pull request #597 from chavafg/topic/static-qemu-patches

static-qemu: Apply qemu patches from this repo.
This commit is contained in:
GabyCT
2019-07-02 10:00:13 -05:00
committed by GitHub
2 changed files with 8 additions and 5 deletions

View File

@@ -36,12 +36,15 @@ RUN apt-get install -y \
RUN cd .. && git clone "${QEMU_REPO}" qemu
RUN git checkout "${QEMU_VERSION}"
RUN git clone https://github.com/qemu/capstone.git capstone
RUN git clone https://github.com/qemu/keycodemapdb.git ui/keycodemapdb
RUN git clone https://github.com/qemu/keycodemapdb.git ui/keycodemapdb
ADD configure-hypervisor.sh /root/configure-hypervisor.sh
ADD scripts/configure-hypervisor.sh /root/configure-hypervisor.sh
ADD qemu/patches/* /root/kata_qemu_patches
RUN for patch in /root/kata_qemu_patches/*.patch; do git apply "$patch"; done
RUN PREFIX="${PREFIX}" /root/configure-hypervisor.sh -s kata-qemu | xargs ./configure \
--with-pkgversion=kata-static
--with-pkgversion=kata-static
RUN make -j$(nproc)
RUN make install DESTDIR=/tmp/qemu-static

View File

@@ -12,7 +12,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${script_dir}/../../scripts/lib.sh"
config_dir="${script_dir}/../../scripts/"
packaging_dir="${script_dir}/../.."
qemu_tar="kata-qemu-static.tar.gz"
qemu_repo="${qemu_repo:-}"
@@ -44,7 +44,7 @@ sudo docker build \
--build-arg QEMU_REPO="${qemu_repo}" \
--build-arg QEMU_VERSION="${qemu_version}" \
--build-arg PREFIX="${prefix}" \
"${config_dir}" \
"${packaging_dir}" \
-f "${script_dir}/Dockerfile" \
-t qemu-static