From d246e53968836f756d89803ad4f870c07db428a0 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Thu, 18 Jul 2024 11:09:31 +0100 Subject: [PATCH 1/2] qemu: Bump to import/1%8.2.2+ds-0ubuntu1 Matches what is in Noble. https://git.launchpad.net/ubuntu/+source/qemu/commit/?h=import/1%258.2.2%2bds-0ubuntu1&id=4769f7051b0753455b775ab10c9226e149ed6237 Signed-off-by: Thomas Parrott --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 9ad8cf963..6941f7342 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -847,7 +847,7 @@ parts: - spice-server source: https://git.launchpad.net/ubuntu/+source/qemu source-depth: 1 - source-tag: import/1%8.2.1+ds-1ubuntu5 + source-tag: import/1%8.2.2+ds-0ubuntu1 source-type: git plugin: autotools autotools-configure-parameters: From e2d89724afde8e33f4ec114f0e6810e5aa957371 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Thu, 18 Jul 2024 12:08:48 +0100 Subject: [PATCH 2/2] nftables: Use nftables 1.0.9 from core24 And remove unused dependencies. Signed-off-by: Thomas Parrott --- snapcraft.yaml | 63 ++++---------------------------------------------- 1 file changed, 4 insertions(+), 59 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 6941f7342..28d821b86 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -489,36 +489,6 @@ parts: prime: - lib/*/libatomic.so* - libmnl: - # XXX: Netfilter's git repo is unreliable - source: https://www.netfilter.org/projects/libmnl/files/libmnl-1.0.5.tar.bz2 - source-checksum: sha256/274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525 - plugin: autotools - autotools-configure-parameters: - - --prefix= - organize: - usr/lib/: lib/ - prime: - - lib/libmnl*so* - - libnftnl: - after: - - libmnl - # XXX: Netfilter's git repo is unreliable - source: https://www.netfilter.org/projects/libnftnl/files/libnftnl-1.2.6.tar.xz - source-checksum: sha256/ceeaea2cd92147da19f13a35a7f1a4bc2767ff897e838e4b479cf54b59c777f4 - plugin: autotools - autotools-configure-parameters: - - --prefix= - organize: - usr/lib/: lib/ - prime: - - lib/libnftnl*so* - override-build: | - craftctl default - - sed -i "s# /lib/libmnl.la# ${CRAFT_STAGE}/lib/libmnl.la#g" "${CRAFT_PART_INSTALL}/lib/libnftnl.la" - libtpms: source: https://github.com/stefanberger/libtpms source-depth: 1 @@ -614,41 +584,16 @@ parts: - lib/*/libreadline.so* nftables: - after: - - libmnl - - libnftnl - source: https://git.netfilter.org/nftables - # XXX: git.netfilter.org does not support depth/shallow clones - #source-depth: 1 - source-tag: v1.0.9 - source-type: git - plugin: autotools - autotools-configure-parameters: - - --prefix= - - --with-json - - --disable-man-doc - build-packages: - - libedit-dev - - libjansson-dev - - libreadline-dev + plugin: nil stage-packages: - - libjansson4 - override-build: | - set -ex - - # Git cherry-picks - git config user.email "noreply@lists.canonical.com" - git config user.name "LXD snap builder" - - set +ex - craftctl default + - nftables organize: - sbin/: bin/ usr/lib/: lib/ + usr/sbin/: bin/ prime: - bin/nft - lib/*/libjansson*so* - - lib/libnftables*so* + - lib/*/libnftables*so* nvidia-container: source: https://github.com/NVIDIA/libnvidia-container