From fe5adae5d9b5380015c5c4f8f200daf4343c76f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 12 Jan 2024 12:20:35 +0100 Subject: [PATCH] qemu-tdx: Update to v8.1.0 + TDX patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's update the QEMU to the one that's officially maintained by Intel till all the TDX patches make their way upstream. We've had to also update python to explicitly use python3 and add python3-venv as part of the dependencies. Fixes: #8810 Signed-off-by: Fabiano Fidêncio --- .../tdx-qemu-next-2023.9.21-v8.1.0/no_patches.txt | 0 tools/packaging/static-build/qemu/Dockerfile | 4 ++-- versions.yaml | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 tools/packaging/qemu/patches/tag_patches/tdx-qemu-next-2023.9.21-v8.1.0/no_patches.txt diff --git a/tools/packaging/qemu/patches/tag_patches/tdx-qemu-next-2023.9.21-v8.1.0/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/tdx-qemu-next-2023.9.21-v8.1.0/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/packaging/static-build/qemu/Dockerfile b/tools/packaging/static-build/qemu/Dockerfile index 7ed1b8995d..1c4fd45d13 100644 --- a/tools/packaging/static-build/qemu/Dockerfile +++ b/tools/packaging/static-build/qemu/Dockerfile @@ -58,8 +58,8 @@ RUN apt-get update && apt-get upgrade -y && \ libseccomp-dev${DPKG_ARCH} \ libseccomp2${DPKG_ARCH} \ patch \ - python \ - python-dev \ + python3 \ + python3-dev \ python3-venv \ rsync \ zlib1g-dev${DPKG_ARCH} && \ diff --git a/versions.yaml b/versions.yaml index 36b817bdd4..bc3a77bc13 100644 --- a/versions.yaml +++ b/versions.yaml @@ -100,10 +100,9 @@ assets: .*/v?(\d\S+)\.tar\.gz qemu-tdx-experimental: - # yamllint disable-line rule:line-length - description: "QEMU with TDX support - based on https://github.com/intel/tdx-tools/releases/tag/2023ww15" - url: "https://github.com/kata-containers/qemu" - tag: "b67b00e6b4c7831a3f5bc684bc0df7a9bfd1bd56-plus-TDX-v1.10" + description: ¨QEMU with TDX support" + url: "https://github.com/intel/qemu-tdx" + tag: "tdx-qemu-next-2023.9.21-v8.1.0" qemu-snp-experimental: description: "QEMU with SNP support"