Date: Saturday, January 11, 2020 @ 12:53:45 Author: foxboron Revision: 551893
upgpkg: podman 1.7.0-1 Added: podman/trunk/fix-makefile.patch Modified: podman/trunk/PKGBUILD --------------------+ PKGBUILD | 25 ++++++++++++------------- fix-makefile.patch | 13 +++++++++++++ 2 files changed, 25 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-01-11 12:28:08 UTC (rev 551892) +++ PKGBUILD 2020-01-11 12:53:45 UTC (rev 551893) @@ -2,35 +2,34 @@ pkgbase=podman pkgname=(podman podman-docker) -pkgver=1.6.3 +pkgver=1.7.0 pkgrel=1 pkgdesc='Tool and library for running OCI-based containers in pods' arch=(x86_64) url='https://github.com/containers/libpod' license=(Apache) -depends=(cni-plugins conmon device-mapper iptables libseccomp ostree runc skopeo +depends=(cni-plugins conmon device-mapper iptables libseccomp runc skopeo btrfs-progs slirp4netns libsystemd) makedepends=(go-pie go-md2man git) -_commit=9d087f6a766259ba53b224944f1b7b778035c370 -source=("git+$url#commit=$_commit" - "fix-makefile.patch::https://github.com/containers/libpod/commit/ca4c24cce1345ab8757cd9a590a0f099207150fa.patch";) +optdepends=('catatonit: --init flag support') +source=("git+$url#tag=v$pkgver?signed" + "fix-makefile.patch") +validpgpkeys=('B7DBDCA456F7335E91F1C25CD3624C551D0515C4') sha256sums=('SKIP' - 'b94b7b07320e95e068972d697ae36a027bc48d173e1f52b96f7817e63e77f92f') + '7dc9b1bb6b134196ca5125ba40c1f6d82c260a42bc929d9fb6142a5ac61a1c6a') -pkgver() { +prepare() { cd libpod - git describe --tags | sed 's/^v//;s/-/+/g' + patch -Np1 < "../fix-makefile.patch" } -prepare() { +pkgver() { cd libpod - sed -i '/^LDFLAGS_PODMAN ?=/s/$(LDFLAGS)//' Makefile - patch -Np1 < "../fix-makefile.patch" + git describe --tags | sed 's/^v//;s/-/+/g' } build() { - export GOPATH="$srcdir" - export BUILDTAGS='seccomp ostree varlink containers_image_ostree_stub systemd' + export BUILDTAGS='seccomp varlink systemd' export CGO_LDFLAGS=$LDFLAGS export GOFLAGS="-trimpath" Added: fix-makefile.patch =================================================================== --- fix-makefile.patch (rev 0) +++ fix-makefile.patch 2020-01-11 12:53:45 UTC (rev 551893) @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 3f87990f..c09fcd08 100644 +--- a/Makefile ++++ b/Makefile +@@ -520,7 +520,7 @@ install.libseccomp.sudo: + cd ../../seccomp/libseccomp && git checkout --detach $(LIBSECCOMP_COMMIT) && ./autogen.sh && ./configure --prefix=/usr && make all && make install + + +-cmd/podman/varlink/iopodman.go: cmd/podman/varlink/io.podman.varlink ++cmd/podman/varlink/iopodman.go: .gopathok cmd/podman/varlink/io.podman.varlink + GO111MODULE=off $(GO) generate ./cmd/podman/varlink/... + + API.md: cmd/podman/varlink/io.podman.varlink
