Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: nvidia-docker-2.6.0
@ 2021-09-22 20:56 quentin-z80
  2021-10-15 16:39 ` [PR PATCH] [Updated] " quentin-z80
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: quentin-z80 @ 2021-09-22 20:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 883 bytes --]

There is a new pull request by quentin-z80 against master on the void-packages repository

https://github.com/quentin-z80/void-packages nvidia-docker
https://github.com/void-linux/void-packages/pull/33059

New package: nvidia-docker-2.6.0
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Resolves:  #11084
Supersedes #17505

Can be tested by running:
`docker run --gpus all nvidia/cuda:9.0-base nvidia-smi`

A patch file from https://github.com/void-linux/void-packages/pull/33059.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia-docker-33059.patch --]
[-- Type: text/x-diff, Size: 9559 bytes --]

From b57818348c64624ceee076e5becf08d9da10a847 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:28:42 -0700
Subject: [PATCH 1/4] New package: libnvidia-container-1.5.1

---
 common/shlibs                                 |  1 +
 srcpkgs/libnvidia-container-devel             |  1 +
 .../patches/fix_makefile.patch                | 21 ++++++++++
 .../patches/fix_nvidia-modprobe.mk.patch      | 11 ++++++
 srcpkgs/libnvidia-container/template          | 38 +++++++++++++++++++
 5 files changed, 72 insertions(+)
 create mode 120000 srcpkgs/libnvidia-container-devel
 create mode 100644 srcpkgs/libnvidia-container/patches/fix_makefile.patch
 create mode 100644 srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch
 create mode 100644 srcpkgs/libnvidia-container/template

diff --git a/common/shlibs b/common/shlibs
index 6f250a63f5d0..5d182b4e9d5f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4023,3 +4023,4 @@ libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
 libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
+libnvidia-container.so.1 libnvidia-container-1.5.1_1
diff --git a/srcpkgs/libnvidia-container-devel b/srcpkgs/libnvidia-container-devel
new file mode 120000
index 000000000000..39e6f1942c7b
--- /dev/null
+++ b/srcpkgs/libnvidia-container-devel
@@ -0,0 +1 @@
+libnvidia-container
\ No newline at end of file
diff --git a/srcpkgs/libnvidia-container/patches/fix_makefile.patch b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
new file mode 100644
index 000000000000..59c4f83ec4b9
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
@@ -0,0 +1,21 @@
+--- a/Makefile  2021-07-25 09:30:29.172126492 -0700
++++ b/Makefile  2021-07-25 10:30:39.601936591 -0700
+@@ -23,7 +23,7 @@
+ 
+ ##### Global definitions #####
+ 
+-export prefix      = /usr/local
++export prefix      = /usr
+ export exec_prefix = $(prefix)
+ export bindir      = $(exec_prefix)/bin
+ export libdir      = $(exec_prefix)/lib
+@@ -123,7 +123,8 @@
+             -Wall -Wextra -Wcast-align -Wpointer-arith -Wmissing-prototypes -Wnonnull \
+             -Wwrite-strings -Wlogical-op -Wformat=2 -Wmissing-format-attribute -Winit-self -Wshadow \
+             -Wstrict-prototypes -Wunreachable-code -Wconversion -Wsign-conversion \
+-            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression $(CFLAGS)
++            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression \
++            -I/usr/include/tirpc -ltirpc $(CFLAGS)
+ LDFLAGS  := -Wl,-zrelro -Wl,-znow -Wl,-zdefs -Wl,--gc-sections $(LDFLAGS)
+ LDLIBS   := $(LDLIBS)
+ 
diff --git a/srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch b/srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch
new file mode 100644
index 000000000000..8b3287f97279
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch
@@ -0,0 +1,11 @@
+--- a/mk/nvidia-modprobe.mk  2021-07-25 09:25:03.857882583 -0700
++++ b/mk/nvidia-modprobe.mk  2021-07-25 09:25:29.586139143 -0700
+@@ -6,7 +6,7 @@
+
+ ##### Source definitions #####
+
+-VERSION        := 450.57
++VERSION        := 470.63.01
+ PREFIX         := nvidia-modprobe-$(VERSION)
+ URL            := https://github.com/NVIDIA/nvidia-modprobe/archive/$(VERSION).tar.gz
+
diff --git a/srcpkgs/libnvidia-container/template b/srcpkgs/libnvidia-container/template
new file mode 100644
index 000000000000..26aeee3acc0f
--- /dev/null
+++ b/srcpkgs/libnvidia-container/template
@@ -0,0 +1,38 @@
+# Template file for 'libnvidia-container'
+pkgname=libnvidia-container
+version=1.5.1
+revision=1
+archs="x86_64"
+hostmakedepends="tar xz curl bmake groff m4 pkg-config which"
+makedepends="rpcsvc-proto libcap-devel libseccomp-devel libtirpc-devel"
+short_desc="NVIDIA container runtime library"
+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=b12e1190df03875547628a776f97efe478fac77aa31a0fadfbea10df3bc2dc8d
+
+do_build() {
+	make dist prefix=/usr REVISION=${version}
+}
+
+pre_install() {
+	cd dist
+	tar xvf ${pkgname}_${version}_${archs}.tar.xz
+}
+
+do_install() {
+	vinstall dist/${pkgname}_${version}/usr/lib/${pkgname}.so.${version} 755 /usr/lib/ ${pkgname}.so.1
+
+	vbin dist/${pkgname}_${version}/usr/bin/nvidia-container-cli
+}
+
+libnvidia-container-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vinstall dist/${sourcepkg}_${version}/usr/lib/${sourcepkg}.a 644 /usr/lib/
+		vinstall dist/${sourcepkg}_${version}/usr/include/nvc.h 644 /usr/include/
+		vinstall dist/${sourcepkg}_${version}/usr/lib/pkgconfig/${sourcepkg}.pc 644 /usr/lib/pkgconfig/
+	}
+}

From 7f496d6b22d39cbd5013e5e8e5ebafa4174e5e04 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:30:05 -0700
Subject: [PATCH 2/4] New package: nvidia-container-toolkit-1.5.1

---
 srcpkgs/nvidia-container-toolkit/template | 38 +++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/nvidia-container-toolkit/template

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
new file mode 100644
index 000000000000..9b1de64e595d
--- /dev/null
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -0,0 +1,38 @@
+# Template file for 'nvidia-container-toolkit'
+pkgname=nvidia-container-toolkit
+version=1.5.1
+revision=1
+archs="x86_64"
+hostmakedepends="go"
+depends="libnvidia-container"
+short_desc="Build and run containers leveraging NVIDIA GPUs"
+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="51d6f2fa0e740d7581f6c632875bb87bafc2351ba32830df11bb7cb19d87b763"
+
+do_build() {
+	GOPATH="${PWD}/.gopath" \
+	go build -v \
+		-buildmode=pie \
+		-gcflags "all=-trimpath=${PWD}" \
+		-asmflags "all=-trimpath=${PWD}" \
+		-ldflags " -s -w -extldflags=-Wl,-z,now,-z,relro" \
+		-o "${pkgname}" \
+		"${PWD}/cmd/nvidia-container-toolkit"
+}
+
+do_install() {
+	vbin nvidia-container-toolkit
+	ln -sf /usr/bin/nvidia-container-toolkit ${DESTDIR}/usr/bin/nvidia-container-runtime-hook
+
+	vmkdir /etc/nvidia-container-runtime 755
+	vinstall config/config.toml.centos 644 /etc/nvidia-container-runtime config.toml
+	vinstall oci-nvidia-hook.json 644 /usr/share/containers/oci/hooks.d 00-oci-nvidia-hook.json
+}
+
+do_clean() {
+	GOPATH="${PWD}/.gopath" \
+	go clean -modcache
+}

From 5cb6d10cdf82506803ceac28f7833c7a19f4b21f Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:30:13 -0700
Subject: [PATCH 3/4] New package: nvidia-container-runtime-3.5.0

---
 srcpkgs/nvidia-container-runtime/template | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/nvidia-container-runtime/template

diff --git a/srcpkgs/nvidia-container-runtime/template b/srcpkgs/nvidia-container-runtime/template
new file mode 100644
index 000000000000..d47bfce80a45
--- /dev/null
+++ b/srcpkgs/nvidia-container-runtime/template
@@ -0,0 +1,27 @@
+# Template file for 'nvidia-container-runtime'
+pkgname=nvidia-container-runtime
+version=3.5.0
+revision=1
+archs="x86_64"
+hostmakedepends="go"
+makedepends="libseccomp-devel"
+depends="libseccomp nvidia-container-toolkit"
+short_desc="Modified version of runc adding a custom pre-start hook"
+maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/NVIDIA/nvidia-container-runtime/"
+distfiles="https://github.com/NVIDIA/nvidia-container-runtime/archive/v${version}.tar.gz"
+checksum="4985efe4488e441d0e4910cc7eb2046176db063e5bbe2e0542a7c08d5c5e7d34"
+
+pre_build() {
+	mkdir -p .gopath/src
+	ln -rTsf $PWD/src .gopath/src/${pkgname}
+}
+
+do_build() {
+	make build
+}
+
+do_install() {
+	vbin nvidia-container-runtime
+}

From 54763957c9c3d6b4b5cedc594f2170f26d3d4f77 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:30:17 -0700
Subject: [PATCH 4/4] New package: nvidia-docker-2.6.0

---
 srcpkgs/nvidia-docker/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/nvidia-docker/template

diff --git a/srcpkgs/nvidia-docker/template b/srcpkgs/nvidia-docker/template
new file mode 100644
index 000000000000..269a0ab7443c
--- /dev/null
+++ b/srcpkgs/nvidia-docker/template
@@ -0,0 +1,22 @@
+# Template file for 'nvidia-docker'
+pkgname=nvidia-docker
+version=2.6.0
+revision=1
+archs="x86_64"
+wrksrc="${pkgname}-${version}"
+depends="nvidia-container-toolkit libnvidia-container nvidia-container-runtime docker"
+short_desc="Build and run Docker containers leveraging NVIDIA GPUs"
+maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/NVIDIA/nvidia-docker"
+distfiles="https://github.com/NVIDIA/nvidia-docker/archive/v${version}.tar.gz"
+checksum="a2f41b91770e45d3f7e6d361be720573a20e88ea33d4f8c7984b6b0cfdc57214"
+
+pre_install() {
+	vsed -i nvidia-docker -e "s;@VERSION@;${version};"
+}
+
+do_install() {
+	vbin nvidia-docker
+	vinstall daemon.json 644 /etc/docker
+}

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] New package: nvidia-docker-2.6.0
  2021-09-22 20:56 [PR PATCH] New package: nvidia-docker-2.6.0 quentin-z80
@ 2021-10-15 16:39 ` quentin-z80
  2021-11-11 23:16 ` quentin-z80
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: quentin-z80 @ 2021-10-15 16:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

There is an updated pull request by quentin-z80 against master on the void-packages repository

https://github.com/quentin-z80/void-packages nvidia-docker
https://github.com/void-linux/void-packages/pull/33059

New package: nvidia-docker-2.6.0
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Resolves:  #11084
Supersedes #17505

Can be tested by running:
`docker run --gpus all nvidia/cuda:9.0-base nvidia-smi`

A patch file from https://github.com/void-linux/void-packages/pull/33059.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia-docker-33059.patch --]
[-- Type: text/x-diff, Size: 9554 bytes --]

From fad4375a8d42fe4db354d03367f41fd3b90268ca Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:28:42 -0700
Subject: [PATCH 1/4] New package: libnvidia-container-1.5.1

---
 common/shlibs                                 |  1 +
 srcpkgs/libnvidia-container-devel             |  1 +
 .../patches/fix_makefile.patch                | 21 ++++++++++
 .../patches/fix_nvidia-modprobe.mk.patch      | 11 ++++++
 srcpkgs/libnvidia-container/template          | 38 +++++++++++++++++++
 5 files changed, 72 insertions(+)
 create mode 120000 srcpkgs/libnvidia-container-devel
 create mode 100644 srcpkgs/libnvidia-container/patches/fix_makefile.patch
 create mode 100644 srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch
 create mode 100644 srcpkgs/libnvidia-container/template

diff --git a/common/shlibs b/common/shlibs
index 6b97d658c44a..7ebb390b1895 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4031,3 +4031,4 @@ libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
 libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
 libavif.so.12 libavif-0.9.2_1
+libnvidia-container.so.1 libnvidia-container-1.5.1_1
diff --git a/srcpkgs/libnvidia-container-devel b/srcpkgs/libnvidia-container-devel
new file mode 120000
index 000000000000..39e6f1942c7b
--- /dev/null
+++ b/srcpkgs/libnvidia-container-devel
@@ -0,0 +1 @@
+libnvidia-container
\ No newline at end of file
diff --git a/srcpkgs/libnvidia-container/patches/fix_makefile.patch b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
new file mode 100644
index 000000000000..59c4f83ec4b9
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
@@ -0,0 +1,21 @@
+--- a/Makefile  2021-07-25 09:30:29.172126492 -0700
++++ b/Makefile  2021-07-25 10:30:39.601936591 -0700
+@@ -23,7 +23,7 @@
+ 
+ ##### Global definitions #####
+ 
+-export prefix      = /usr/local
++export prefix      = /usr
+ export exec_prefix = $(prefix)
+ export bindir      = $(exec_prefix)/bin
+ export libdir      = $(exec_prefix)/lib
+@@ -123,7 +123,8 @@
+             -Wall -Wextra -Wcast-align -Wpointer-arith -Wmissing-prototypes -Wnonnull \
+             -Wwrite-strings -Wlogical-op -Wformat=2 -Wmissing-format-attribute -Winit-self -Wshadow \
+             -Wstrict-prototypes -Wunreachable-code -Wconversion -Wsign-conversion \
+-            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression $(CFLAGS)
++            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression \
++            -I/usr/include/tirpc -ltirpc $(CFLAGS)
+ LDFLAGS  := -Wl,-zrelro -Wl,-znow -Wl,-zdefs -Wl,--gc-sections $(LDFLAGS)
+ LDLIBS   := $(LDLIBS)
+ 
diff --git a/srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch b/srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch
new file mode 100644
index 000000000000..8b3287f97279
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch
@@ -0,0 +1,11 @@
+--- a/mk/nvidia-modprobe.mk  2021-07-25 09:25:03.857882583 -0700
++++ b/mk/nvidia-modprobe.mk  2021-07-25 09:25:29.586139143 -0700
+@@ -6,7 +6,7 @@
+
+ ##### Source definitions #####
+
+-VERSION        := 450.57
++VERSION        := 470.63.01
+ PREFIX         := nvidia-modprobe-$(VERSION)
+ URL            := https://github.com/NVIDIA/nvidia-modprobe/archive/$(VERSION).tar.gz
+
diff --git a/srcpkgs/libnvidia-container/template b/srcpkgs/libnvidia-container/template
new file mode 100644
index 000000000000..26aeee3acc0f
--- /dev/null
+++ b/srcpkgs/libnvidia-container/template
@@ -0,0 +1,38 @@
+# Template file for 'libnvidia-container'
+pkgname=libnvidia-container
+version=1.5.1
+revision=1
+archs="x86_64"
+hostmakedepends="tar xz curl bmake groff m4 pkg-config which"
+makedepends="rpcsvc-proto libcap-devel libseccomp-devel libtirpc-devel"
+short_desc="NVIDIA container runtime library"
+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=b12e1190df03875547628a776f97efe478fac77aa31a0fadfbea10df3bc2dc8d
+
+do_build() {
+	make dist prefix=/usr REVISION=${version}
+}
+
+pre_install() {
+	cd dist
+	tar xvf ${pkgname}_${version}_${archs}.tar.xz
+}
+
+do_install() {
+	vinstall dist/${pkgname}_${version}/usr/lib/${pkgname}.so.${version} 755 /usr/lib/ ${pkgname}.so.1
+
+	vbin dist/${pkgname}_${version}/usr/bin/nvidia-container-cli
+}
+
+libnvidia-container-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vinstall dist/${sourcepkg}_${version}/usr/lib/${sourcepkg}.a 644 /usr/lib/
+		vinstall dist/${sourcepkg}_${version}/usr/include/nvc.h 644 /usr/include/
+		vinstall dist/${sourcepkg}_${version}/usr/lib/pkgconfig/${sourcepkg}.pc 644 /usr/lib/pkgconfig/
+	}
+}

From 664ea1fd3a9def9d0bec1c545c93630badec2351 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:30:05 -0700
Subject: [PATCH 2/4] New package: nvidia-container-toolkit-1.5.1

---
 srcpkgs/nvidia-container-toolkit/template | 38 +++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/nvidia-container-toolkit/template

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
new file mode 100644
index 000000000000..9b1de64e595d
--- /dev/null
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -0,0 +1,38 @@
+# Template file for 'nvidia-container-toolkit'
+pkgname=nvidia-container-toolkit
+version=1.5.1
+revision=1
+archs="x86_64"
+hostmakedepends="go"
+depends="libnvidia-container"
+short_desc="Build and run containers leveraging NVIDIA GPUs"
+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="51d6f2fa0e740d7581f6c632875bb87bafc2351ba32830df11bb7cb19d87b763"
+
+do_build() {
+	GOPATH="${PWD}/.gopath" \
+	go build -v \
+		-buildmode=pie \
+		-gcflags "all=-trimpath=${PWD}" \
+		-asmflags "all=-trimpath=${PWD}" \
+		-ldflags " -s -w -extldflags=-Wl,-z,now,-z,relro" \
+		-o "${pkgname}" \
+		"${PWD}/cmd/nvidia-container-toolkit"
+}
+
+do_install() {
+	vbin nvidia-container-toolkit
+	ln -sf /usr/bin/nvidia-container-toolkit ${DESTDIR}/usr/bin/nvidia-container-runtime-hook
+
+	vmkdir /etc/nvidia-container-runtime 755
+	vinstall config/config.toml.centos 644 /etc/nvidia-container-runtime config.toml
+	vinstall oci-nvidia-hook.json 644 /usr/share/containers/oci/hooks.d 00-oci-nvidia-hook.json
+}
+
+do_clean() {
+	GOPATH="${PWD}/.gopath" \
+	go clean -modcache
+}

From 698b62692e338ac825078ca997fa1e552f978e4f Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:30:13 -0700
Subject: [PATCH 3/4] New package: nvidia-container-runtime-3.5.0

---
 srcpkgs/nvidia-container-runtime/template | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/nvidia-container-runtime/template

diff --git a/srcpkgs/nvidia-container-runtime/template b/srcpkgs/nvidia-container-runtime/template
new file mode 100644
index 000000000000..d47bfce80a45
--- /dev/null
+++ b/srcpkgs/nvidia-container-runtime/template
@@ -0,0 +1,27 @@
+# Template file for 'nvidia-container-runtime'
+pkgname=nvidia-container-runtime
+version=3.5.0
+revision=1
+archs="x86_64"
+hostmakedepends="go"
+makedepends="libseccomp-devel"
+depends="libseccomp nvidia-container-toolkit"
+short_desc="Modified version of runc adding a custom pre-start hook"
+maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/NVIDIA/nvidia-container-runtime/"
+distfiles="https://github.com/NVIDIA/nvidia-container-runtime/archive/v${version}.tar.gz"
+checksum="4985efe4488e441d0e4910cc7eb2046176db063e5bbe2e0542a7c08d5c5e7d34"
+
+pre_build() {
+	mkdir -p .gopath/src
+	ln -rTsf $PWD/src .gopath/src/${pkgname}
+}
+
+do_build() {
+	make build
+}
+
+do_install() {
+	vbin nvidia-container-runtime
+}

From f0367f9af595ef9f9caf9e27a672c4af6c60e40a Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:30:17 -0700
Subject: [PATCH 4/4] New package: nvidia-docker-2.6.0

---
 srcpkgs/nvidia-docker/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/nvidia-docker/template

diff --git a/srcpkgs/nvidia-docker/template b/srcpkgs/nvidia-docker/template
new file mode 100644
index 000000000000..269a0ab7443c
--- /dev/null
+++ b/srcpkgs/nvidia-docker/template
@@ -0,0 +1,22 @@
+# Template file for 'nvidia-docker'
+pkgname=nvidia-docker
+version=2.6.0
+revision=1
+archs="x86_64"
+wrksrc="${pkgname}-${version}"
+depends="nvidia-container-toolkit libnvidia-container nvidia-container-runtime docker"
+short_desc="Build and run Docker containers leveraging NVIDIA GPUs"
+maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/NVIDIA/nvidia-docker"
+distfiles="https://github.com/NVIDIA/nvidia-docker/archive/v${version}.tar.gz"
+checksum="a2f41b91770e45d3f7e6d361be720573a20e88ea33d4f8c7984b6b0cfdc57214"
+
+pre_install() {
+	vsed -i nvidia-docker -e "s;@VERSION@;${version};"
+}
+
+do_install() {
+	vbin nvidia-docker
+	vinstall daemon.json 644 /etc/docker
+}

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] New package: nvidia-docker-2.6.0
  2021-09-22 20:56 [PR PATCH] New package: nvidia-docker-2.6.0 quentin-z80
  2021-10-15 16:39 ` [PR PATCH] [Updated] " quentin-z80
