github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 15:02:45 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
snap/snapcraft.yaml
View File

@ -188,6 +188,14 @@ parts:
- bison - bison
- flex - flex
override-build: | override-build: |
yq=${SNAPCRAFT_STAGE}/yq
export GOPATH=${SNAPCRAFT_STAGE}/gopath
kata_dir=${GOPATH}/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME}
versions_file="${kata_dir}/versions.yaml"
kernel_version="$(${yq} r $versions_file assets.kernel.version)"
#Remove extra 'v'
kernel_version=${kernel_version#v}
[ "$(uname -m)" = "s390x" ] && sudo apt-get --no-install-recommends install -y libssl-dev [ "$(uname -m)" = "s390x" ] && sudo apt-get --no-install-recommends install -y libssl-dev
export GOPATH=${SNAPCRAFT_STAGE}/gopath export GOPATH=${SNAPCRAFT_STAGE}/gopath
@ -197,13 +205,12 @@ parts:
cd ${kata_dir}/tools/packaging/kernel cd ${kata_dir}/tools/packaging/kernel
# Setup and build kernel # Setup and build kernel
./build-kernel.sh -d setup ./build-kernel.sh -v ${kernel_version} -d setup
kernel_dir_prefix="kata-linux-" kernel_dir_prefix="kata-linux-"
cd ${kernel_dir_prefix}* cd ${kernel_dir_prefix}*
version=$(basename ${PWD} | sed 's|'"${kernel_dir_prefix}"'||' | cut -d- -f1)
make -j $(($(nproc)-1)) EXTRAVERSION=".container" make -j $(($(nproc)-1)) EXTRAVERSION=".container"
kernel_suffix=${version}.container kernel_suffix=${kernel_version}.container
kata_kernel_dir=${SNAPCRAFT_PART_INSTALL}/usr/share/kata-containers kata_kernel_dir=${SNAPCRAFT_PART_INSTALL}/usr/share/kata-containers
mkdir -p ${kata_kernel_dir} mkdir -p ${kata_kernel_dir}

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

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

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