From af8e5d70bc9f01af76d10a063ddb3cc113891a80 Mon Sep 17 00:00:00 2001 From: Quentin Freimanis 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 " +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 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 " +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 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 " +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/ +}