@ 2021-11-11 23:16 ` quentin-z80
  2021-11-24  0:26 ` quentin-z80
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: quentin-z80 @ 2021-11-11 23:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

There is an updated pull request by quentin-z80 against master on the void-packages repository

https://github.com/quentin-z80/void-packages nvidia-docker
https://github.com/void-linux/void-packages/pull/33059

New package: nvidia-docker-2.6.0
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Resolves:  #11084
Supersedes #17505

Can be tested by running:
`docker run --gpus all nvidia/cuda:9.0-base nvidia-smi`

A patch file from https://github.com/void-linux/void-packages/pull/33059.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia-docker-33059.patch --]
[-- Type: text/x-diff, Size: 9615 bytes --]

From fc9c4a12372f088446e03c1ba8192f6c13165639 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:28:42 -0700
Subject: [PATCH 1/4] New package: libnvidia-container-1.5.1

---
 common/shlibs                                 |  2 +
 srcpkgs/libnvidia-container-devel             |  1 +
 .../patches/fix_makefile.patch                | 21 ++++++++++
 .../patches/fix_nvidia-modprobe.mk.patch      | 11 ++++++
 srcpkgs/libnvidia-container/template          | 38 +++++++++++++++++++
 5 files changed, 73 insertions(+)
 create mode 120000 srcpkgs/libnvidia-container-devel
 create mode 100644 srcpkgs/libnvidia-container/patches/fix_makefile.patch
 create mode 100644 srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch
 create mode 100644 srcpkgs/libnvidia-container/template

