github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-20 02:10:46 +00:00
Code Issues Projects Releases Wiki Activity

kernel: checkout patched based on kata_version

Browse Source 
NEW_VERSION may be unbound whereas kata_version should be defined
following manual release process docs and while using github actions.
Use kata_version instead to checkout correct version of patches.
Check if kata_version is not empty before doing so,
as the release may be triggered for master as well.

Fixes #857

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
This commit is contained in:
Archana Shinde 2019-12-09 10:47:31 -08:00
parent 62d9bf2ed0
commit 0dbd00b19e
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/build-kernel.sh
View File

@ -272,10 +272,13 @@ get_config_and_patches() {
info "Clone config and patches" info "Clone config and patches"
patches_path="${default_patches_dir}" patches_path="${default_patches_dir}"
if [ ! -d "${patches_path}" ]; then if [ ! -d "${patches_path}" ]; then
tag="${kata_version:-$NEW_VERSION}" tag="${kata_version}"
git clone "https://${patches_repo}.git" "${patches_repo_dir}" git clone "https://${patches_repo}.git" "${patches_repo_dir}"
pushd "${patches_repo_dir}" >> /dev/null pushd "${patches_repo_dir}" >> /dev/null
git checkout $tag if [ -n $tag ] ; then
info "checking out $tag"
git checkout $tag
fi
popd >> /dev/null popd >> /dev/null
fi fi
fi fi

2
kernel/kata_config_version
View File

@ -1 +1 @@
58 59

8
release/kata-deploy-binaries.sh
View File

@ -119,8 +119,8 @@ install_kernel() {
kata_version=${1:-$kata_version} kata_version=${1:-$kata_version}
pushd "${script_dir}/../" pushd "${script_dir}/../"
info "build kernel" info "build kernel"
./kernel/build-kernel.sh setup kata_version="${kata_version}" ./kernel/build-kernel.sh setup
./kernel/build-kernel.sh build kata_version="${kata_version}" ./kernel/build-kernel.sh build
info "install kernel" info "install kernel"
kata_version="${kata_version}" DESTDIR="${destdir}" PREFIX="${prefix}" ./kernel/build-kernel.sh install kata_version="${kata_version}" DESTDIR="${destdir}" PREFIX="${prefix}" ./kernel/build-kernel.sh install
popd popd
@ -134,8 +134,8 @@ install_experimental_kernel() {
kata_version=${1:-$kata_version} kata_version=${1:-$kata_version}
pushd "${script_dir}/../" pushd "${script_dir}/../"
info "build experimental kernel" info "build experimental kernel"
./kernel/build-kernel.sh -e setup kata_version="${kata_version}" ./kernel/build-kernel.sh -e setup
./kernel/build-kernel.sh -e build kata_version="${kata_version}" ./kernel/build-kernel.sh -e build
info "install experimental kernel" info "install experimental kernel"
kata_version="${kata_version}" DESTDIR="${destdir}" PREFIX="${prefix}" ./kernel/build-kernel.sh -e install kata_version="${kata_version}" DESTDIR="${destdir}" PREFIX="${prefix}" ./kernel/build-kernel.sh -e install
popd popd