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

[David Runge]

    Date: Saturday, December 12, 2020 @ 18:02:56
  Author: dvzrv
Revision: 773607

upgpkg: cri-o 1.20.0-1: Upgrade to 1.20.0.

Provide system-wide go-md2man to build system.

Modified:
  cri-o/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-12 17:35:51 UTC (rev 773606)
+++ PKGBUILD	2020-12-12 18:02:56 UTC (rev 773607)
@@ -2,8 +2,8 @@
 # Contributor: Tony Lambiris <tony at libpcap.net>
 
 pkgname=cri-o
-pkgver=1.19.0
-pkgrel=7
+pkgver=1.20.0
+pkgrel=1
 pkgdesc="Open Container Initiative-based implementation of Kubernetes Container Runtime Interface"
 arch=('x86_64')
 url="https://github.com/cri-o/cri-o"
@@ -10,7 +10,8 @@
 license=('Apache')
 depends=('cni-plugins' 'conmon' 'conntrack-tools' 'containers-common'
 'device-mapper' 'glibc' 'iproute2' 'iptables' 'runc')
-makedepends=('apparmor' 'btrfs-progs' 'gpgme' 'go' 'go-md2man' 'libassuan' 'libseccomp' 'ostree')
+makedepends=('apparmor' 'btrfs-progs' 'gpgme' 'go' 'go-md2man' 'libassuan'
+'libseccomp' 'ostree')
 optdepends=('apparmor: for apparmor integration'
             'btrfs-progs: for btrfs support')
 provides=('container-runtime')
@@ -25,11 +26,11 @@
         "modules-${pkgname}.conf"
         "sysctl-${pkgname}.conf"
         "${pkgname}-1.19.0-pinns_pie.patch")
-sha512sums=('15b506d755be735d7b71e503b02b309693e3090be41f5790bd34cec460238eab56829239caf18849f3656cf8c12f77a10bbb3ae4ad81eb4e18858946e454583d'
+sha512sums=('9bc718d0f2e082947f592e3a26f75a8a05116defecff7270f058e47ca0d0ba0a2a581ee155df15d5466e6dff8049bd52abc883577d7b917a0342d2133649d46c'
             '85ee1310cb36c85c42b4068a9549a3ef72b856cd61b2c1036c3e871ef43a69ed80b43599ad94ce5b069ddd823e730596bb3d3875d4ba8cd77c4cc1985335ffff'
             'fbcc3c29d5d3dedf56ea96577dec50cb2656b4a22f5a82bf2d600ae20c6b113d35d5db116bac5520398d47a22d40835f56b86433c5713924060e1a7018d297ec'
             '1eb382a0a5c273a6ed1df9666ff2b7a83cdb513818f85ca9984da254aecf518580c1b13410715eb73fd1bc7d687a4fd6ef5ae30eb11a1046e422157f117aeb1a')
-b2sums=('8288985392a08fb7fdc58f509d34f8814bf9670386b7aae42be349765cb1f3bd3f4b77077e9c282a4a25b0f99b8a8fc335c6a53053bd2575b3e23c225483a1d3'
+b2sums=('6a13a7cae521f3c0daaadb01ce5865ec5b38395f581d9cc14a31ca83418f5bc8dd06c232f6a3fdd681326ddb578df22b7759393ddc45b51ea28344e3c7ee2410'
         '2771c64b45876d728fc139aa90754df8aadb07e14a7e1126a1488dfcbad7ebcbca923cb0230c4b87acdc6dad8243af2ad06ef4ce587d5c71fc200e40835d8b8d'
         'c8a2133df6575c54eb9bd0a89a0c6c764c0cd456bff7338c4a2e1ef4f70a5a778d5a05c335fcf2491ed55e15fc36c677853c0bc8ab66d673f1950fa2c7695f6e'
         '8d77c8060f483c943bd48d9bc2c1d676878e570b29989b7ff733906612b6dff09ed1ffcabc5174175ebc667df897e37e98a8132016bddcb27137661fca2da6dd')
@@ -40,8 +41,7 @@
   sed -e 's|/var/run|/run|g' \
       -i crictl.yaml pkg/config/config{,_unix}.go \
       docs/*.md crio-umount.conf \
-      vendor/github.com/containers/conmon/runner/config/config_unix.go \
-      vendor/github.com/containers/storage/{storage.conf,store.go}
+      vendor/github.com/containers/conmon/runner/config/config_unix.go
   # make sure that /usr/bin is used in systemd units
   sed -e 's|/usr/local|/usr|g' \
       -i contrib/systemd/*.service
@@ -60,7 +60,7 @@
   export CGO_LDFLAGS="${LDFLAGS}"
   export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
 
-  make
+  make GO_MD2MAN=/usr/bin/go-md2man
 }
 
 package() {
@@ -67,7 +67,7 @@
   depends+=('libdevmapper.so' 'libgpgme.so' 'libseccomp.so')
   cd "${pkgname}-${pkgver}"
   # makefile is mixing DESTDIR and PREFIX
-  make install install.systemd DESTDIR="${pkgdir}" PREFIX="${pkgdir}/usr"
+  make install install.systemd GO_MD2MAN=/usr/bin/go-md2man DESTDIR="${pkgdir}" PREFIX="${pkgdir}/usr"
   # install CNI configs
   install -vDm 644 contrib/cni/10-crio-bridge.conf "${pkgdir}/etc/cni/net.d/100-crio-bridge.conf"
   install -vDm 644 contrib/cni/99-loopback.conf "${pkgdir}/etc/cni/net.d/199-crio-loopback.conf"