diff --git a/common/shlibs b/common/shlibs
index fd78e1e33c3f..ec46ef2ddfcf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4062,3 +4062,5 @@ libomalloc-0.9.6.so singular-4.2.1_1
 libsingular_resources-4.2.1.so singular-4.2.1_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
+libavif.so.12 libavif-0.9.2_1
+libnvidia-container.so.1 libnvidia-container-1.5.1_1
diff --git a/srcpkgs/libnvidia-container-devel b/srcpkgs/libnvidia-container-devel
new file mode 120000
index 000000000000..39e6f1942c7b
--- /dev/null
+++ b/srcpkgs/libnvidia-container-devel
@@ -0,0 +1 @@
+libnvidia-container
\ No newline at end of file
diff --git a/srcpkgs/libnvidia-container/patches/fix_makefile.patch b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
new file mode 100644
index 000000000000..59c4f83ec4b9
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
@@ -0,0 +1,21 @@
+--- a/Makefile  2021-07-25 09:30:29.172126492 -0700
++++ b/Makefile  2021-07-25 10:30:39.601936591 -0700
+@@ -23,7 +23,7 @@
+ 
+ ##### Global definitions #####
+ 
+-export prefix      = /usr/local
++export prefix      = /usr
+ export exec_prefix = $(prefix)
+ export bindir      = $(exec_prefix)/bin
+ export libdir      = $(exec_prefix)/lib
+@@ -123,7 +123,8 @@
+             -Wall -Wextra -Wcast-align -Wpointer-arith -Wmissing-prototypes -Wnonnull \
+             -Wwrite-strings -Wlogical-op -Wformat=2 -Wmissing-format-attribute -Winit-self -Wshadow \
+             -Wstrict-prototypes -Wunreachable-code -Wconversion -Wsign-conversion \
+-            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression $(CFLAGS)
++            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression \
++            -I/usr/include/tirpc -ltirpc $(CFLAGS)
+ LDFLAGS  := -Wl,-zrelro -Wl,-znow -Wl,-zdefs -Wl,--gc-sections $(LDFLAGS)
+ LDLIBS   := $(LDLIBS)
+ 
diff --git a/srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch b/srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch
new file mode 100644
index 000000000000..8b3287f97279
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/fix_nvidia-modprobe.mk.patch
@@ -0,0 +1,11 @@
+--- a/mk/nvidia-modprobe.mk  2021-07-25 09:25:03.857882583 -0700
++++ b/mk/nvidia-modprobe.mk  2021-07-25 09:25:29.586139143 -0700
+@@ -6,7 +6,7 @@
+
+ ##### Source definitions #####
+
+-VERSION        := 450.57
++VERSION        := 470.63.01
+ PREFIX         := nvidia-modprobe-$(VERSION)
+ URL            := https://github.com/NVIDIA/nvidia-modprobe/archive/$(VERSION).tar.gz
+
diff --git a/srcpkgs/libnvidia-container/template b/srcpkgs/libnvidia-container/template
new file mode 100644
index 000000000000..26aeee3acc0f
--- /dev/null
+++ b/srcpkgs/libnvidia-container/template
@@ -0,0 +1,38 @@
+# Template file for 'libnvidia-container'
+pkgname=libnvidia-container
+version=1.5.1
+revision=1
+archs="x86_64"
+hostmakedepends="tar xz curl bmake groff m4 pkg-config which"
+makedepends="rpcsvc-proto libcap-devel libseccomp-devel libtirpc-devel"
+short_desc="NVIDIA container runtime library"
+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=b12e1190df03875547628a776f97efe478fac77aa31a0fadfbea10df3bc2dc8d
+
+do_build() {
+	make dist prefix=/usr REVISION=${version}
+}
+
+pre_install() {
+	cd dist
+	tar xvf ${pkgname}_${version}_${archs}.tar.xz
+}
+
+do_install() {
+	vinstall dist/${pkgname}_${version}/usr/lib/${pkgname}.so.${version} 755 /usr/lib/ ${pkgname}.so.1
+
+	vbin dist/${pkgname}_${version}/usr/bin/nvidia-container-cli
+}
+
+libnvidia-container-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vinstall dist/${sourcepkg}_${version}/usr/lib/${sourcepkg}.a 644 /usr/lib/
+		vinstall dist/${sourcepkg}_${version}/usr/include/nvc.h 644 /usr/include/
+		vinstall dist/${sourcepkg}_${version}/usr/lib/pkgconfig/${sourcepkg}.pc 644 /usr/lib/pkgconfig/
+	}
+}

