github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 20:54:26 +00:00
Code Issues Projects Releases Wiki Activity

osbuilder/scripts: add support to yq version 4 and above

Browse Source 
yq changed syntax in an incompatible way starting from version 4 and
above. Deal with that.

Fixes: #2297

Signed-off-by: Francesco Giudici <fgiudici@redhat.com>
This commit is contained in:
Francesco Giudici 2021-07-22 14:28:32 +02:00
parent b817340f94
commit 0f8c0dbc52
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tools/osbuilder/scripts/lib.sh
View File

@ -335,32 +335,52 @@ RUN ln -sf /usr/bin/g++ /bin/musl-g++
popd popd
} }
detect_rust_version() get_package_version_from_kata_yaml()
{ {
info "Detecting agent rust version" local yq_path="$1"
local yq_version
local yq_args
typeset -r yq=$(command -v yq || command -v "${GOPATH}/bin/yq" || echo "${GOPATH}/bin/yq") typeset -r yq=$(command -v yq || command -v "${GOPATH}/bin/yq" || echo "${GOPATH}/bin/yq")
if [ ! -f "$yq" ]; then if [ ! -f "$yq" ]; then
source "$yq_file" source "$yq_file"
fi fi
info "Get rust version from ${kata_versions_file}" yq_version=$($yq -V)
RUST_VERSION="$(cat "${kata_versions_file}" | $yq r -X - "languages.rust.meta.newest-version")" case $yq_version in
*"version "[1-3]*)
yq_args="r -X - ${yq_path}"
;;
*)
yq_args="e .${yq_path} -"
;;
esac
[ "$?" == "0" ] && [ "$RUST_VERSION" != "null" ] PKG_VERSION="$(cat "${kata_versions_file}" | $yq ${yq_args})"
[ "$?" == "0" ] && [ "$PKG_VERSION" != "null" ] && echo "$PKG_VERSION" || echo ""
}
detect_rust_version()
{
info "Detecting agent rust version"
local yq_path="languages.rust.meta.newest-version"
info "Get rust version from ${kata_versions_file}"
RUST_VERSION="$(get_package_version_from_kata_yaml "$yq_path")"
[ -n "$RUST_VERSION" ]
} }
detect_musl_version() detect_musl_version()
{ {
info "Detecting musl version" info "Detecting musl version"
typeset -r yq=$(command -v yq || command -v "${GOPATH}/bin/yq" || echo "${GOPATH}/bin/yq") local yq_path="externals.musl.version"
if [ ! -f "$yq" ]; then
source "$yq_file"
fi
info "Get musl version from ${kata_versions_file}" info "Get musl version from ${kata_versions_file}"
MUSL_VERSION="$(cat "${kata_versions_file}" | $yq r -X - "externals.musl.version")" MUSL_VERSION="$(get_package_version_from_kata_yaml "$yq_path")"
[ "$?" == "0" ] && [ "$MUSL_VERSION" != "null" ] [ -n "$MUSL_VERSION" ]
} }
before_starting_container() { before_starting_container() {