From a4355a7104d7451526c296b504973d91b193ce87 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Mon, 2 Jul 2018 12:37:48 -0500 Subject: [PATCH] pkgs: Make constent variables names for versions. Add `kata` prefix to versions variables. Signed-off-by: Jose Carlos Venegas Munoz --- obs-packaging/ksm-throttler/update.sh | 6 +++--- obs-packaging/runtime/update.sh | 2 +- obs-packaging/versions.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/obs-packaging/ksm-throttler/update.sh b/obs-packaging/ksm-throttler/update.sh index ad54d340aa..18a1d719d8 100755 --- a/obs-packaging/ksm-throttler/update.sh +++ b/obs-packaging/ksm-throttler/update.sh @@ -19,8 +19,8 @@ source ../scripts/pkglib.sh SCRIPT_NAME=$0 SCRIPT_DIR=$(dirname $0) PKG_NAME="kata-ksm-throttler" -VERSION=$ksm_throttler_version -HASH=$ksm_throttler_hash +VERSION="${kata_ksm_throttler_version}" +HASH="${kata_ksm_throttler_hash}" GENERATED_FILES=(_service kata-ksm-throttler.spec kata-ksm-throttler.dsc debian.control debian.rules) STATIC_FILES=(debian.compat) @@ -34,7 +34,7 @@ RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}") ((RELEASE++)) [ -n "$APIURL" ] && APIURL="-A ${APIURL}" -set_versions "$ksm_throttler_hash" +set_versions "$kata_ksm_throttler_hash" replace_list=( "GO_CHECKSUM=$go_checksum" diff --git a/obs-packaging/runtime/update.sh b/obs-packaging/runtime/update.sh index f05318e482..9a61971715 100755 --- a/obs-packaging/runtime/update.sh +++ b/obs-packaging/runtime/update.sh @@ -55,7 +55,7 @@ KERNEL_REQUIRED_VERSION=$(pkg_version "${kernel_version}.${KERNEL_CONFIG_VERSION info "kata-linux-container ${KERNEL_REQUIRED_VERSION}" KSM_THROTTLER_RELEASE=$(get_obs_pkg_release "home:${OBS_PROJECT}:${OBS_SUBPROJECT}/ksm-throttler") -KSM_THROTTLER_REQUIRED_VERSION=$(pkg_version "${ksm_throttler_version}" "${KSM_THROTTLER_RELEASE}" "${ksm_throttler_hash}") +KSM_THROTTLER_REQUIRED_VERSION=$(pkg_version "${kata_ksm_throttler_version}" "${KSM_THROTTLER_RELEASE}" "${kata_ksm_throttler_hash}") info "ksm-throttler ${KSM_THROTTLER_REQUIRED_VERSION}" KATA_CONTAINERS_IMAGE_RELEASE=$(get_obs_pkg_release "home:${OBS_PROJECT}:${OBS_SUBPROJECT}/kata-containers-image") diff --git a/obs-packaging/versions.txt b/obs-packaging/versions.txt index b654ffa7b7..7c75f46748 100644 --- a/obs-packaging/versions.txt +++ b/obs-packaging/versions.txt @@ -2,7 +2,7 @@ kata_runtime_hash=b7e3997bc1deed9eb40347d31557bce8dba6ae6b kata_proxy_hash=15459f4b4ac6f6a242445ff284fec14135bc0045 kata_shim_hash=5296edac3823b31eecebd90ad0b3e7ad81d6e88a kata_agent_hash=994ac9c5e439571ee399cc10d5f18636170f7779 -ksm_throttler_hash=67307e510b7295f9fe1503ee0ebc4f71eacc1561 +kata_ksm_throttler_hash=67307e510b7295f9fe1503ee0ebc4f71eacc1561 qemu_lite_hash=6ba2bfbee9a80bfd03605c5eb2ca743c8b68389e qemu_vanilla_hash=e3050471ff1daa7fefe88388dfa4e1d97ba1f0bc @@ -10,7 +10,7 @@ kata_runtime_version=1.1.0 kata_proxy_version=1.1.0 kata_shim_version=1.1.0 kata_agent_version=1.1.0 -ksm_throttler_version=1.1.0 +kata_ksm_throttler_version=1.1.0 kata_osbuilder_version=1.1.0 qemu_lite_version=2.11.0 qemu_vanilla_version=2.11