github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-20 08:18:24 +00:00
Code Issues Projects Releases Wiki Activity

static-qemu: Apply qemu patches from this repo.

Browse Source 
Apply the required patches when builing Qemu statically.

Fixes: #596.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
This commit is contained in:
Salvador Fuentes
2019-06-21 12:30:12 -05:00
parent dada7c69d2
commit 99e4f4cb33
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
static-build/qemu/Dockerfile
View File

@@ -36,12 +36,15 @@ RUN apt-get install -y \
RUN cd .. && git clone "${QEMU_REPO}" qemu RUN cd .. && git clone "${QEMU_REPO}" qemu
RUN git checkout "${QEMU_VERSION}" RUN git checkout "${QEMU_VERSION}"
RUN git clone https://github.com/qemu/capstone.git capstone 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 \ 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 -j$(nproc)
RUN make install DESTDIR=/tmp/qemu-static RUN make install DESTDIR=/tmp/qemu-static

4
static-build/qemu/build-static-qemu.sh
View File

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