squash all commits onto aur

3 files changed, 49 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3788d8e1df7e..99862c4ea916 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
 pkgbase = nvidia-container-runtime
 	pkgdesc = NVIDIA container runtime
-	pkgver = 2.0.0+1.docker18.03.0
+	pkgver = 2.0.0+1.docker18.09.3
 	pkgrel = 1
 	url = https://github.com/NVIDIA/nvidia-container-runtime
 	arch = x86_64
-	license = custom
+	license = BSD
+	makedepends = go
+	makedepends = git
 	depends = libseccomp
-	depends = libnvidia-container-tools
-	source_x86_64 = https://nvidia.github.io/nvidia-container-runtime/centos7/x86_64/nvidia-container-runtime-2.0.0-1.docker18.03.0.x86_64.rpm
-	sha256sums_x86_64 = cd3ade9f4122b293002091900dc152ea0d928de343677a06ca8252158f25a1c8
+	depends = nvidia-container-runtime-hook
+	source = git+https://github.com/NVIDIA/nvidia-container-runtime.git#commit=03af0a80dbcbcfa09a828cde46151749bee2480e
+	source = git+https://github.com/opencontainers/runc.git#commit=6635b4f0c6af3810594d2770f662f34ddc15b40d
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = nvidia-container-runtime
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..6819f5b9b6c2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*.tar
+*.tar.*
+
+src/
+pkg/
+
+nvidia-container-runtime/
+runc/
diff --git a/PKGBUILD b/PKGBUILD
index e57b0c8370c2..e4814f5590ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,40 @@
+# Maintainer: Kien Dang <mail at kien dot ai>
+# Maintainer: Joel Shapiro <jshapiro at nvidia dot com>
+
 pkgname=nvidia-container-runtime
-pkgver=2.0.0+1.docker18.03.0
+
+pkgver=2.0.0+1.docker18.09.3
+_runtime_commit='03af0a80dbcbcfa09a828cde46151749bee2480e'
+_runc_commit='6635b4f0c6af3810594d2770f662f34ddc15b40d'
+_runc_path='gopath/src/github.com/opencontainers/runc'
+
 pkgrel=1
 pkgdesc='NVIDIA container runtime'
 arch=('x86_64')
 url='https://github.com/NVIDIA/nvidia-container-runtime'
-license=('custom')
-depends=(libseccomp libnvidia-container-tools)
-source_x86_64=("https://nvidia.github.io/nvidia-container-runtime/centos7/x86_64/${pkgname}-2.0.0-1.docker18.03.0.x86_64.rpm")
-sha256sums_x86_64=('cd3ade9f4122b293002091900dc152ea0d928de343677a06ca8252158f25a1c8')
+license=('BSD')
+
+makedepends=('go' 'git')
+depends=('libseccomp' 'nvidia-container-runtime-hook')
+
+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')
+
+prepare() {
+  cd runc
+  git apply ${srcdir}/nvidia-container-runtime/runtime/runc/${_runc_commit}/*
+  mkdir -p ${srcdir}/gopath/src/github.com/opencontainers
+  ln -rTsf "${srcdir}/runc" "${srcdir}/${_runc_path}"
+}
+
+build() {
+  cd ${srcdir}/${_runc_path}
+  GOPATH="${srcdir}/gopath" EXTRA_LDFLAGS="-extldflags=-Wl,-z,now,-z,relro" make
+}
 
 package() {
-  cd "$srcdir"
-  install -m755 -d "$pkgdir/usr/bin"
-  install -D -m755 usr/bin/* "$pkgdir/usr/bin/"
-  install -D -m644 usr/share/licenses/$pkgname-*/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  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"
 }