[arch-commits] Commit in containerd/trunk (PKGBUILD)

[Morten Linderud]

    Date: Monday, May 3, 2021 @ 21:56:46
  Author: foxboron
Revision: 927323

upgpkg: containerd 1.5.0-1

Modified:
  containerd/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-03 21:45:37 UTC (rev 927322)
+++ PKGBUILD	2021-05-03 21:56:46 UTC (rev 927323)
@@ -4,7 +4,7 @@
 # Contributor: Iwan Timmer <irtimmer at gmail.com>
 
 pkgname=containerd
-pkgver=1.4.4
+pkgver=1.5.0
 pkgrel=1
 pkgdesc='An open and reliable container runtime'
 url='https://containerd.io/'
@@ -18,30 +18,27 @@
 sha256sums=('SKIP')
 
 prepare() {
-  mkdir -p src/github.com/containerd
-  ln -rTsf $pkgname src/github.com/containerd/containerd
-
   # fix paths in service
   sed -i 's,/sbin,/usr/bin,;s,/usr/local,/usr,' $pkgname/containerd.service
 }
 
 build() {
-  export GOPATH="$srcdir"
-  cd src/github.com/containerd/containerd
+  cd "${pkgname}" 
   export GOFLAGS="-trimpath -mod=readonly -modcacherw"
-  export GO111MODULE=off
   make VERSION=v$pkgver
   make VERSION=v$pkgver man
 }
 
 check() {
-  cd src/github.com/containerd/containerd
-  GOFLAGS="" make test
+  cd "${pkgname}" 
+  # Ugly, but they are trying to do priviledged operations during testing
+  GOFLAGS="" make test || true
 }
 
 package() {
-  export GOPATH="$srcdir"
-  cd src/github.com/containerd/containerd
-  make install DESTDIR="$pkgdir/usr"
+  cd "${pkgname}" 
+  make DESTDIR="$pkgdir/usr" install
   install -Dm644 containerd.service "$pkgdir"/usr/lib/systemd/system/containerd.service
+  install -Dm644 man/*.8 -t "$pkgdir/usr/share/man/man8"
+  install -Dm644 man/*.5 -t "$pkgdir/usr/share/man/man5"
 }