1.14.3

3 files changed, 37 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e59cbb182e2..007ae87c6fd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
 pkgbase = nvidia-container-toolkit
 	pkgdesc = NVIDIA container runtime toolkit
-	pkgver = 1.13.5
+	pkgver = 1.14.3
 	pkgrel = 1
 	url = https://github.com/NVIDIA/nvidia-container-toolkit
 	arch = x86_64
 	license = Apache
 	makedepends = go
-	depends = libnvidia-container-tools>=1.9.0
+	depends = libnvidia-container-tools=1.14.3
 	conflicts = nvidia-container-runtime-hook
 	conflicts = nvidia-container-runtime<2.0.0
 	replaces = nvidia-container-runtime-hook
-	options = !lto
 	backup = etc/nvidia-container-runtime/config.toml
-	source = nvidia-container-toolkit-1.13.5-1.tar.gz::https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.13.5.tar.gz
-	sha256sums = 2e95a89ca3ab95528df4bf32c5e0c8333e283e0465b9636458282c3d49a1b1da
+	source = nvidia-container-toolkit-1.14.3.tar.gz::https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.14.3.tar.gz
+	sha256sums = a8dbb6a8d45fe8cb2ecbb7b5d49c332e0e7270e8988e57d2a8587ab1e004f6dd
 
 pkgname = nvidia-container-toolkit
diff --git a/.gitignore b/.gitignore
index d6a06a983bdd..4dab8d6386e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
-*.tar
-*.tar.*
+# Ignore everything
+*
 
-src/
-pkg/
-
-nvidia-container-runtime/
-nvidia-container-runtime-hook/
-runc/
+# But not these files...
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index ca6a279322b3..678169eac949 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,45 @@
-# Maintainer: Kien Dang <mail at kien dot ai>
-# Maintainer: Julie Shapiro <jshapiro at nvidia dot com>
-
+# Maintainer: Mark Wagie <mark dot wagie at proton dot me>
+# Contributor: Kien Dang <mail at kien dot ai>
+# Contributor: Julie Shapiro <jshapiro at nvidia dot com>
 pkgname=nvidia-container-toolkit
-
-pkgver=1.13.5
+pkgver=1.14.3
 pkgrel=1
-
-pkgdesc='NVIDIA container runtime toolkit'
+pkgdesc="NVIDIA container runtime toolkit"
 arch=('x86_64')
 url='https://github.com/NVIDIA/nvidia-container-toolkit'
 license=('Apache')
-
+depends=("libnvidia-container-tools=$pkgver")
 makedepends=('go')
-depends=('libnvidia-container-tools>=1.9.0')
 conflicts=('nvidia-container-runtime-hook' 'nvidia-container-runtime<2.0.0')
 replaces=('nvidia-container-runtime-hook')
-options=(!lto)
-
 backup=('etc/nvidia-container-runtime/config.toml')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha256sums=('a8dbb6a8d45fe8cb2ecbb7b5d49c332e0e7270e8988e57d2a8587ab1e004f6dd')
 
-source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz"::"${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('2e95a89ca3ab95528df4bf32c5e0c8333e283e0465b9636458282c3d49a1b1da')
-
-_srcdir="nvidia-container-toolkit-${pkgver}"
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  mkdir -p build
+}
 
 build() {
-  cd "${_srcdir}"
-
-  mkdir bin
-
-  GO_LDFLAGS="-Wl,-z,lazy,${LDFLAGS}" \
-  GO111MODULE=auto \
-  GOPATH="${srcdir}/gopath" \
-  go build -v \
-    -modcacherw \
-    -buildmode=pie \
-    -gcflags "all=-trimpath=${PWD}" \
-    -asmflags "all=-trimpath=${PWD}" \
-    -ldflags "-s -w -X github.com/NVIDIA/nvidia-container-toolkit/internal/info.version=${pkgver} -extldflags=${GO_LDFLAGS/%,/}" \
-    -o bin \
-    "./..."
-    # -trimpath \  # only go > 1.13
-    #-ldflags " -s -w -extldflags=-Wl,-z,now,-z,relro" \
-
-  # go leaves a bunch of local stuff with 0400, making it break future `makepkg -C` _grumble grumble_
-  GO111MODULE=auto \
-  GOPATH="${srcdir}/gopath" \
+  cd "$pkgname-$pkgver"
+  export GOPATH="$srcdir/gopath"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+  go build -v -o build ./...
+
+  # Clean module cache for makepkg -C
   go clean -modcache
 }
 
 package() {
-  install -D -m755 "${_srcdir}/bin/nvidia-container-runtime-hook" "${pkgdir}/usr/bin/nvidia-container-runtime-hook"
-  install -D -m755 "${_srcdir}/bin/nvidia-ctk" "${pkgdir}/usr/bin/nvidia-ctk"
-
-  pushd "${pkgdir}/usr/bin/"
-  ln -sf "nvidia-container-runtime-hook" "${pkgname}"
-  popd
-  install -D -m644 "${_srcdir}/config/config.toml.rpm-yum" "${pkgdir}/etc/nvidia-container-runtime/config.toml"
-  install -D -m644 "${_srcdir}/oci-nvidia-hook.json" "${pkgdir}/usr/share/containers/oci/hooks.d/00-oci-nvidia-hook.json"
+  cd "$pkgname-$pkgver"
+  install -Dm755 build/nvidia-{container-runtime,container-runtime-hook,ctk} -t \
+    "${pkgdir}/usr/bin/"
 
-  install -D -m644 "${_srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+  # Generate the default config
+  "$pkgdir"/usr/bin/nvidia-ctk --quiet config --config-file="$pkgdir"/etc/nvidia-container-runtime/config.toml --in-place
 }