From 6871aeaa601a8571eb86ac4f69bde77f1ecc5af1 Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Wed, 4 Aug 2021 17:08:52 +0800 Subject: [PATCH] snap: enable snap build for arm64 snap build for arm64 fail for a long time, here we enable it. the changes: 1. correct the variable of "branch" 2. add v5.1.0 under tag_patchs Fixes: #2194 Signed-off-by: Jianyong Wu --- snap/snapcraft.yaml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a467fde091..5aeff412b7 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -256,7 +256,7 @@ parts: # arch-specific definition case "$(uname -m)" in "aarch64") - branch="$(${yq} r ${versions_file} assets.hypervisor.qemu.architecture.aarch64.branch)" + branch="$(${yq} r ${versions_file} assets.hypervisor.qemu.architecture.aarch64.version)" url="$(${yq} r ${versions_file} assets.hypervisor.qemu.url)" commit="$(${yq} r ${versions_file} assets.hypervisor.qemu.architecture.aarch64.commit)" patches_dir="${kata_dir}/tools/packaging/qemu/patches/$(echo ${branch} | sed -e 's/.[[:digit:]]*$//' -e 's/^v//').x" @@ -283,6 +283,7 @@ parts: [ -n "$(ls -A capstone)" ] || git clone https://github.com/qemu/capstone capstone # Apply branch patches + [ -d "${patches_version_dir}" ] || mkdir "${patches_version_dir}" ${kata_dir}/tools/packaging/scripts/apply_patches.sh "${patches_dir}" ${kata_dir}/tools/packaging/scripts/apply_patches.sh "${patches_version_dir}" @@ -298,7 +299,15 @@ parts: | xargs ./configure # Copy QEMU configurations (Kconfigs) - cp -a ${kata_dir}/tools/packaging/qemu/default-configs/* default-configs/devices/ + case "$(branch)" in + "v5.1.0") + cp -a ${kata_dir}/tools/packaging/qemu/default-configs/* default-configs + ;; + + *) + cp -a ${kata_dir}/tools/packaging/qemu/default-configs/* default-configs/devices/ + ;; + esac # build and install make -j $(($(nproc)-1))