From 2d3e15c98fe58d184b7e915e76ba01dc0d9718c0 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:30:05 -0700
Subject: [PATCH 2/4] New package: nvidia-container-toolkit-1.5.1

---
 srcpkgs/nvidia-container-toolkit/template | 38 +++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/nvidia-container-toolkit/template

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
new file mode 100644
index 000000000000..9b1de64e595d
--- /dev/null
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -0,0 +1,38 @@
+# Template file for 'nvidia-container-toolkit'
+pkgname=nvidia-container-toolkit
+version=1.5.1
+revision=1
+archs="x86_64"
+hostmakedepends="go"
+depends="libnvidia-container"
+short_desc="Build and run containers leveraging NVIDIA GPUs"
+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="51d6f2fa0e740d7581f6c632875bb87bafc2351ba32830df11bb7cb19d87b763"
+
+do_build() {
+	GOPATH="${PWD}/.gopath" \
+	go build -v \
+		-buildmode=pie \
+		-gcflags "all=-trimpath=${PWD}" \
+		-asmflags "all=-trimpath=${PWD}" \
+		-ldflags " -s -w -extldflags=-Wl,-z,now,-z,relro" \
+		-o "${pkgname}" \
+		"${PWD}/cmd/nvidia-container-toolkit"
+}
+
+do_install() {
+	vbin nvidia-container-toolkit
+	ln -sf /usr/bin/nvidia-container-toolkit ${DESTDIR}/usr/bin/nvidia-container-runtime-hook
+
+	vmkdir /etc/nvidia-container-runtime 755
+	vinstall config/config.toml.centos 644 /etc/nvidia-container-runtime config.toml
+	vinstall oci-nvidia-hook.json 644 /usr/share/containers/oci/hooks.d 00-oci-nvidia-hook.json
+}
+
+do_clean() {
+	GOPATH="${PWD}/.gopath" \
+	go clean -modcache
+}

From 7da03d98f670157e14311c41b62b064e85be74d4 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:30:13 -0700
Subject: [PATCH 3/4] New package: nvidia-container-runtime-3.5.0

---
 srcpkgs/nvidia-container-runtime/template | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 srcpkgs/nvidia-container-runtime/template

