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

snap: Fix yq error in build

Browse Source 
The snap build pulls the latest release of `yq`, but `yq` version 4
changed the CLI syntax for reading a YAML file.

Update the snap config file to use the new `yq` v4 syntax.

Fixes: #1232.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2021-01-11 11:23:16 +00:00
parent a6d52d3da1
commit 6cc1920c37
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
snap/snapcraft.yaml
View File

@ -68,7 +68,7 @@ parts:
chmod +x ${yq_path} chmod +x ${yq_path}
kata_dir=gopath/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME} kata_dir=gopath/src/github.com/${SNAPCRAFT_PROJECT_NAME}/${SNAPCRAFT_PROJECT_NAME}
version="$(${yq_path} r ${kata_dir}/versions.yaml languages.golang.meta.newest-version)" version="$(${yq_path} e .languages.golang.meta.newest-version ${kata_dir}/versions.yaml)"
tarfile="go${version}.${goos}-${goarch}.tar.gz" tarfile="go${version}.${goos}-${goarch}.tar.gz"
curl -LO https://golang.org/dl/${tarfile} curl -LO https://golang.org/dl/${tarfile}
tar -xf ${tarfile} --strip-components=1 tar -xf ${tarfile} --strip-components=1
@ -240,15 +240,15 @@ parts:
# arch-specific definition # arch-specific definition
case "$(uname -m)" in case "$(uname -m)" in
"aarch64") "aarch64")
branch="$(${yq} r ${versions_file} assets.hypervisor.qemu.architecture.aarch64.branch)" branch="$(${yq} e .assets.hypervisor.qemu.architecture.aarch64.branch ${versions_file})"
url="$(${yq} r ${versions_file} assets.hypervisor.qemu.url)" url="$(${yq} e .assets.hypervisor.qemu.url ${versions_file})"
commit="$(${yq} r ${versions_file} assets.hypervisor.qemu.architecture.aarch64.commit)" commit="$(${yq} e .assets.hypervisor.qemu.architecture.aarch64.commit ${versions_file})"
patches_dir="${kata_dir}/tools/packaging/obs-packaging/qemu-aarch64/patches/" patches_dir="${kata_dir}/tools/packaging/obs-packaging/qemu-aarch64/patches/"
;; ;;
*) *)
branch="$(${yq} r ${versions_file} assets.hypervisor.qemu.tag)" branch="$(${yq} e .assets.hypervisor.qemu.tag ${versions_file})"
url="$(${yq} r ${versions_file} assets.hypervisor.qemu.url)" url="$(${yq} e .assets.hypervisor.qemu.url ${versions_file})"
commit="" commit=""
patches_dir="${kata_dir}/tools/packaging/qemu/patches/$(echo ${branch} | sed -e 's/.[[:digit:]]*$//' -e 's/^v//').x" patches_dir="${kata_dir}/tools/packaging/qemu/patches/$(echo ${branch} | sed -e 's/.[[:digit:]]*$//' -e 's/^v//').x"
;; ;;