From 9064bfb29437bce48c3e2e1f956be78eb63c8867 Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Tue, 12 Nov 2024 14:28:40 +0000 Subject: [PATCH 1/2] snapcraft: nvidia-container: Enable shallow clone To reduce the size of the git repo clone (~2GB) which is causing failures on riscv64. Signed-off-by: Thomas Parrott (cherry picked from commit 4503d12af52741f3bf73317314de4044925cf9a7) (cherry picked from commit 5c9aee86cb162393daa8a382d8f3ec2826c38425) --- snapcraft.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 8a607a39..b2292bb7 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -634,11 +634,12 @@ parts: nvidia-container: source: https://github.com/NVIDIA/libnvidia-container - source-commit: d2eb0afe86f0b643e33624ee64f065dd60e952d4 # v1.14.6 - # XXX: fails to build if using source-commit and source-depth - #source-depth: 1 + source-commit: 4c2494f16573b585788a42e9c7bee76ecd48c73d # v1.16.1 + source-depth: 1 source-type: git plugin: make + build-environment: + - GIT_TAG: "1.16.1" # Enables source-depth: 1, should match git tag without "v" prefix. build-packages: - bmake - curl From 2e0a4c856eb1fce9ad5e028258710a0430996f2f Mon Sep 17 00:00:00 2001 From: Thomas Parrott Date: Tue, 12 Nov 2024 15:59:15 +0000 Subject: [PATCH 2/2] snapcraft: nvidia-container: Bump to v1.17.1 Signed-off-by: Thomas Parrott (cherry picked from commit 5f48503037f5301c5bfc7af92e50dc27b1791f70) --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index b2292bb7..48077cb7 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -634,12 +634,12 @@ parts: nvidia-container: source: https://github.com/NVIDIA/libnvidia-container - source-commit: 4c2494f16573b585788a42e9c7bee76ecd48c73d # v1.16.1 + source-commit: 63d366ee3b4183513c310ac557bf31b05b83328f # v1.17.1 source-depth: 1 source-type: git plugin: make build-environment: - - GIT_TAG: "1.16.1" # Enables source-depth: 1, should match git tag without "v" prefix. + - GIT_TAG: "1.17.1" # Enables source-depth: 1, should match git tag without "v" prefix. build-packages: - bmake - curl