diff --git a/srcpkgs/nvidia-container-runtime/template b/srcpkgs/nvidia-container-runtime/template
new file mode 100644
index 000000000000..d47bfce80a45
--- /dev/null
+++ b/srcpkgs/nvidia-container-runtime/template
@@ -0,0 +1,27 @@
+# Template file for 'nvidia-container-runtime'
+pkgname=nvidia-container-runtime
+version=3.5.0
+revision=1
+archs="x86_64"
+hostmakedepends="go"
+makedepends="libseccomp-devel"
+depends="libseccomp nvidia-container-toolkit"
+short_desc="Modified version of runc adding a custom pre-start hook"
+maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/NVIDIA/nvidia-container-runtime/"
+distfiles="https://github.com/NVIDIA/nvidia-container-runtime/archive/v${version}.tar.gz"
+checksum="4985efe4488e441d0e4910cc7eb2046176db063e5bbe2e0542a7c08d5c5e7d34"
+
+pre_build() {
+	mkdir -p .gopath/src
+	ln -rTsf $PWD/src .gopath/src/${pkgname}
+}
+
+do_build() {
+	make build
+}
+
+do_install() {
+	vbin nvidia-container-runtime
+}

From f85d1b371416e37ee9f3d9942293f0bc02fb3ecb Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 22 Sep 2021 13:30:17 -0700
Subject: [PATCH 4/4] New package: nvidia-docker-2.6.0

---
 srcpkgs/nvidia-docker/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/nvidia-docker/template

diff --git a/srcpkgs/nvidia-docker/template b/srcpkgs/nvidia-docker/template
new file mode 100644
index 000000000000..269a0ab7443c
--- /dev/null
+++ b/srcpkgs/nvidia-docker/template
@@ -0,0 +1,22 @@
+# Template file for 'nvidia-docker'
+pkgname=nvidia-docker
+version=2.6.0
+revision=1
+archs="x86_64"
+wrksrc="${pkgname}-${version}"
+depends="nvidia-container-toolkit libnvidia-container nvidia-container-runtime docker"
+short_desc="Build and run Docker containers leveraging NVIDIA GPUs"
+maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/NVIDIA/nvidia-docker"
+distfiles="https://github.com/NVIDIA/nvidia-docker/archive/v${version}.tar.gz"
+checksum="a2f41b91770e45d3f7e6d361be720573a20e88ea33d4f8c7984b6b0cfdc57214"
+
+pre_install() {
+	vsed -i nvidia-docker -e "s;@VERSION@;${version};"
+}
+
+do_install() {
+	vbin nvidia-docker
+	vinstall daemon.json 644 /etc/docker
+}

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] New package: nvidia-docker-2.6.0
  2021-09-22 20:56 [PR PATCH] New package: nvidia-docker-2.6.0 quentin-z80
  2021-10-15 16:39 ` [PR PATCH] [Updated] " quentin-z80
  2021-11-11 23:16 ` quentin-z80
