From a8649acfd0cae499c675c3f6cdda1c2b022e5e58 Mon Sep 17 00:00:00 2001 From: "wangyongchao.bj" Date: Tue, 20 Jul 2021 15:24:42 +0800 Subject: [PATCH] snap: fixed snap aarch64 qemu patches dir in snapcraft.yaml file fixed arm qemu patches dir in snap part. Clear the old `packaging/obs-packaging` path. Fixes: #2279 Signed-off-by: wangyongchao.bj --- snap/snapcraft.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 247a681503..8c203b9333 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -256,7 +256,8 @@ parts: branch="$(${yq} r ${versions_file} assets.hypervisor.qemu.architecture.aarch64.branch)" 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/obs-packaging/qemu-aarch64/patches/" + 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}" ;; *)