* Re: [PR PATCH] [Updated] nvidia-container-toolkit: update to 1.16.1.
2024-08-06 12:27 [PR PATCH] nvidia-container-toolkit: update to 1.16.1 abenson
@ 2024-08-06 12:45 ` abenson
2024-08-06 12:51 ` abenson
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: abenson @ 2024-08-06 12:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages nvidia-container-toolkit_1.16.1
https://github.com/void-linux/void-packages/pull/51688
nvidia-container-toolkit: update to 1.16.1.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/51688.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia-container-toolkit_1.16.1-51688.patch --]
[-- Type: text/x-diff, Size: 3898 bytes --]
From 831327ead3416c65cee558fa55cd79779cec05bf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 6 Aug 2024 07:27:02 -0500
Subject: [PATCH 1/2] nvidia-container-toolkit: update to 1.16.1.
---
srcpkgs/nvidia-container-toolkit/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index 668856f4cf94cc..bf895eed9faba2 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,6 +1,6 @@
# Template file for 'nvidia-container-toolkit'
pkgname=nvidia-container-toolkit
-version=1.13.5
+version=1.16.1
revision=1
archs="x86_64"
build_style=go
@@ -14,11 +14,12 @@ maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/NVIDIA/nvidia-container-toolkit/"
distfiles="https://github.com/NVIDIA/nvidia-container-toolkit/archive/v${version}.tar.gz"
-checksum=2e95a89ca3ab95528df4bf32c5e0c8333e283e0465b9636458282c3d49a1b1da
+checksum=38a193444e0342c0a2c0d3664403e2c341eb77f1461b3f9172fd93c04de82165
post_install() {
ln -sf /usr/bin/nvidia-container-runtime-hook ${DESTDIR}/usr/bin/${pkgname}
vmkdir /etc/nvidia-container-runtime 755
- vinstall config/config.toml.rpm-yum 644 /etc/nvidia-container-runtime config.toml
- vinstall oci-nvidia-hook.json 644 /usr/share/containers/oci/hooks.d 00-oci-nvidia-hook.json
+ ${DESTDIR}/usr/bin/nvidia-ctk --quiet config \
+ --config-file=${DESTDIR}/etc/nvidia-container-runtime/config.toml \
+ --in-place
}
From 82b4bbb33f338d9b97ceccda314add639801203b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 6 Aug 2024 07:46:16 -0500
Subject: [PATCH 2/2] libnvidia-container: update to 1.16.1.
---
srcpkgs/libnvidia-container/patches/nogit.patch | 13 +++++++++++++
srcpkgs/libnvidia-container/template | 6 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/libnvidia-container/patches/nogit.patch
diff --git a/srcpkgs/libnvidia-container/patches/nogit.patch b/srcpkgs/libnvidia-container/patches/nogit.patch
new file mode 100644
index 00000000000000..6adfd657295db4
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/nogit.patch
@@ -0,0 +1,13 @@
+--- a/versions.mk
++++ b/versions.mk
+@@ -12,8 +12,8 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+-GIT_TAG ?= $(patsubst v%,%,$(shell git describe --tags 2>/dev/null))
+-GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
++#GIT_TAG ?= $(patsubst v%,%,$(shell git describe --tags 2>/dev/null))
++#;GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
+
+ LIB_NAME := libnvidia-container
+
diff --git a/srcpkgs/libnvidia-container/template b/srcpkgs/libnvidia-container/template
index 58cb3282e9ec0e..b98f000d458f61 100644
--- a/srcpkgs/libnvidia-container/template
+++ b/srcpkgs/libnvidia-container/template
@@ -1,6 +1,6 @@
# Template file for 'libnvidia-container'
pkgname=libnvidia-container
-version=1.13.5
+version=1.16.1
revision=1
archs="x86_64"
hostmakedepends="tar xz curl bmake groff m4 pkg-config which go"
@@ -10,10 +10,10 @@ maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/NVIDIA/libnvidia-container"
distfiles="https://github.com/NVIDIA/libnvidia-container/archive/v${version}.tar.gz"
-checksum=431522239d71728d2840b2f048d0a0733c3e6ad7a209bdf21c7d17c0aa661657
+checksum=cbc1dda7ee90b8b729c5f178292cd07b421863015d84b84c37e69c8d580ab3ff
do_build() {
- make dist prefix=/usr REVISION=${version}
+ make dist prefix=/usr REVISION=${version} LIB_VERSION=${version}
}
pre_install() {
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] nvidia-container-toolkit: update to 1.16.1.
2024-08-06 12:27 [PR PATCH] nvidia-container-toolkit: update to 1.16.1 abenson
2024-08-06 12:45 ` [PR PATCH] [Updated] " abenson
@ 2024-08-06 12:51 ` abenson
2024-08-06 14:10 ` abenson
2024-08-08 12:22 ` [PR PATCH] [Merged]: " abenson
3 siblings, 0 replies; 5+ messages in thread
From: abenson @ 2024-08-06 12:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages nvidia-container-toolkit_1.16.1
https://github.com/void-linux/void-packages/pull/51688
nvidia-container-toolkit: update to 1.16.1.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/51688.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia-container-toolkit_1.16.1-51688.patch --]
[-- Type: text/x-diff, Size: 4853 bytes --]
From 831327ead3416c65cee558fa55cd79779cec05bf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 6 Aug 2024 07:27:02 -0500
Subject: [PATCH 1/3] nvidia-container-toolkit: update to 1.16.1.
---
srcpkgs/nvidia-container-toolkit/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index 668856f4cf94cc..bf895eed9faba2 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,6 +1,6 @@
# Template file for 'nvidia-container-toolkit'
pkgname=nvidia-container-toolkit
-version=1.13.5
+version=1.16.1
revision=1
archs="x86_64"
build_style=go
@@ -14,11 +14,12 @@ maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/NVIDIA/nvidia-container-toolkit/"
distfiles="https://github.com/NVIDIA/nvidia-container-toolkit/archive/v${version}.tar.gz"
-checksum=2e95a89ca3ab95528df4bf32c5e0c8333e283e0465b9636458282c3d49a1b1da
+checksum=38a193444e0342c0a2c0d3664403e2c341eb77f1461b3f9172fd93c04de82165
post_install() {
ln -sf /usr/bin/nvidia-container-runtime-hook ${DESTDIR}/usr/bin/${pkgname}
vmkdir /etc/nvidia-container-runtime 755
- vinstall config/config.toml.rpm-yum 644 /etc/nvidia-container-runtime config.toml
- vinstall oci-nvidia-hook.json 644 /usr/share/containers/oci/hooks.d 00-oci-nvidia-hook.json
+ ${DESTDIR}/usr/bin/nvidia-ctk --quiet config \
+ --config-file=${DESTDIR}/etc/nvidia-container-runtime/config.toml \
+ --in-place
}
From 82b4bbb33f338d9b97ceccda314add639801203b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 6 Aug 2024 07:46:16 -0500
Subject: [PATCH 2/3] libnvidia-container: update to 1.16.1.
---
srcpkgs/libnvidia-container/patches/nogit.patch | 13 +++++++++++++
srcpkgs/libnvidia-container/template | 6 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/libnvidia-container/patches/nogit.patch
diff --git a/srcpkgs/libnvidia-container/patches/nogit.patch b/srcpkgs/libnvidia-container/patches/nogit.patch
new file mode 100644
index 00000000000000..6adfd657295db4
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/nogit.patch
@@ -0,0 +1,13 @@
+--- a/versions.mk
++++ b/versions.mk
+@@ -12,8 +12,8 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+-GIT_TAG ?= $(patsubst v%,%,$(shell git describe --tags 2>/dev/null))
+-GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
++#GIT_TAG ?= $(patsubst v%,%,$(shell git describe --tags 2>/dev/null))
++#;GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
+
+ LIB_NAME := libnvidia-container
+
diff --git a/srcpkgs/libnvidia-container/template b/srcpkgs/libnvidia-container/template
index 58cb3282e9ec0e..b98f000d458f61 100644
--- a/srcpkgs/libnvidia-container/template
+++ b/srcpkgs/libnvidia-container/template
@@ -1,6 +1,6 @@
# Template file for 'libnvidia-container'
pkgname=libnvidia-container
-version=1.13.5
+version=1.16.1
revision=1
archs="x86_64"
hostmakedepends="tar xz curl bmake groff m4 pkg-config which go"
@@ -10,10 +10,10 @@ maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/NVIDIA/libnvidia-container"
distfiles="https://github.com/NVIDIA/libnvidia-container/archive/v${version}.tar.gz"
-checksum=431522239d71728d2840b2f048d0a0733c3e6ad7a209bdf21c7d17c0aa661657
+checksum=cbc1dda7ee90b8b729c5f178292cd07b421863015d84b84c37e69c8d580ab3ff
do_build() {
- make dist prefix=/usr REVISION=${version}
+ make dist prefix=/usr REVISION=${version} LIB_VERSION=${version}
}
pre_install() {
From 1d99e3bec98976534d3fb2477e084642cdfcd787 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 6 Aug 2024 07:51:42 -0500
Subject: [PATCH 3/3] nvidia: add missing versioned library
---
srcpkgs/nvidia/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 3abef102d7f461..7a2f2c758b0f30 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
pkgname=nvidia
version=550.107.02
-revision=1
+revision=2
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom:NVIDIA Proprietary"
homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -273,6 +273,7 @@ do_install() {
# nvvm compiler
vinstall libnvidia-nvvm.so.${version} 755 usr/lib
+ ln -s /usr/lib/libnvidia-nvvm.so.${version} ${DESTDIR}/libnvidia-nvvm.so.4
# Libraries (64bit)
_install_libs usr/lib
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Updated] nvidia-container-toolkit: update to 1.16.1.
2024-08-06 12:27 [PR PATCH] nvidia-container-toolkit: update to 1.16.1 abenson
2024-08-06 12:45 ` [PR PATCH] [Updated] " abenson
2024-08-06 12:51 ` abenson
@ 2024-08-06 14:10 ` abenson
2024-08-08 12:22 ` [PR PATCH] [Merged]: " abenson
3 siblings, 0 replies; 5+ messages in thread
From: abenson @ 2024-08-06 14:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages nvidia-container-toolkit_1.16.1
https://github.com/void-linux/void-packages/pull/51688
nvidia-container-toolkit: update to 1.16.1.
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
A patch file from https://github.com/void-linux/void-packages/pull/51688.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia-container-toolkit_1.16.1-51688.patch --]
[-- Type: text/x-diff, Size: 4861 bytes --]
From ab97cb9121378b367cf585c920300e2f0099b28e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 6 Aug 2024 07:27:02 -0500
Subject: [PATCH 1/3] nvidia-container-toolkit: update to 1.16.1.
---
srcpkgs/nvidia-container-toolkit/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
index 668856f4cf94cc..bf895eed9faba2 100644
--- a/srcpkgs/nvidia-container-toolkit/template
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -1,6 +1,6 @@
# Template file for 'nvidia-container-toolkit'
pkgname=nvidia-container-toolkit
-version=1.13.5
+version=1.16.1
revision=1
archs="x86_64"
build_style=go
@@ -14,11 +14,12 @@ maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/NVIDIA/nvidia-container-toolkit/"
distfiles="https://github.com/NVIDIA/nvidia-container-toolkit/archive/v${version}.tar.gz"
-checksum=2e95a89ca3ab95528df4bf32c5e0c8333e283e0465b9636458282c3d49a1b1da
+checksum=38a193444e0342c0a2c0d3664403e2c341eb77f1461b3f9172fd93c04de82165
post_install() {
ln -sf /usr/bin/nvidia-container-runtime-hook ${DESTDIR}/usr/bin/${pkgname}
vmkdir /etc/nvidia-container-runtime 755
- vinstall config/config.toml.rpm-yum 644 /etc/nvidia-container-runtime config.toml
- vinstall oci-nvidia-hook.json 644 /usr/share/containers/oci/hooks.d 00-oci-nvidia-hook.json
+ ${DESTDIR}/usr/bin/nvidia-ctk --quiet config \
+ --config-file=${DESTDIR}/etc/nvidia-container-runtime/config.toml \
+ --in-place
}
From 9bb7ec5ca796007fead066feae9a8641a9824b26 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 6 Aug 2024 07:46:16 -0500
Subject: [PATCH 2/3] libnvidia-container: update to 1.16.1.
---
srcpkgs/libnvidia-container/patches/nogit.patch | 13 +++++++++++++
srcpkgs/libnvidia-container/template | 6 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/libnvidia-container/patches/nogit.patch
diff --git a/srcpkgs/libnvidia-container/patches/nogit.patch b/srcpkgs/libnvidia-container/patches/nogit.patch
new file mode 100644
index 00000000000000..6adfd657295db4
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/nogit.patch
@@ -0,0 +1,13 @@
+--- a/versions.mk
++++ b/versions.mk
+@@ -12,8 +12,8 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+-GIT_TAG ?= $(patsubst v%,%,$(shell git describe --tags 2>/dev/null))
+-GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
++#GIT_TAG ?= $(patsubst v%,%,$(shell git describe --tags 2>/dev/null))
++#;GIT_COMMIT ?= $(shell git describe --match="" --dirty --long --always --abbrev=40 2> /dev/null || echo "")
+
+ LIB_NAME := libnvidia-container
+
diff --git a/srcpkgs/libnvidia-container/template b/srcpkgs/libnvidia-container/template
index 58cb3282e9ec0e..b98f000d458f61 100644
--- a/srcpkgs/libnvidia-container/template
+++ b/srcpkgs/libnvidia-container/template
@@ -1,6 +1,6 @@
# Template file for 'libnvidia-container'
pkgname=libnvidia-container
-version=1.13.5
+version=1.16.1
revision=1
archs="x86_64"
hostmakedepends="tar xz curl bmake groff m4 pkg-config which go"
@@ -10,10 +10,10 @@ maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/NVIDIA/libnvidia-container"
distfiles="https://github.com/NVIDIA/libnvidia-container/archive/v${version}.tar.gz"
-checksum=431522239d71728d2840b2f048d0a0733c3e6ad7a209bdf21c7d17c0aa661657
+checksum=cbc1dda7ee90b8b729c5f178292cd07b421863015d84b84c37e69c8d580ab3ff
do_build() {
- make dist prefix=/usr REVISION=${version}
+ make dist prefix=/usr REVISION=${version} LIB_VERSION=${version}
}
pre_install() {
From 178b7268b4488cd7920821cfc9663336d0de6d72 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 6 Aug 2024 07:51:42 -0500
Subject: [PATCH 3/3] nvidia: add missing versioned library
---
srcpkgs/nvidia/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 3abef102d7f461..ebabdd344bd1a4 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
pkgname=nvidia
version=550.107.02
-revision=1
+revision=2
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="custom:NVIDIA Proprietary"
homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -273,6 +273,7 @@ do_install() {
# nvvm compiler
vinstall libnvidia-nvvm.so.${version} 755 usr/lib
+ ln -s /usr/lib/libnvidia-nvvm.so.${version} ${DESTDIR}/usr/lib/libnvidia-nvvm.so.4
# Libraries (64bit)
_install_libs usr/lib
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PR PATCH] [Merged]: nvidia-container-toolkit: update to 1.16.1.
2024-08-06 12:27 [PR PATCH] nvidia-container-toolkit: update to 1.16.1 abenson
` (2 preceding siblings ...)
2024-08-06 14:10 ` abenson
@ 2024-08-08 12:22 ` abenson
3 siblings, 0 replies; 5+ messages in thread
From: abenson @ 2024-08-08 12:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
There's a merged pull request on the void-packages repository
nvidia-container-toolkit: update to 1.16.1.
https://github.com/void-linux/void-packages/pull/51688
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
fixes #51518
fixes #51704
^ permalink raw reply [flat|nested] 5+ messages in thread