github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-22 04:18:53 +00:00
Code Issues Projects Releases Wiki Activity

Packaging: stop using GOPATH for yq.

Browse Source 
Use the yq installed in the env.  Needed
to build kata from docker. The container builder
has not an initial Go env.

Signed-off-by: Carlos Venegas <jos.c.venegas.munoz@intel.com>
This commit is contained in:
Carlos Venegas
2021-06-29 15:51:25 +00:00
parent 0c5ded4bd7
commit 3533a5b61d
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/packaging/kernel/build-kernel.sh
View File

@@ -14,7 +14,6 @@ set -o pipefail
readonly script_name="$(basename "${BASH_SOURCE[0]}")"
readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
kata_version="${kata_version:-}"
#project_name
readonly project_name="kata-containers"
@@ -493,13 +492,9 @@ main() {
# If not kernel version take it from versions.yaml
if [ -z "$kernel_version" ]; then
if [[ ${experimental_kernel} == "true" ]]; then
kernel_version=$(get_from_kata_deps "assets.kernel-experimental.tag" "${kata_version}")
#Remove extra 'v'
kernel_version="${kernel_version#v}"
kernel_version=$(get_from_kata_deps "assets.kernel-experimental.tag")
else
kernel_version=$(get_from_kata_deps "assets.kernel.version" "${kata_version}")
#Remove extra 'v'
kernel_version="${kernel_version#v}"
kernel_version=$(get_from_kata_deps "assets.kernel.version")
fi
fi

6
tools/packaging/scripts/lib.sh
View File

@@ -34,13 +34,9 @@ install_yq() {
get_from_kata_deps() {
local dependency="$1"
GOPATH=${GOPATH:-${HOME}/go}
versions_file="${this_script_dir}/../../../versions.yaml"
#make sure yq is installed
install_yq >&2
result=$("${GOPATH}/bin/yq" read -X "$versions_file" "$dependency")
result=$("yq" read -X "$versions_file" "$dependency")
[ "$result" = "null" ] && result=""
echo "$result"
}