Date: Saturday, August 21, 2021 @ 11:51:53 Author: foxboron Revision: 1004141
upgpkg: podman 3.3.0-1 Modified: podman/trunk/PKGBUILD ----------+ PKGBUILD | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-08-21 11:35:53 UTC (rev 1004140) +++ PKGBUILD 2021-08-21 11:51:53 UTC (rev 1004141) @@ -4,11 +4,11 @@ pkgbase=podman pkgname=(podman podman-docker) -pkgver=3.2.3 +pkgver=3.3.0 pkgrel=1 pkgdesc='Tool and library for running OCI-based containers in pods' arch=(x86_64) -url='https://github.com/containers/libpod' +url='https://github.com/containers/podman' license=(Apache) depends=(cni-plugins conmon containers-common device-mapper iptables libseccomp @@ -21,10 +21,17 @@ sha256sums=('SKIP') pkgver() { - cd libpod + cd $pkgname git describe --tags | sed 's/^v//;s/-/+/g' } +prepare(){ + cd $pkgname + # Fix trimpath in makefile + # https://github.com/containers/podman/commit/e7b7c90bae1c65f61f524498e0ff152639f1ce04.patch + git cherry-pick -n e7b7c90bae1c65f61f524498e0ff152639f1ce04 +} + build() { export BUILDTAGS='seccomp systemd' export CGO_CPPFLAGS="${CPPFLAGS}" @@ -33,7 +40,7 @@ export CGO_LDFLAGS="${LDFLAGS}" export GOFLAGS="-buildmode=pie -trimpath" - cd libpod + cd $pkgname make EXTRA_LDFLAGS='-s -w -linkmode=external' } @@ -44,7 +51,7 @@ 'catatonit: --init flag support' 'crun: support for unified cgroupsv2') - cd libpod + cd $pkgname make install install.completions DESTDIR="$pkgdir" PREFIX=/usr # remove man pages provided by containers-common rm -rvf "${pkgdir}/usr/share/man/man5" @@ -56,6 +63,6 @@ conflicts=(docker) provides=(docker) - cd libpod + cd podman make -j1 install.docker-full DESTDIR="$pkgdir" PREFIX=/usr }