3.1.0

1 files changed, 13 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5a3937dbd784..d076aa524da9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,39 +3,33 @@
 
 pkgname=nvidia-container-runtime
 
-pkgver=2.0.0+3.docker18.09.6
-_runtime_commit='03af0a80dbcbcfa09a828cde46151749bee2480e'
-_runc_commit='2b18fe1d885ee5083ef9f0838fee39b62d653e30'
-_runc_patch_commit='6635b4f0c6af3810594d2770f662f34ddc15b40d'
-_runc_path='gopath/src/github.com/opencontainers/runc'
-
+pkgver=3.1.0
 pkgrel=1
+
 pkgdesc='NVIDIA opencontainer runtime fork to expose GPU devices to containers.'
 arch=('x86_64')
 url='https://github.com/NVIDIA/nvidia-container-runtime'
 license=('BSD')
 
 makedepends=('go' 'git')
-depends=('libseccomp' 'nvidia-container-runtime-hook')
+depends=('libseccomp' 'nvidia-container-toolkit<2.0.0')
+
+source=("https://github.com/NVIDIA/${pkgname}/archive/${pkgver}.tar.gz")
+sha256sums=('9fd1fd6d39e02b1e1cd41219cf8b2e657a4f3c4fad36ee94b397fff0cb9a0865')
 
-source=("git+https://github.com/NVIDIA/nvidia-container-runtime.git#commit=${_runtime_commit}"
-        "git+https://github.com/opencontainers/runc.git#commit=${_runc_commit}")
-sha256sums=('SKIP'
-            'SKIP')
+_srcdir="${pkgname}-${pkgver}"
 
 prepare() {
-  cd runc
-  git apply ${srcdir}/nvidia-container-runtime/runtime/runc/${_runc_patch_commit}/*
-  mkdir -p ${srcdir}/gopath/src/github.com/opencontainers
-  ln -rTsf "${srcdir}/runc" "${srcdir}/${_runc_path}"
+  mkdir -p gopath/src
+  ls "${_srcdir}/runtime/src"
+  ln -rTsf "${_srcdir}/runtime/src" "gopath/src/${pkgname}"
 }
 
 build() {
-  cd ${srcdir}/${_runc_path}
-  GOPATH="${srcdir}/gopath" EXTRA_LDFLAGS="-extldflags=-Wl,-z,now,-z,relro" make
+  GOPATH="${srcdir}/gopath" go install -buildmode=pie -ldflags " -s -w -extldflags=-Wl,-z,now,-z,relro" "$pkgname"
 }
 
 package() {
-  install -D -m755 "${srcdir}/${_runc_path}/runc" "$pkgdir/usr/bin/nvidia-container-runtime"
-  install -D -m644 "${srcdir}/nvidia-container-runtime/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -D -m755 "${srcdir}/gopath/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  install -D -m644 "${srcdir}/${_srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }