github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-29 21:03:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #46 from jcvenegas/kernel-config-version-pgs

Browse Source 
pkg: kernel: Add kernel config version to pkg version.
This commit is contained in:
Salvador Fuentes 2018-05-29 15:39:58 -05:00 committed by GitHub
commit 456b7c2062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/kata-linux-container.dsc-template
View File

@ -1,6 +1,6 @@
Format: 3.0 (quilt) Format: 3.0 (quilt)
Source: kata-linux-container Source: kata-linux-container
Version: @VERSION@-@RELEASE@ Version: @VERSION@.@CONFIG_VERSION@-@RELEASE@
Section: devel Section: devel
Priority: optional Priority: optional
Maintainer: Kata containers team <https://github.com/kata-containers/> Maintainer: Kata containers team <https://github.com/kata-containers/>

2
kernel/kata-linux-container.spec-template
View File

@ -7,7 +7,7 @@
%define bzimage_arch x86 %define bzimage_arch x86
Name: kata-linux-container Name: kata-linux-container
Version: @VERSION@ Version: @VERSION@.@CONFIG_VERSION@
Release: @RELEASE@.<B_CNT> Release: @RELEASE@.<B_CNT>
License: GPL-2.0 License: GPL-2.0
Summary: The Linux kernel optimized for running inside a container Summary: The Linux kernel optimized for running inside a container

6
kernel/update.sh
View File

@ -19,6 +19,7 @@ SCRIPT_DIR=$(dirname $0)
PKG_NAME="kata-linux-container" PKG_NAME="kata-linux-container"
VERSION=$kernel_version VERSION=$kernel_version
KATA_CONFIG_VERSION=$(cat "${SCRIPT_DIR}/kata_config_version")
KR_SERIES="$(echo $VERSION | cut -d "." -f 1).x" KR_SERIES="$(echo $VERSION | cut -d "." -f 1).x"
KR_LTS=$(echo $VERSION | cut -d "." -f 1,2) KR_LTS=$(echo $VERSION | cut -d "." -f 1,2)
@ -45,7 +46,8 @@ kernel_sha256=$(curl -L -s -f ${KR_SHA} | awk '/linux-'${VERSION}'.tar.xz/ {prin
cp "configs/x86_kata_kvm_${KR_LTS}.x" config cp "configs/x86_kata_kvm_${KR_LTS}.x" config
replace_list=( replace_list=(
"VERSION=$VERSION" "VERSION=${VERSION}"
"CONFIG_VERSION=${KATA_CONFIG_VERSION}"
"RELEASE=$RELEASE" "RELEASE=$RELEASE"
"KERNEL_SHA256=$kernel_sha256" "KERNEL_SHA256=$kernel_sha256"
) )
@ -53,6 +55,6 @@ replace_list=(
verify verify
echo "Verify succeed." echo "Verify succeed."
get_git_info get_git_info
changelog_update $VERSION changelog_update "${VERSION}-${KATA_CONFIG_VERSION}"
generate_files "$SCRIPT_DIR" "${replace_list[@]}" generate_files "$SCRIPT_DIR" "${replace_list[@]}"
build_pkg "${PROJECT_REPO}" build_pkg "${PROJECT_REPO}"

3
runtime/update.sh
View File

@ -50,7 +50,8 @@ SHIM_REQUIRED_VERSION=$(pkg_version "${kata_shim_version}" "${SHIM_RELEASE}" "${
info "shim ${SHIM_REQUIRED_VERSION}" info "shim ${SHIM_REQUIRED_VERSION}"
KERNEL_RELEASE=$(get_obs_pkg_release "home:${OBS_PROJECT}:${OBS_SUBPROJECT}/linux-container") KERNEL_RELEASE=$(get_obs_pkg_release "home:${OBS_PROJECT}:${OBS_SUBPROJECT}/linux-container")
KERNEL_REQUIRED_VERSION=$(pkg_version "${kernel_version}" "${KERNEL_RELEASE}") KERNEL_CONFIG_VERSION=$(cat "${SCRIPT_DIR}/../kernel/kata_config_version")
KERNEL_REQUIRED_VERSION=$(pkg_version "${kernel_version}.${KERNEL_CONFIG_VERSION}" "${KERNEL_RELEASE}")
info "kata-linux-container ${KERNEL_REQUIRED_VERSION}" info "kata-linux-container ${KERNEL_REQUIRED_VERSION}"
KSM_THROTTLER_RELEASE=$(get_obs_pkg_release "home:${OBS_PROJECT}:${OBS_SUBPROJECT}/ksm-throttler") KSM_THROTTLER_RELEASE=$(get_obs_pkg_release "home:${OBS_PROJECT}:${OBS_SUBPROJECT}/ksm-throttler")