Merge pull request clearcontainers#46 from jcvenegas/kernel-config-ve…

…rsion-pgs pkg: kernel: Add kernel config version to pkg version.
egernst · May 29, 2018 · 456b7c2 · 456b7c2
2 parents f73782b + 028f8e8
commit 456b7c2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/kernel/kata-linux-container.dsc-template b/kernel/kata-linux-container.dsc-template
@@ -1,6 +1,6 @@
 Format: 3.0 (quilt)
 Source: kata-linux-container
-Version: @VERSION@-@RELEASE@
+Version: @VERSION@.@CONFIG_VERSION@-@RELEASE@
 Section: devel
 Priority: optional
 Maintainer: Kata containers team <https://github.com/kata-containers/>

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

diff --git a/kernel/update.sh b/kernel/update.sh
@@ -19,6 +19,7 @@ SCRIPT_DIR=$(dirname $0)
 
 PKG_NAME="kata-linux-container"
 VERSION=$kernel_version
+KATA_CONFIG_VERSION=$(cat "${SCRIPT_DIR}/kata_config_version")
 
 KR_SERIES="$(echo $VERSION | cut -d "." -f 1).x"
 KR_LTS=$(echo $VERSION | cut -d "." -f 1,2)
@@ -45,14 +46,15 @@ kernel_sha256=$(curl -L -s -f ${KR_SHA} | awk '/linux-'${VERSION}'.tar.xz/ {prin
 cp "configs/x86_kata_kvm_${KR_LTS}.x" config
 
 replace_list=(
-"VERSION=$VERSION"
+"VERSION=${VERSION}"
+"CONFIG_VERSION=${KATA_CONFIG_VERSION}"
 "RELEASE=$RELEASE"
 "KERNEL_SHA256=$kernel_sha256"
 )
 
 verify
 echo "Verify succeed."
 get_git_info
-changelog_update $VERSION
+changelog_update "${VERSION}-${KATA_CONFIG_VERSION}"
 generate_files "$SCRIPT_DIR" "${replace_list[@]}"
 build_pkg "${PROJECT_REPO}"
diff --git a/runtime/update.sh b/runtime/update.sh
@@ -50,7 +50,8 @@ SHIM_REQUIRED_VERSION=$(pkg_version "${kata_shim_version}" "${SHIM_RELEASE}" "${
 info "shim ${SHIM_REQUIRED_VERSION}"
 
 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}"
 
 KSM_THROTTLER_RELEASE=$(get_obs_pkg_release "home:${OBS_PROJECT}:${OBS_SUBPROJECT}/ksm-throttler")