@ 2021-11-24  0:26 ` quentin-z80
  2021-11-25  0:00 ` [PR PATCH] [Updated] New package: nvidia-docker-2.7.0 quentin-z80
  2021-11-25  0:03 ` quentin-z80
  4 siblings, 0 replies; 6+ messages in thread
From: quentin-z80 @ 2021-11-24  0:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

There is an updated pull request by quentin-z80 against master on the void-packages repository

https://github.com/quentin-z80/void-packages nvidia-docker
https://github.com/void-linux/void-packages/pull/33059

New package: nvidia-docker-2.6.0
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Resolves:  #11084
Supersedes #17505

Can be tested by running:
`docker run --gpus all nvidia/cuda:9.0-base nvidia-smi`

A patch file from https://github.com/void-linux/void-packages/pull/33059.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia-docker-33059.patch --]
[-- Type: text/x-diff, Size: 6970 bytes --]

From 03556e2dd5a71059cbea49fe3709c24bb23dc842 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Tue, 23 Nov 2021 16:25:30 -0800
Subject: [PATCH 1/3] New package: libnvidia-container-1.6.0

---
 common/shlibs                                 |  1 +
 srcpkgs/libnvidia-container-devel             |  1 +
 .../patches/fix_makefile.patch                | 21 ++++++++++
 srcpkgs/libnvidia-container/template          | 38 +++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 120000 srcpkgs/libnvidia-container-devel
 create mode 100644 srcpkgs/libnvidia-container/patches/fix_makefile.patch
 create mode 100644 srcpkgs/libnvidia-container/template

diff --git a/common/shlibs b/common/shlibs
index ab865cc085d2..3829c233c9d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4070,3 +4070,4 @@ libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
 libptytty.so.0 libptytty-2.0_1
+libnvidia-container.so.1 libnvidia-container-1.6.0_1
diff --git a/srcpkgs/libnvidia-container-devel b/srcpkgs/libnvidia-container-devel
new file mode 120000
index 000000000000..39e6f1942c7b
--- /dev/null
+++ b/srcpkgs/libnvidia-container-devel
@@ -0,0 +1 @@
+libnvidia-container
\ No newline at end of file
diff --git a/srcpkgs/libnvidia-container/patches/fix_makefile.patch b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
new file mode 100644
index 000000000000..db3024c68f35
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
@@ -0,0 +1,21 @@
+--- a/Makefile    2021-11-23 10:58:59.234599602 -0800
++++ b/Makefile   2021-11-23 11:00:02.476171671 -0800
+@@ -23,7 +23,7 @@
+ 
+ ##### Global definitions #####
+ 
+-export prefix      = /usr/local
++export prefix      = /usr
+ export exec_prefix = $(prefix)
+ export bindir      = $(exec_prefix)/bin
+ export libdir      = $(exec_prefix)/lib
+@@ -126,7 +126,8 @@
+             -Wall -Wextra -Wcast-align -Wpointer-arith -Wmissing-prototypes -Wnonnull \
+             -Wwrite-strings -Wlogical-op -Wformat=2 -Wmissing-format-attribute -Winit-self -Wshadow \
+             -Wstrict-prototypes -Wunreachable-code -Wconversion -Wsign-conversion \
+-            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression $(CFLAGS)
++            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression \
++            -I/usr/include/tirpc -ltirpc $(CFLAGS)
+ LDFLAGS  := -Wl,-zrelro -Wl,-znow -Wl,-zdefs -Wl,--gc-sections $(LDFLAGS)
+ LDLIBS   := $(LDLIBS)
+ 
diff --git a/srcpkgs/libnvidia-container/template b/srcpkgs/libnvidia-container/template
new file mode 100644
index 000000000000..0774a7f58717
--- /dev/null
+++ b/srcpkgs/libnvidia-container/template
@@ -0,0 +1,38 @@
+# Template file for 'libnvidia-container'
+pkgname=libnvidia-container
+version=1.6.0
+revision=1
+archs="x86_64"
+hostmakedepends="tar xz curl bmake groff m4 pkg-config which"
+makedepends="rpcsvc-proto libcap-devel libseccomp-devel libtirpc-devel"
+short_desc="NVIDIA container runtime library"
+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=05c15d567e91009e5b37b076bcecdc0320052641cb7b93675908c2d422f6c9d2
+
+do_build() {
+	make dist prefix=/usr REVISION=${version}
+}
+
+pre_install() {
+	cd dist
+	tar xvf ${pkgname}_${version}_${archs}.tar.xz
+}
+
+do_install() {
+	vinstall dist/${pkgname}_${version}/usr/lib/${pkgname}.so.${version} 755 /usr/lib/ ${pkgname}.so.1
+
+	vbin dist/${pkgname}_${version}/usr/bin/nvidia-container-cli
+}
+
+libnvidia-container-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vinstall dist/${sourcepkg}_${version}/usr/lib/${sourcepkg}.a 644 /usr/lib/
+		vinstall dist/${sourcepkg}_${version}/usr/include/nvc.h 644 /usr/include/
+		vinstall dist/${sourcepkg}_${version}/usr/lib/pkgconfig/${sourcepkg}.pc 644 /usr/lib/pkgconfig/
+	}
+}

From 79a1be4bffdc869b057b2b7e77a4ce5652c3523e Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Tue, 23 Nov 2021 16:25:54 -0800
Subject: [PATCH 2/3] New package: nvidia-container-toolkit-1.6.0

---
 srcpkgs/nvidia-container-toolkit/template | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 srcpkgs/nvidia-container-toolkit/template

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
new file mode 100644
index 000000000000..a88e77fa1a21
--- /dev/null
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -0,0 +1,39 @@
+# Template file for 'nvidia-container-toolkit'
+pkgname=nvidia-container-toolkit
+version=1.6.0
+revision=1
+archs="x86_64"
+hostmakedepends="go"
+depends="libnvidia-container"
+short_desc="Build and run containers leveraging NVIDIA GPUs"
+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=09f9fa8b7fe0e374803e78ebdd5f6d108130158cce83da0ac89885e1e6e7ecaf
+
+do_build() {
+	GOPATH="${PWD}/.gopath" \
+	go build -v \
+		-buildmode=pie \
+		-gcflags "all=-trimpath=${PWD}" \
+		-asmflags "all=-trimpath=${PWD}" \
+		-ldflags " -s -w -extldflags=-Wl,-z,now,-z,relro" \
+		-o "${pkgname}" \
+		"${PWD}/cmd/nvidia-container-toolkit"
+
+}
+
+do_install() {
+	vbin nvidia-container-toolkit
+	ln -sf /usr/bin/nvidia-container-toolkit ${DESTDIR}/usr/bin/nvidia-container-runtime-hook
+
+	vmkdir /etc/nvidia-container-runtime 755
+	vinstall config/config.toml.centos 644 /etc/nvidia-container-runtime config.toml
+	vinstall oci-nvidia-hook.json 644 /usr/share/containers/oci/hooks.d 00-oci-nvidia-hook.json
+}
+
+do_clean() {
+	GOPATH="${PWD}/.gopath" \
+	go clean -modcache
+}

From b5ed9a0276f09329586ea74f5c10a8154933b12a Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Tue, 23 Nov 2021 16:26:01 -0800
Subject: [PATCH 3/3] New package: nvidia-docker-2.7.0

---
 srcpkgs/nvidia-docker/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/nvidia-docker/template

diff --git a/srcpkgs/nvidia-docker/template b/srcpkgs/nvidia-docker/template
new file mode 100644
index 000000000000..5a06c1778b51
--- /dev/null
+++ b/srcpkgs/nvidia-docker/template
@@ -0,0 +1,11 @@
+# Template file for 'nvidia-docker'
+pkgname=nvidia-docker
+version=2.7.0
+revision=1
+archs="x86_64"
+build_style=meta
+depends="nvidia-container-toolkit libnvidia-container docker"
+short_desc="Build and run Docker containers leveraging NVIDIA GPUs"
+maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
+license="Public Domain"
+homepage="https://github.com/NVIDIA/nvidia-docker"

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] New package: nvidia-docker-2.7.0
  2021-09-22 20:56 [PR PATCH] New package: nvidia-docker-2.6.0 quentin-z80
                   ` (2 preceding siblings ...)
  2021-11-24  0:26 ` quentin-z80
@ 2021-11-25  0:00 ` quentin-z80
  2021-11-25  0:03 ` quentin-z80
  4 siblings, 0 replies; 6+ messages in thread
From: quentin-z80 @ 2021-11-25  0:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

There is an updated pull request by quentin-z80 against master on the void-packages repository

https://github.com/quentin-z80/void-packages nvidia-docker
https://github.com/void-linux/void-packages/pull/33059

New package: nvidia-docker-2.7.0
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Resolves:  #11084
Supersedes #17505

Can be tested by running:
`docker run --gpus all nvidia/cuda:9.0-base nvidia-smi`

A patch file from https://github.com/void-linux/void-packages/pull/33059.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia-docker-33059.patch --]
[-- Type: text/x-diff, Size: 7611 bytes --]

From 03556e2dd5a71059cbea49fe3709c24bb23dc842 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Tue, 23 Nov 2021 16:25:30 -0800
Subject: [PATCH 1/3] New package: libnvidia-container-1.6.0

---
 common/shlibs                                 |  1 +
 srcpkgs/libnvidia-container-devel             |  1 +
 .../patches/fix_makefile.patch                | 21 ++++++++++
 srcpkgs/libnvidia-container/template          | 38 +++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 120000 srcpkgs/libnvidia-container-devel
 create mode 100644 srcpkgs/libnvidia-container/patches/fix_makefile.patch
 create mode 100644 srcpkgs/libnvidia-container/template

diff --git a/common/shlibs b/common/shlibs
index ab865cc085d2..3829c233c9d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4070,3 +4070,4 @@ libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
 libptytty.so.0 libptytty-2.0_1
+libnvidia-container.so.1 libnvidia-container-1.6.0_1
diff --git a/srcpkgs/libnvidia-container-devel b/srcpkgs/libnvidia-container-devel
new file mode 120000
index 000000000000..39e6f1942c7b
--- /dev/null
+++ b/srcpkgs/libnvidia-container-devel
@@ -0,0 +1 @@
+libnvidia-container
\ No newline at end of file
diff --git a/srcpkgs/libnvidia-container/patches/fix_makefile.patch b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
new file mode 100644
index 000000000000..db3024c68f35
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
@@ -0,0 +1,21 @@
+--- a/Makefile    2021-11-23 10:58:59.234599602 -0800
++++ b/Makefile   2021-11-23 11:00:02.476171671 -0800
+@@ -23,7 +23,7 @@
+ 
+ ##### Global definitions #####
+ 
+-export prefix      = /usr/local
++export prefix      = /usr
+ export exec_prefix = $(prefix)
+ export bindir      = $(exec_prefix)/bin
+ export libdir      = $(exec_prefix)/lib
+@@ -126,7 +126,8 @@
+             -Wall -Wextra -Wcast-align -Wpointer-arith -Wmissing-prototypes -Wnonnull \
+             -Wwrite-strings -Wlogical-op -Wformat=2 -Wmissing-format-attribute -Winit-self -Wshadow \
+             -Wstrict-prototypes -Wunreachable-code -Wconversion -Wsign-conversion \
+-            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression $(CFLAGS)
++            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression \
++            -I/usr/include/tirpc -ltirpc $(CFLAGS)
+ LDFLAGS  := -Wl,-zrelro -Wl,-znow -Wl,-zdefs -Wl,--gc-sections $(LDFLAGS)
+ LDLIBS   := $(LDLIBS)
+ 
diff --git a/srcpkgs/libnvidia-container/template b/srcpkgs/libnvidia-container/template
new file mode 100644
index 000000000000..0774a7f58717
--- /dev/null
+++ b/srcpkgs/libnvidia-container/template
@@ -0,0 +1,38 @@
+# Template file for 'libnvidia-container'
+pkgname=libnvidia-container
+version=1.6.0
+revision=1
+archs="x86_64"
+hostmakedepends="tar xz curl bmake groff m4 pkg-config which"
+makedepends="rpcsvc-proto libcap-devel libseccomp-devel libtirpc-devel"
+short_desc="NVIDIA container runtime library"
+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=05c15d567e91009e5b37b076bcecdc0320052641cb7b93675908c2d422f6c9d2
+
+do_build() {
+	make dist prefix=/usr REVISION=${version}
+}
+
+pre_install() {
+	cd dist
+	tar xvf ${pkgname}_${version}_${archs}.tar.xz
+}
+
+do_install() {
+	vinstall dist/${pkgname}_${version}/usr/lib/${pkgname}.so.${version} 755 /usr/lib/ ${pkgname}.so.1
+
+	vbin dist/${pkgname}_${version}/usr/bin/nvidia-container-cli
+}
+
+libnvidia-container-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vinstall dist/${sourcepkg}_${version}/usr/lib/${sourcepkg}.a 644 /usr/lib/
+		vinstall dist/${sourcepkg}_${version}/usr/include/nvc.h 644 /usr/include/
+		vinstall dist/${sourcepkg}_${version}/usr/lib/pkgconfig/${sourcepkg}.pc 644 /usr/lib/pkgconfig/
+	}
+}

From 0c078534b91c6f6cd5cdd8e44ee9033843e0c8f4 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 24 Nov 2021 15:59:55 -0800
Subject: [PATCH 2/3] New package: nvidia-container-toolkit-1.6.0

---
 srcpkgs/nvidia-container-toolkit/template | 51 +++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 srcpkgs/nvidia-container-toolkit/template

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
new file mode 100644
index 000000000000..13b9cee17cec
--- /dev/null
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -0,0 +1,51 @@
+# Template file for 'nvidia-container-toolkit'
+pkgname=nvidia-container-toolkit
+version=1.6.0
+revision=1
+archs="x86_64"
+hostmakedepends="go"
+depends="libnvidia-container"
+short_desc="Build and run containers leveraging NVIDIA GPUs"
+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=09f9fa8b7fe0e374803e78ebdd5f6d108130158cce83da0ac89885e1e6e7ecaf
+
+do_build() {
+	GOPATH="${PWD}/.gopath" \
+	go build -v \
+		-buildmode=pie \
+		-gcflags "all=-trimpath=${PWD}" \
+		-asmflags "all=-trimpath=${PWD}" \
+		-ldflags " -s -w -extldflags=-Wl,-z,now,-z,relro" \
+		-o "nvidia-container-toolkit" \
+		"${PWD}/cmd/nvidia-container-toolkit"
+
+        GOPATH="${PWD}/.gopath" \
+        go build -v \
+                -buildmode=pie \
+                -gcflags "all=-trimpath=${PWD}" \
+                -asmflags "all=-trimpath=${PWD}" \
+                -ldflags " -s -w -extldflags=-Wl,-z,now,-z,relro" \
+                -o "nvidia-container-runtime" \
+                "${PWD}/cmd/nvidia-container-runtime"
+
+
+}
+
+do_install() {
+	vbin nvidia-container-toolkit
+	ln -sf /usr/bin/nvidia-container-toolkit ${DESTDIR}/usr/bin/nvidia-container-runtime-hook
+
+	vbin nvidia-container-runtime
+
+	vmkdir /etc/nvidia-container-runtime 755
+	vinstall config/config.toml.centos 644 /etc/nvidia-container-runtime config.toml
+	vinstall oci-nvidia-hook.json 644 /usr/share/containers/oci/hooks.d 00-oci-nvidia-hook.json
+}
+
+do_clean() {
+	GOPATH="${PWD}/.gopath" \
+	go clean -modcache
+}

From 046429d720073fc6c7c6dd16268a8f01d73b0bed Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 24 Nov 2021 16:00:04 -0800
Subject: [PATCH 3/3] New package: nvidia-docker-2.7.0

---
 srcpkgs/nvidia-docker/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/nvidia-docker/template

diff --git a/srcpkgs/nvidia-docker/template b/srcpkgs/nvidia-docker/template
new file mode 100644
index 000000000000..d378180e1662
--- /dev/null
+++ b/srcpkgs/nvidia-docker/template
@@ -0,0 +1,17 @@
+# Template file for 'nvidia-docker'
+pkgname=nvidia-docker
+version=2.7.0
+revision=1
+archs="x86_64"
+depends="nvidia-container-toolkit libnvidia-container docker"
+short_desc="Build and run Docker containers leveraging NVIDIA GPUs"
+maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/NVIDIA/nvidia-docker"
+distfiles="https://github.com/NVIDIA/nvidia-docker/archive/v${version}.tar.gz"
+checksum=1c42bf7717ad3f734015087b9125fa96aca2e53656821d3bd8eab4adb23dfd72
+
+do_install() {
+	vbin nvidia-docker
+	vinstall daemon.json 644 etc/docker/
+}

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] New package: nvidia-docker-2.7.0
  2021-09-22 20:56 [PR PATCH] New package: nvidia-docker-2.6.0 quentin-z80
                   ` (3 preceding siblings ...)
  2021-11-25  0:00 ` [PR PATCH] [Updated] New package: nvidia-docker-2.7.0 quentin-z80
@ 2021-11-25  0:03 ` quentin-z80
  4 siblings, 0 replies; 6+ messages in thread
