[arch-commits] Commit in podman/repos/community-x86_64 (4 files)
David Runge
dvzrv at gemini.archlinux.org
Wed Aug 3 20:58:16 UTC 2022
Date: Wednesday, August 3, 2022 @ 20:58:16
Author: dvzrv
Revision: 1260157
archrelease: copy trunk to community-x86_64
Added:
podman/repos/community-x86_64/PKGBUILD
(from rev 1260156, podman/trunk/PKGBUILD)
podman/repos/community-x86_64/keys/
podman/repos/community-x86_64/podman-4.1.1-defaultinitpath.patch
(from rev 1260156, podman/trunk/podman-4.1.1-defaultinitpath.patch)
Deleted:
podman/repos/community-x86_64/PKGBUILD
------------------------------------+
PKGBUILD | 137 ++++++++++++++++++-----------------
podman-4.1.1-defaultinitpath.patch | 13 +++
2 files changed, 87 insertions(+), 63 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-03 20:57:46 UTC (rev 1260156)
+++ PKGBUILD 2022-08-03 20:58:16 UTC (rev 1260157)
@@ -1,63 +0,0 @@
-# Maintainer: Morten Linderud <foxboron 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=4.1.1
-pkgrel=2
-pkgdesc='Tool and library for running OCI-based containers in pods'
-arch=(x86_64)
-url='https://github.com/containers/podman'
-license=(Apache)
-makedepends=(apparmor btrfs-progs catatonit 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' # Matthew Heon <mheon at redhat.com>
-)
-sha256sums=('SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-build() {
- # NOTE: the BUILDTAGS may change over time
- export BUILDTAGS='apparmor seccomp systemd'
- export CGO_CPPFLAGS="${CPPFLAGS}"
- export CGO_CFLAGS="${CFLAGS}"
- export CGO_CXXFLAGS="${CXXFLAGS}"
- export CGO_LDFLAGS="${LDFLAGS}"
- export GOFLAGS="-buildmode=pie -trimpath"
-
- make EXTRA_LDFLAGS='-s -w -linkmode=external' -C $pkgbase
- make docker-docs -C $pkgbase
-}
-
-package_podman() {
- depends=(catatonit conmon containers-common crun iptables libdevmapper.so
- libgpgme.so libseccomp.so slirp4netns)
- optdepends=(
- 'apparmor: for AppArmor support'
- 'btrfs-progs: support btrfs backend devices'
- 'netavark: for a new container-network-stack implementation'
- 'podman-compose: for docker-compose compatibility'
- 'podman-docker: for Docker-compatible CLI'
- )
-
- 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"
-}
-
-package_podman-docker() {
- pkgdesc='Emulate Docker CLI using podman'
- depends=(podman)
- conflicts=(docker)
- provides=(docker)
-
- make -j1 install.docker-full DESTDIR="$pkgdir" PREFIX=/usr -C $pkgbase
-}
Copied: podman/repos/community-x86_64/PKGBUILD (from rev 1260156, podman/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-03 20:58:16 UTC (rev 1260157)
@@ -0,0 +1,74 @@
+# Maintainer: Morten Linderud <foxboron 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=4.1.1
+_commit=2ab593258b45c8071f8407ef2403227503fc4534 # refs/tags/v4.1.1
+pkgrel=4
+pkgdesc='Tool and library for running OCI-based containers in pods'
+arch=(x86_64)
+url='https://github.com/containers/podman'
+license=(Apache)
+makedepends=(apparmor btrfs-progs catatonit device-mapper go go-md2man git gpgme libseccomp systemd)
+# https://github.com/containers/podman/issues/13297
+options=(!lto)
+source=(
+ git+$url#tag=$_commit?signed
+ $pkgname-4.1.1-defaultinitpath.patch
+)
+validpgpkeys=(
+ 'B7DBDCA456F7335E91F1C25CD3624C551D0515C4' # Matthew Heon <mheon at redhat.com>
+)
+sha256sums=('SKIP'
+ '58c830aea7fc11abd69170f7e305763e16d8bad69f49632601dc1544d47fdbc0')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+ # set default init_path to /usr/lib/podman/catatonit
+ # https://bugs.archlinux.org/task/75493
+ patch -Np1 -d $pkgname -i ../$pkgname-4.1.1-defaultinitpath.patch
+}
+
+build() {
+ # NOTE: the BUILDTAGS may change over time
+ export BUILDTAGS='apparmor seccomp systemd'
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export GOFLAGS="-buildmode=pie -trimpath"
+
+ make EXTRA_LDFLAGS='-s -w -linkmode=external' -C $pkgbase
+ make docker-docs -C $pkgbase
+}
+
+package_podman() {
+ depends=(catatonit conmon containers-common crun iptables libdevmapper.so
+ libgpgme.so libseccomp.so slirp4netns)
+ optdepends=(
+ 'apparmor: for AppArmor support'
+ 'btrfs-progs: support btrfs backend devices'
+ 'netavark: for a new container-network-stack implementation'
+ 'podman-compose: for docker-compose compatibility'
+ 'podman-docker: for Docker-compatible CLI'
+ )
+
+ 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"
+}
+
+package_podman-docker() {
+ pkgdesc='Emulate Docker CLI using podman'
+ depends=(podman)
+ conflicts=(docker)
+ provides=(docker)
+
+ make -j1 install.docker-full DESTDIR="$pkgdir" PREFIX=/usr -C $pkgbase
+}
Copied: podman/repos/community-x86_64/podman-4.1.1-defaultinitpath.patch (from rev 1260156, podman/trunk/podman-4.1.1-defaultinitpath.patch)
===================================================================
--- podman-4.1.1-defaultinitpath.patch (rev 0)
+++ podman-4.1.1-defaultinitpath.patch 2022-08-03 20:58:16 UTC (rev 1260157)
@@ -0,0 +1,13 @@
+diff --git i/vendor/github.com/containers/common/pkg/config/default.go w/vendor/github.com/containers/common/pkg/config/default.go
+index 8979a406b..4736e0188 100644
+--- i/vendor/github.com/containers/common/pkg/config/default.go
++++ w/vendor/github.com/containers/common/pkg/config/default.go
+@@ -47,7 +47,7 @@ const (
+
+ var (
+ // DefaultInitPath is the default path to the container-init binary
+- DefaultInitPath = "/usr/libexec/podman/catatonit"
++ DefaultInitPath = "/usr/lib/podman/catatonit"
+ // DefaultInfraImage to use for infra container
+ DefaultInfraImage = ""
+ // DefaultRootlessSHMLockPath is the default path for rootless SHM locks
More information about the arch-commits
mailing list