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

Merge pull request #530 from nitkon/master

Browse Source 
runtime: qemu-lite required only for x86_64 arch
This commit is contained in:
James O. D. Hunt 2019-05-23 08:38:04 +01:00 committed by GitHub
commit 5db4f9f01e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ source ../scripts/pkglib.sh
SCRIPT_NAME=$0 SCRIPT_NAME=$0
SCRIPT_DIR=$(dirname "$0") SCRIPT_DIR=$(dirname "$0")
replace_list=()
# Package information # Package information
# Used by pkglib.sh # Used by pkglib.sh
@ -61,19 +62,22 @@ info "ksm-throttler ${KSM_THROTTLER_REQUIRED_VERSION}"
KATA_IMAGE_REQUIRED_VERSION=$(pkg_version "${kata_osbuilder_version}" "" "") KATA_IMAGE_REQUIRED_VERSION=$(pkg_version "${kata_osbuilder_version}" "" "")
info "image ${KATA_IMAGE_REQUIRED_VERSION}" info "image ${KATA_IMAGE_REQUIRED_VERSION}"
KATA_QEMU_LITE_REQUIRED_VERSION=$(pkg_version "${qemu_lite_version}" "" "${qemu_lite_hash}")
info "qemu-lite ${KATA_QEMU_LITE_REQUIRED_VERSION}"
KATA_QEMU_VANILLA_REQUIRED_VERSION=$(pkg_version "${qemu_vanilla_version}" "" "${qemu_vanilla_hash}") KATA_QEMU_VANILLA_REQUIRED_VERSION=$(pkg_version "${qemu_vanilla_version}" "" "${qemu_vanilla_hash}")
info "qemu-vanilla ${KATA_QEMU_VANILLA_REQUIRED_VERSION}" info "qemu-vanilla ${KATA_QEMU_VANILLA_REQUIRED_VERSION}"
if [ "$arch" == "x86_64" ]; then
KATA_QEMU_LITE_REQUIRED_VERSION=$(pkg_version "${qemu_lite_version}" "" "${qemu_lite_hash}")
info "qemu-lite ${KATA_QEMU_LITE_REQUIRED_VERSION}"
replace_list+=("qemu_lite_version=${KATA_QEMU_LITE_REQUIRED_VERSION}")
fi
PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/runtime} PROJECT_REPO=${PROJECT_REPO:-home:${OBS_PROJECT}:${OBS_SUBPROJECT}/runtime}
RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}") RELEASE=$(get_obs_pkg_release "${PROJECT_REPO}")
((RELEASE++)) ((RELEASE++))
set_versions "$kata_runtime_hash" set_versions "$kata_runtime_hash"
replace_list=( replace_list+=(
"GO_CHECKSUM=$go_checksum" "GO_CHECKSUM=$go_checksum"
"GO_VERSION=$go_version" "GO_VERSION=$go_version"
"GO_ARCH=$GO_ARCH" "GO_ARCH=$GO_ARCH"
@ -85,7 +89,6 @@ replace_list=(
"kata_shim_version=${SHIM_REQUIRED_VERSION}" "kata_shim_version=${SHIM_REQUIRED_VERSION}"
"ksm_throttler_version=${KSM_THROTTLER_REQUIRED_VERSION}" "ksm_throttler_version=${KSM_THROTTLER_REQUIRED_VERSION}"
"linux_container_version=${KERNEL_REQUIRED_VERSION}" "linux_container_version=${KERNEL_REQUIRED_VERSION}"
"qemu_lite_version=${KATA_QEMU_LITE_REQUIRED_VERSION}"
"qemu_vanilla_version=${KATA_QEMU_VANILLA_REQUIRED_VERSION}" "qemu_vanilla_version=${KATA_QEMU_VANILLA_REQUIRED_VERSION}"
) )