From: quentin-z80 @ 2021-11-25  0:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

There is an updated pull request by quentin-z80 against master on the void-packages repository

https://github.com/quentin-z80/void-packages nvidia-docker
https://github.com/void-linux/void-packages/pull/33059

New package: nvidia-docker-2.7.0
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Resolves:  #11084
Supersedes #17505

Can be tested by running:
`docker run --gpus all nvidia/cuda:9.0-base nvidia-smi`

A patch file from https://github.com/void-linux/void-packages/pull/33059.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nvidia-docker-33059.patch --]
[-- Type: text/x-diff, Size: 7611 bytes --]

From af8e5d70bc9f01af76d10a063ddb3cc113891a80 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Tue, 23 Nov 2021 16:25:30 -0800
Subject: [PATCH 1/3] New package: libnvidia-container-1.6.0

---
 common/shlibs                                 |  1 +
 srcpkgs/libnvidia-container-devel             |  1 +
 .../patches/fix_makefile.patch                | 21 ++++++++++
 srcpkgs/libnvidia-container/template          | 38 +++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 120000 srcpkgs/libnvidia-container-devel
 create mode 100644 srcpkgs/libnvidia-container/patches/fix_makefile.patch
 create mode 100644 srcpkgs/libnvidia-container/template

diff --git a/common/shlibs b/common/shlibs
index 3199833de6cd..f02bd2e5984c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4070,3 +4070,4 @@ libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
 libptytty.so.0 libptytty-2.0_1
