github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-11-04 11:50:15 +00:00
Code Issues Projects Releases Wiki Activity

qemu: Add support to build static qemu for dev tree

Browse Source 
Update static build scripts to allow build qemu dev tree.
When qemu starts the process for a new version the patch number
from the qemu version is more than 50. Add logic to detect it
and not apply patches fro the base branch.

For example:

Qemu 5.2.50 means the beginning for 6.0 development. After detect a
development version, patches for 5.2.x will not be applied.

Signed-off-by: Carlos Venegas <jos.c.venegas.munoz@intel.com>
This commit is contained in:
Carlos Venegas
2021-04-05 18:32:10 +00:00
parent 503039482b
commit 6491b9d7aa
3 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/packaging/scripts/apply_patches.sh
View File

@@ -45,6 +45,6 @@ if [ -d "$patches_dir" ]; then
done
else
echo "INFO: Patches directory does not exist: ${patches_dir}"
echo "INFO: Create a ${patches_dir}/no_patches file if the current qemu version has no patches"
echo "INFO: Create a ${patches_dir}/no_patches file if the current version has no patches"
exit 1;
fi

46
tools/packaging/scripts/patch_qemu.sh Executable file
View File

@@ -0,0 +1,46 @@
#!/bin/bash
#
# Copyright (c) 2021 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
set -o errexit
set -o nounset
set -o pipefail
set -o errtrace
script_dir=$(dirname $(readlink -f "$0"))
handle_error() {
local exit_code="${?}"
local line_number="${1:-}"
echo "error:"
echo "Failed at $line_number: ${BASH_COMMAND}"
exit "${exit_code}"
}
trap 'handle_error $LINENO' ERR
usage(){
echo "$0 <qemu_version> <patches_dir>"
}
qemu_version="${1:-}"
[ "${qemu_version}" == "" ] && usage && exit 1
patches_dir="${2:-}"
[ "${patches_dir}" == "" ] && usage && exit 1
apply_patches="${script_dir}/apply_patches.sh"
stable_branch=$(cat VERSION | awk 'BEGIN{FS=OFS="."}{print $1 "." $2 ".x"}')
patch_version=$(cat VERSION | awk 'BEGIN{FS=OFS="."}{print $3}')
if (( $patch_version >= 50));then
echo "Found qemu dev version: Qemu uses patch version +50 to identify new development tree."
echo "Patches for base version ${stable_branch} are not used for $(cat VERSION)"
else
echo "Apply patches for base version ${stable_branch}"
"${apply_patches}" "${patches_dir}/${stable_branch}"
fi
echo "Apply patches for specific qemu version ${qemu_version}"
"${apply_patches}" "${patches_dir}/tag_patches/${qemu_version}"

8
tools/packaging/static-build/qemu/Dockerfile
View File

@@ -63,13 +63,9 @@ RUN git clone https://github.com/qemu/keycodemapdb.git ui/keycodemapdb
ADD scripts/configure-hypervisor.sh /root/configure-hypervisor.sh
ADD qemu /root/kata_qemu
ADD scripts/apply_patches.sh /root/apply_patches.sh
ADD scripts/patch_qemu.sh /root/patch_qemu.sh
RUN echo "Apply patches for base version"
RUN stable_branch=$(cat VERSION | awk 'BEGIN{FS=OFS="."}{print $1 "." $2 ".x"}') && \
/root/apply_patches.sh "/root/kata_qemu/patches/${stable_branch}"
RUN echo "Apply patches for specific qemu version"
RUN /root/apply_patches.sh "/root/kata_qemu/patches/tag_patches/${QEMU_VERSION}"
RUN /root/patch_qemu.sh "${QEMU_VERSION}" "/root/kata_qemu/patches"
ARG PREFIX
ARG BUILD_SUFFIX