github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 12:14:48 +00:00
Code Issues Projects Releases Wiki Activity

snap: Use qemu.version to build snap

Browse Source 
Use only one key to refer the version used by kata.

Signed-off-by: Carlos Venegas <jos.c.venegas.munoz@intel.com>
This commit is contained in:
Carlos Venegas 2021-03-23 15:52:55 +00:00
parent 0f78a5dc96
commit 5a3ee7d7e9
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
snap/snapcraft.yaml
View File

@ -245,10 +245,11 @@ parts:
;; ;;
*) *)
branch="$(${yq} r ${versions_file} assets.hypervisor.qemu.tag)" branch="$(${yq} r ${versions_file} assets.hypervisor.qemu.version)"
url="$(${yq} r ${versions_file} assets.hypervisor.qemu.url)" url="$(${yq} r ${versions_file} assets.hypervisor.qemu.url)"
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"
patches_version_dir="${kata_dir}/tools/packaging/qemu/patches/tag_patches/${branch}"
;; ;;
esac esac
@ -261,15 +262,9 @@ parts:
[ -n "$(ls -A ui/keycodemapdb)" ] || git clone https://github.com/qemu/keycodemapdb ui/keycodemapdb/ [ -n "$(ls -A ui/keycodemapdb)" ] || git clone https://github.com/qemu/keycodemapdb ui/keycodemapdb/
[ -n "$(ls -A capstone)" ] || git clone https://github.com/qemu/capstone capstone [ -n "$(ls -A capstone)" ] || git clone https://github.com/qemu/capstone capstone
# Apply patches # Apply branch patches
for patch in ${patches_dir}/*.patch; do ${kata_dir}/tools/packaging/scripts/apply_patches.sh "${patches_dir}"
echo "Applying $(basename "$patch") ..." ${kata_dir}/tools/packaging/scripts/apply_patches.sh "${patches_version_dir}"
patch \
--batch \
--forward \
--strip 1 \
--input "$patch"
done
# Only x86_64 supports libpmem # Only x86_64 supports libpmem
[ "$(uname -m)" = "x86_64" ] && sudo apt-get --no-install-recommends install -y apt-utils ca-certificates libpmem-dev libseccomp-dev [ "$(uname -m)" = "x86_64" ] && sudo apt-get --no-install-recommends install -y apt-utils ca-certificates libpmem-dev libseccomp-dev