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

[Morten Linderud]

    Date: Wednesday, October 2, 2019 @ 20:01:48
  Author: foxboron
Revision: 512455

upgpkg: podman 1.6.0-1

1.6.0 uses go modules. Remove the path hacks.

Modified:
  podman/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-02 19:55:24 UTC (rev 512454)
+++ PKGBUILD	2019-10-02 20:01:48 UTC (rev 512455)
@@ -2,7 +2,7 @@
 
 pkgbase=podman
 pkgname=(podman podman-docker)
-pkgver=1.5.1
+pkgver=1.6.0
 pkgrel=1
 pkgdesc='Tool and library for running OCI-based containers in pods'
 arch=(x86_64)
@@ -12,23 +12,20 @@
          btrfs-progs slirp4netns libsystemd)
 makedepends=(go-pie go-md2man git)
 source=(libpod-$pkgver.tar.gz::$url/archive/v${pkgver}.tar.gz)
-sha256sums=('5651102e8d8f15b3dfddc80702dc93149b94de330502d6de6fafa7afddbbf709')
+sha256sums=('bc58ae9018be53a477f1cc86596d919c137a4e6774834cc830010d3c27602033')
 
-prepare() {
-  pushd libpod-$pkgver
+prepare(){
+  cd libpod-$pkgver
   sed -i '/^LDFLAGS_PODMAN ?=/s/$(LDFLAGS)//' Makefile
-  popd
-
-  mkdir -p src/github.com/containers src/github.com/varlink
-  cp -r libpod-$pkgver src/github.com/containers/libpod
 }
 
 build() {
   export GOPATH="$srcdir"
   export BUILDTAGS='seccomp ostree varlink containers_image_ostree_stub systemd'
+  export CGO_LDFLAGS=$LDFLAGS
+  export GOFLAGS="-trimpath"
 
-  cd src/github.com/containers/libpod
-  make install.tools
+  cd libpod-$pkgver
   make
 }
 
@@ -35,7 +32,7 @@
 package_podman() {
   optdepends=('podman-docker: for Docker-compatible CLI')
 
-  cd src/github.com/containers/libpod
+  cd libpod-$pkgver
   make install install.completions install.config DESTDIR="$pkgdir" PREFIX=/usr
 }
 
@@ -44,6 +41,6 @@
   depends=(podman)
   conflicts=(docker)
 
-  cd src/github.com/containers/libpod
+  cd libpod-$pkgver
   make install.docker DESTDIR="$pkgdir" PREFIX=/usr
 }