From 50cb24043e634aca8833ca7d52559a20aa9dc31d Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Wed, 4 Dec 2024 09:56:19 -0500 Subject: [PATCH 1/2] qemu: restore vendored copies of Python wheels used for building Signed-off-by: Simon Deziel --- snapcraft.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 48077cb7..e65b8231 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -925,6 +925,9 @@ parts: sed -i "s/^unset target_list$/target_list=\"${QEMUARCH}-softmmu\"/" configure sed -i 's#libseccomp_minver=".*#libseccomp_minver="0.0"#g' configure + # Restore vendored copies of meson and tomli Python wheels + git restore --source=4769f7051b0753455b775ab10c9226e149ed6237~ -- python/wheels/ + # Extract efi-virtio.rom from ipxe-qemu. # This doesn't work in the organize section below. mkdir -p "${CRAFT_PART_INSTALL}"/share/qemu From 17a958e268e1bcc38acccfff599188194565bf5a Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Mon, 25 Nov 2024 17:03:55 -0500 Subject: [PATCH 2/2] qemu: bump to import/1%8.2.2+ds-0ubuntu1.4 Signed-off-by: Simon Deziel --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index e65b8231..498c1f06 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -831,7 +831,7 @@ parts: - spice-protocol - spice-server source: https://git.launchpad.net/ubuntu/+source/qemu - source-commit: dace9112e7b63e52016227e4291db59383b2a2c5 # import/1%8.2.1+ds-1ubuntu5 + source-commit: 00b8bba93d55baefdc68d06e6ab78934825a32b7 # import/1%8.2.2+ds-0ubuntu1.4 source-depth: 1 source-type: git plugin: autotools