[arch-commits] Commit in podman/repos/community-x86_64 (PKGBUILD PKGBUILD)

Morten Linderud foxboron at archlinux.org
Wed Sep 23 07:18:59 UTC 2020


    Date: Wednesday, September 23, 2020 @ 07:18:59
  Author: foxboron
Revision: 711447

archrelease: copy trunk to community-x86_64

Added:
  podman/repos/community-x86_64/PKGBUILD
    (from rev 711446, podman/trunk/PKGBUILD)
Deleted:
  podman/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |  114 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 61 insertions(+), 53 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-09-23 07:18:51 UTC (rev 711446)
+++ PKGBUILD	2020-09-23 07:18:59 UTC (rev 711447)
@@ -1,53 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-
-pkgbase=podman
-pkgname=(podman podman-docker)
-pkgver=2.0.6
-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 runc
-         slirp4netns libsystemd fuse-overlayfs skopeo)
-makedepends=(go go-md2man git btrfs-progs)
-source=("git+$url#tag=v$pkgver?signed")
-validpgpkeys=('B7DBDCA456F7335E91F1C25CD3624C551D0515C4')
-sha256sums=('SKIP')
-
-pkgver() {
-  cd libpod
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-build() {
-  export BUILDTAGS='seccomp varlink systemd'
-  export CGO_CPPFLAGS="${CPPFLAGS}"
-  export CGO_CFLAGS="${CFLAGS}"
-  export CGO_CXXFLAGS="${CXXFLAGS}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath"
-
-  cd libpod
-  make EXTRA_LDFLAGS='-s -w -linkmode=external'
-}
-
-package_podman() {
-  optdepends+=('podman-docker: for Docker-compatible CLI'
-              'btrfs-progs: support btrfs backend devices'
-              'catatonit: --init flag support'
-              'crun: support for unified cgroupsv2')
-
-  cd libpod
-  make install install.completions DESTDIR="$pkgdir" PREFIX=/usr
-}
-
-package_podman-docker() {
-  pkgdesc='Emulate Docker CLI using podman'
-  depends=(podman)
-  conflicts=(docker)
-
-  cd libpod
-  make install.docker DESTDIR="$pkgdir" PREFIX=/usr
-}

Copied: podman/repos/community-x86_64/PKGBUILD (from rev 711446, podman/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-09-23 07:18:59 UTC (rev 711447)
@@ -0,0 +1,61 @@
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+
+pkgbase=podman
+pkgname=(podman podman-docker)
+pkgver=2.1.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 runc
+         slirp4netns libsystemd fuse-overlayfs skopeo)
+makedepends=(go go-md2man git btrfs-progs)
+source=("git+$url#tag=v$pkgver?signed"
+        "fix-varlink.patch::https://github.com/containers/podman/commit/5cedd830f7275e8dc3382502908b846bfa57a3b8.patch")
+validpgpkeys=('B7DBDCA456F7335E91F1C25CD3624C551D0515C4')
+sha256sums=('SKIP'
+            '0e46d23deccce91327242389375142703c5d951a8ccf6a43a13b2a329ac3318c')
+
+pkgver() {
+  cd libpod
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  cd "libpod"
+  patch -Np1 < "$srcdir/fix-varlink.patch"
+}
+
+build() {
+  export BUILDTAGS='seccomp varlink systemd'
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath"
+
+  cd libpod
+  go generate ./pkg/varlink/...
+  make EXTRA_LDFLAGS='-s -w -linkmode=external'
+}
+
+package_podman() {
+  optdepends+=('podman-docker: for Docker-compatible CLI'
+              'btrfs-progs: support btrfs backend devices'
+              'catatonit: --init flag support'
+              'crun: support for unified cgroupsv2')
+
+  cd libpod
+  make install install.completions DESTDIR="$pkgdir" PREFIX=/usr
+}
+
+package_podman-docker() {
+  pkgdesc='Emulate Docker CLI using podman'
+  depends=(podman)
+  conflicts=(docker)
+
+  cd libpod
+  make install.docker DESTDIR="$pkgdir" PREFIX=/usr
+}


More information about the arch-commits mailing list