github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-01 15:57:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #549 from marcov/fix-obs-runtime-update

Browse Source 
runtime: fix regression in package generation
This commit is contained in:
GabyCT 2019-05-29 09:25:58 -05:00 committed by GitHub
commit abd6279da3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
obs-packaging/runtime/update.sh
View File

@ -50,7 +50,7 @@ pkg_2_version() {
pkg="${pkg#kata_}" pkg="${pkg#kata_}"
pkg="${pkg//_/-}" pkg="${pkg//_/-}"
pkg="${pkg//osbuilder/kata-containers-image}" pkg="${pkg//osbuilder/kata-containers-image}"
pkg="${pkg//linux/linux-container}" pkg="${pkg//kernel/linux-container}"
if [ -n "${PROJECT_REPO:-}" ]; then if [ -n "${PROJECT_REPO:-}" ]; then
local proj="${PROJECT_REPO%/runtime}" local proj="${PROJECT_REPO%/runtime}"
@ -85,7 +85,7 @@ info "proxy ${PROXY_REQUIRED_VERSION}"
SHIM_REQUIRED_VERSION=$(pkg_2_version "kata_shim") SHIM_REQUIRED_VERSION=$(pkg_2_version "kata_shim")
info "shim ${SHIM_REQUIRED_VERSION}" info "shim ${SHIM_REQUIRED_VERSION}"
KERNEL_REQUIRED_VERSION=$(pkg_2_version "kata_linux") KERNEL_REQUIRED_VERSION=$(pkg_2_version "kernel")
info "kata-linux-container ${KERNEL_REQUIRED_VERSION}" info "kata-linux-container ${KERNEL_REQUIRED_VERSION}"
KSM_THROTTLER_REQUIRED_VERSION=$(pkg_2_version "kata_ksm_throttler") KSM_THROTTLER_REQUIRED_VERSION=$(pkg_2_version "kata_ksm_throttler")
@ -101,6 +101,7 @@ info "qemu-vanilla ${KATA_QEMU_VANILLA_REQUIRED_VERSION}"
if [ "$arch" == "x86_64" ]; then if [ "$arch" == "x86_64" ]; then
KATA_QEMU_LITE_REQUIRED_VERSION=$(pkg_2_version "qemu_lite") KATA_QEMU_LITE_REQUIRED_VERSION=$(pkg_2_version "qemu_lite")
info "qemu-lite ${KATA_QEMU_LITE_REQUIRED_VERSION}" info "qemu-lite ${KATA_QEMU_LITE_REQUIRED_VERSION}"
replace_list+=("qemu_lite_version=${KATA_QEMU_LITE_REQUIRED_VERSION}")
fi fi
PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/runtime} PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/runtime}