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

[David Runge]

    Date: Sunday, February 20, 2022 @ 12:46:16
  Author: dvzrv
Revision: 1135270

upgpkg: podman 4.0.0-1: Upgrade to 4.0.0.

Simplify calls to make.
Remove cni-plugins from podman dependencies, as both cni-plugins and netavark
now provide container-network-stack, which is pulled in via containers-common.
Make sure to build man pages for podman-docker.
Ensure the distribution specific libexecdir.

Modified:
  podman/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-20 12:45:57 UTC (rev 1135269)
+++ PKGBUILD	2022-02-20 12:46:16 UTC (rev 1135270)
@@ -1,10 +1,10 @@
 # Maintainer: Morten Linderud <foxboron at archlinux.org>
-# Contributor: David Runge <dvzrv at archlinux.org>
+# Maintainer: David Runge <dvzrv at archlinux.org>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
 
 pkgbase=podman
 pkgname=(podman podman-docker)
-pkgver=3.4.4
+pkgver=4.0.0
 pkgrel=1
 pkgdesc='Tool and library for running OCI-based containers in pods'
 arch=(x86_64)
@@ -12,9 +12,13 @@
 license=(Apache)
 makedepends=(apparmor btrfs-progs device-mapper go go-md2man git gpgme
              libseccomp systemd)
+# https://github.com/containers/podman/issues/13297
+options=(!lto)
 source=("git+$url#tag=v$pkgver?signed")
-validpgpkeys=('B7DBDCA456F7335E91F1C25CD3624C551D0515C4'
-              '7CE1E6F8C90CB53E7E4D8F2D502E08DB0BBF8EEE')
+validpgpkeys=(
+  'B7DBDCA456F7335E91F1C25CD3624C551D0515C4'  # Matthew Heon <mheon at redhat.com>
+  '7CE1E6F8C90CB53E7E4D8F2D502E08DB0BBF8EEE'  # Ashley Cui <acui at redhat.com>
+)
 sha256sums=('SKIP')
 
 pkgver() {
@@ -31,12 +35,12 @@
   export CGO_LDFLAGS="${LDFLAGS}"
   export GOFLAGS="-buildmode=pie -trimpath"
 
-  cd $pkgname
-  make EXTRA_LDFLAGS='-s -w -linkmode=external'
+  make EXTRA_LDFLAGS='-s -w -linkmode=external' -C $pkgbase
+  make docker-docs -C $pkgbase
 }
 
 package_podman() {
-  depends=(cni-plugins conmon containers-common crun fuse-overlayfs iptables
+  depends=(conmon containers-common crun fuse-overlayfs iptables
   libdevmapper.so libgpgme.so libseccomp.so slirp4netns)
   optdepends=('apparmor: for AppArmor support'
               'btrfs-progs: support btrfs backend devices'
@@ -43,10 +47,9 @@
               'catatonit: --init flag support'
               'podman-docker: for Docker-compatible CLI')
 
-  cd $pkgname
-  make install install.completions DESTDIR="$pkgdir" PREFIX=/usr
+  make install install.completions DESTDIR="$pkgdir" PREFIX=/usr LIBEXECDIR=/usr/lib -C $pkgbase
   # remove man pages provided by containers-common
-  rm -rvf "${pkgdir}/usr/share/man/man5"
+  rm -rvf "$pkgdir/usr/share/man/man5"
 }
 
 package_podman-docker() {
@@ -55,6 +58,5 @@
   conflicts=(docker)
   provides=(docker)
 
-  cd podman
-  make -j1 install.docker-full DESTDIR="$pkgdir" PREFIX=/usr
+  make -j1 install.docker-full DESTDIR="$pkgdir" PREFIX=/usr -C $pkgbase
 }