+libnvidia-container.so.1 libnvidia-container-1.6.0_1
diff --git a/srcpkgs/libnvidia-container-devel b/srcpkgs/libnvidia-container-devel
new file mode 120000
index 000000000000..39e6f1942c7b
--- /dev/null
+++ b/srcpkgs/libnvidia-container-devel
@@ -0,0 +1 @@
+libnvidia-container
\ No newline at end of file
diff --git a/srcpkgs/libnvidia-container/patches/fix_makefile.patch b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
new file mode 100644
index 000000000000..db3024c68f35
--- /dev/null
+++ b/srcpkgs/libnvidia-container/patches/fix_makefile.patch
@@ -0,0 +1,21 @@
+--- a/Makefile    2021-11-23 10:58:59.234599602 -0800
++++ b/Makefile   2021-11-23 11:00:02.476171671 -0800
+@@ -23,7 +23,7 @@
+ 
+ ##### Global definitions #####
+ 
+-export prefix      = /usr/local
++export prefix      = /usr
+ export exec_prefix = $(prefix)
+ export bindir      = $(exec_prefix)/bin
+ export libdir      = $(exec_prefix)/lib
+@@ -126,7 +126,8 @@
+             -Wall -Wextra -Wcast-align -Wpointer-arith -Wmissing-prototypes -Wnonnull \
+             -Wwrite-strings -Wlogical-op -Wformat=2 -Wmissing-format-attribute -Winit-self -Wshadow \
+             -Wstrict-prototypes -Wunreachable-code -Wconversion -Wsign-conversion \
+-            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression $(CFLAGS)
++            -Wno-unknown-warning-option -Wno-format-extra-args -Wno-gnu-alignof-expression \
++            -I/usr/include/tirpc -ltirpc $(CFLAGS)
+ LDFLAGS  := -Wl,-zrelro -Wl,-znow -Wl,-zdefs -Wl,--gc-sections $(LDFLAGS)
+ LDLIBS   := $(LDLIBS)
+ 
diff --git a/srcpkgs/libnvidia-container/template b/srcpkgs/libnvidia-container/template
new file mode 100644
index 000000000000..0774a7f58717
--- /dev/null
+++ b/srcpkgs/libnvidia-container/template
@@ -0,0 +1,38 @@
+# Template file for 'libnvidia-container'
+pkgname=libnvidia-container
+version=1.6.0
+revision=1
+archs="x86_64"
+hostmakedepends="tar xz curl bmake groff m4 pkg-config which"
+makedepends="rpcsvc-proto libcap-devel libseccomp-devel libtirpc-devel"
+short_desc="NVIDIA container runtime library"
+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=05c15d567e91009e5b37b076bcecdc0320052641cb7b93675908c2d422f6c9d2
+
+do_build() {
+	make dist prefix=/usr REVISION=${version}
+}
+
+pre_install() {
+	cd dist
+	tar xvf ${pkgname}_${version}_${archs}.tar.xz
+}
+
+do_install() {
+	vinstall dist/${pkgname}_${version}/usr/lib/${pkgname}.so.${version} 755 /usr/lib/ ${pkgname}.so.1
+
+	vbin dist/${pkgname}_${version}/usr/bin/nvidia-container-cli
+}
+
+libnvidia-container-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vinstall dist/${sourcepkg}_${version}/usr/lib/${sourcepkg}.a 644 /usr/lib/
+		vinstall dist/${sourcepkg}_${version}/usr/include/nvc.h 644 /usr/include/
+		vinstall dist/${sourcepkg}_${version}/usr/lib/pkgconfig/${sourcepkg}.pc 644 /usr/lib/pkgconfig/
+	}
+}

From 7192de44fcfe05ec9588ab5e5ac86ebdafac83f0 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 24 Nov 2021 15:59:55 -0800
Subject: [PATCH 2/3] New package: nvidia-container-toolkit-1.6.0

---
 srcpkgs/nvidia-container-toolkit/template | 51 +++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 srcpkgs/nvidia-container-toolkit/template

diff --git a/srcpkgs/nvidia-container-toolkit/template b/srcpkgs/nvidia-container-toolkit/template
new file mode 100644
index 000000000000..13b9cee17cec
--- /dev/null
+++ b/srcpkgs/nvidia-container-toolkit/template
@@ -0,0 +1,51 @@
+# Template file for 'nvidia-container-toolkit'
+pkgname=nvidia-container-toolkit
+version=1.6.0
+revision=1
+archs="x86_64"
+hostmakedepends="go"
+depends="libnvidia-container"
+short_desc="Build and run containers leveraging NVIDIA GPUs"
+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=09f9fa8b7fe0e374803e78ebdd5f6d108130158cce83da0ac89885e1e6e7ecaf
+
+do_build() {
+	GOPATH="${PWD}/.gopath" \
+	go build -v \
+		-buildmode=pie \
+		-gcflags "all=-trimpath=${PWD}" \
+		-asmflags "all=-trimpath=${PWD}" \
+		-ldflags " -s -w -extldflags=-Wl,-z,now,-z,relro" \
+		-o "nvidia-container-toolkit" \
+		"${PWD}/cmd/nvidia-container-toolkit"
+
+        GOPATH="${PWD}/.gopath" \
+        go build -v \
+                -buildmode=pie \
+                -gcflags "all=-trimpath=${PWD}" \
+                -asmflags "all=-trimpath=${PWD}" \
+                -ldflags " -s -w -extldflags=-Wl,-z,now,-z,relro" \
+                -o "nvidia-container-runtime" \
+                "${PWD}/cmd/nvidia-container-runtime"
+
+
+}
+
+do_install() {
+	vbin nvidia-container-toolkit
+	ln -sf /usr/bin/nvidia-container-toolkit ${DESTDIR}/usr/bin/nvidia-container-runtime-hook
+
+	vbin nvidia-container-runtime
+
+	vmkdir /etc/nvidia-container-runtime 755
+	vinstall config/config.toml.centos 644 /etc/nvidia-container-runtime config.toml
+	vinstall oci-nvidia-hook.json 644 /usr/share/containers/oci/hooks.d 00-oci-nvidia-hook.json
+}
+
+do_clean() {
+	GOPATH="${PWD}/.gopath" \
+	go clean -modcache
+}

From 8528e22fc7c899014155f100536ab593a7c5fc44 Mon Sep 17 00:00:00 2001
From: Quentin Freimanis <quentinfreimanis@gmail.com>
Date: Wed, 24 Nov 2021 16:00:04 -0800
Subject: [PATCH 3/3] New package: nvidia-docker-2.7.0

---
 srcpkgs/nvidia-docker/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/nvidia-docker/template

diff --git a/srcpkgs/nvidia-docker/template b/srcpkgs/nvidia-docker/template
new file mode 100644
index 000000000000..d378180e1662
--- /dev/null
+++ b/srcpkgs/nvidia-docker/template
@@ -0,0 +1,17 @@
+# Template file for 'nvidia-docker'
+pkgname=nvidia-docker
+version=2.7.0
+revision=1
+archs="x86_64"
+depends="nvidia-container-toolkit libnvidia-container docker"
+short_desc="Build and run Docker containers leveraging NVIDIA GPUs"
+maintainer="Quentin Freimanis <quentinfreimanis@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/NVIDIA/nvidia-docker"
+distfiles="https://github.com/NVIDIA/nvidia-docker/archive/v${version}.tar.gz"
+checksum=1c42bf7717ad3f734015087b9125fa96aca2e53656821d3bd8eab4adb23dfd72
+
+do_install() {
+	vbin nvidia-docker
+	vinstall daemon.json 644 etc/docker/
+}

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-11-25  0:03 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-22 20:56 [PR PATCH] New package: nvidia-docker-2.6.0 quentin-z80
2021-10-15 16:39 ` [PR PATCH] [Updated] " quentin-z80
2021-11-11 23:16 ` quentin-z80
2021-11-24  0:26 ` quentin-z80
2021-11-25  0:00 ` [PR PATCH] [Updated] New package: nvidia-docker-2.7.0 quentin-z80
2021-11-25  0:03 ` quentin-z80

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).