[arch-commits] Commit in containers-common/repos (4 files)
David Runge
dvzrv at gemini.archlinux.org
Sat Aug 13 11:19:34 UTC 2022
Date: Saturday, August 13, 2022 @ 11:19:33
Author: dvzrv
Revision: 1265949
archrelease: copy trunk to community-staging-any
Added:
containers-common/repos/community-staging-any/
containers-common/repos/community-staging-any/PKGBUILD
(from rev 1265948, containers-common/trunk/PKGBUILD)
containers-common/repos/community-staging-any/containers-common-0.48.0-init_path.patch
(from rev 1265948, containers-common/trunk/containers-common-0.48.0-init_path.patch)
containers-common/repos/community-staging-any/mounts.conf
(from rev 1265948, containers-common/trunk/mounts.conf)
------------------------------------------+
PKGBUILD | 163 +++++++++++++++++++++++++++++
containers-common-0.48.0-init_path.patch | 13 ++
mounts.conf | 3
3 files changed, 179 insertions(+)
Copied: containers-common/repos/community-staging-any/PKGBUILD (from rev 1265948, containers-common/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD (rev 0)
+++ community-staging-any/PKGBUILD 2022-08-13 11:19:33 UTC (rev 1265949)
@@ -0,0 +1,163 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=containers-common
+pkgver=0.49.1
+pkgrel=1
+epoch=1
+_image_pkgver=5.22.0
+_podman_pkgver=4.2.0
+_shortnames_pkgver=2022.02.08
+_skopeo_pkgver=1.9.2
+_storage_pkgver=1.42.0
+pkgdesc="Configuration files and manpages for containers"
+arch=(any)
+url="https://github.com/containers"
+license=(Apache)
+depends=('container-network-stack>1')
+makedepends=(go-md2man)
+checkdepends=(ripgrep)
+backup=(
+ etc/containers/containers.conf
+ etc/containers/mounts.conf
+ etc/containers/policy.json
+ etc/containers/registries.conf
+ etc/containers/seccomp.json
+ etc/containers/storage.conf
+)
+# configuration override directories need to exist
+options=(emptydirs)
+source=(
+ common-$pkgver.tar.gz::https://github.com/containers/common/archive/v$pkgver.tar.gz
+ image-$_image_pkgver.tar.gz::https://github.com/containers/image/archive/v$_image_pkgver.tar.gz
+ podman-$_podman_pkgver.tar.gz::https://github.com/containers/podman/archive/v$_podman_pkgver.tar.gz
+ skopeo-$_skopeo_pkgver.tar.gz::https://github.com/containers/skopeo/archive/v$_skopeo_pkgver.tar.gz
+ storage-$_storage_pkgver.tar.gz::https://github.com/containers/storage/archive/v$_storage_pkgver.tar.gz
+ shortnames-$_shortnames_pkgver.tar.gz::https://github.com/containers/shortnames/archive/refs/tags/v$_shortnames_pkgver.tar.gz
+ mounts.conf
+ $pkgname-0.48.0-init_path.patch
+)
+sha512sums=('c918c4ba3a5bdcb5164f4fe8b7fc949fc8ddec1a6819b42859383902f41b845d1989ed8abbdd272b812372116505a899e0d632a247f6b79a6e52c446e5a29fdd'
+ '1b286ddd527d47a11f57af74c8f171ae8ec129678bed8b12476737672655548a1218732b27152c80437f1367b1878f80144e569e77c01ff6c05d659f49bcf694'
+ 'bc9e28d9938127f91be10ea8bc6c6f638a01d74d120efad5ad1e72c5f7b893685871e83872434745bc72ecaca430355b0f59d302660e8b4a53cc88a88cc37f9c'
+ '8d9aad3a6190f0c9bdd85485423dc257408b27088300f8a891615bf47f3ef16e02035d69ea15a75a93f375e6e7ad465f90951725e4ee1509463f05447c7ce174'
+ 'c8a4fdfbc71915dd3a1d5c1fabef4be7641b8a0edb14805719d93bc9de5bd8fe150636c4457fa544487a6bccbb0f58ad36ca3990d6ca3c2b73935418aaf98f22'
+ 'd0f72ad6f86cc1bcb0f02d9c29d3a982c541679098e417410c8f1a3df42550753e4f491efdec09dc02fe3ab4e3f5d8971c8ab9e964293e6b4e1f1261191b3501'
+ '11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1'
+ '4a6526d01f192f0eb4dcbd28c019a2b0db6dc2128af644e8e89992e5dcfa45a02c739b06ee01e22606b5cb847213c002f8ab5f87a576846ac73f73eed9b2b469')
+b2sums=('952ea2307d2347fda89a71b2ac7bb647f15031b5e83a9b9974e6b3da65469846fe28ab1ce9117eefb07d8ffb22781918c76daa88b2da0160e6e9daffbcabcb4e'
+ 'f8e06fb6441112d6fa47e168f6f3d20309d292f5acf4008d64248643b4b4e10bdaa73701d5cdf8ffa7e38018880f5456386b141aeea451969ae23bb14261e9f9'
+ 'a3b8d8b140b9d34e24f87f998fff3558649487b503bdd437f537f09adc51819d81786b6b4e858ef4e8a43c0d872cd20cd1ceee06988a36f830b9ffbb5109d14d'
+ 'd40786fc1d7af5c4293c6eb3aeab6672a2c1535cda5c7abaa03126c99ab5676838ccd7095a58ec75213a17e2cee1cfd25f337ba7406676330b5e97603b804cab'
+ '3cca3833695bb5e15a0ab5d97d5f72e14102d8c6eee1c132932e4177f64ab9a171cf8486f4fe8d9e09a0537a325c988c6b766249c3c0843bb5f1b270a705b523'
+ 'da94f0fe514031d3f02cbc3524fb8ba2ffab1e53949bea009768663f487301c3029a026abff23771ebf73ee94868490cf1758ebee2646c95dc5406111fb12208'
+ '2f4b0af3271103362a898e7fcc3ec05f06755902ad664ac3107bb8debb8b2ac0d50de311d5fc651279a817a56e3ff05864a7e77c0d8fc628ff7411bfb98c9b69'
+ '89e95f468785f6ca1309b0de37921702bd4eb6fb191afc0d93454bec7b7096a1b84e19408b5a0abcdfd89ce2ebd228879cbc42a0d409425fb41caab6a8f049f5')
+
+prepare() {
+ sed -r 's/(GOMD2MAN = ).*/\1 go-md2man/' -i storage-$_storage_pkgver/docs/Makefile
+ patch -Np1 -d common-$pkgver -i ../$pkgname-0.48.0-init_path.patch
+ mkdir -vp build/{man1,man5}
+}
+
+build() {
+
+ (
+ printf "Creating common man pages...\n"
+ cd common-$pkgver
+ for _man_page in docs/*.md pkg/hooks/docs/*.md; do
+ go-md2man -in $_man_page -out ../build/man5/$(basename ${_man_page//.md})
+ done
+ )
+
+ (
+ printf "Creating image man pages...\n"
+ cd image-$_image_pkgver
+ mkdir -vp man5
+ mv -v docs/*.5.md man5/
+ for _man_page in docs/*.md; do
+ go-md2man -in $_man_page -out ../build/man1/$(basename ${_man_page//.md}).1
+ done
+ for _man_page in man5/*.md; do
+ go-md2man -in $_man_page -out ../build/man5/$(basename ${_man_page//.md})
+ done
+ )
+
+ (
+ printf "Creating storage documentation...\n"
+ cd storage-$_storage_pkgver
+ make -C docs
+ )
+}
+
+check() {
+ local _podman_common_ver
+ _podman_common_ver="$(rg "github.com/containers/common" podman-$_podman_pkgver/go.mod | cut -d ' ' -f2 | sed 's/v//')"
+ _podman_image_ver="$(rg "github.com/containers/image" podman-$_podman_pkgver/go.mod | cut -d ' ' -f2 | sed 's/v//')"
+ _podman_storage_ver="$(rg "github.com/containers/storage" podman-$_podman_pkgver/go.mod | cut -d ' ' -f2 | sed 's/v//')"
+
+ printf "Common version in podman: %s\n" $_podman_common_ver
+ printf "Image version in podman: %s\n" $_podman_image_ver
+ printf "Storage version in podman: %s\n" $_podman_storage_ver
+
+ # NOTE: we are comparing the major.minor version of containers/common required by podman with the one of containers/common that we are trying to build
+ # https://github.com/containers/common/issues/923
+ if (( $(vercmp "${_podman_common_ver%.*}" "${pkgver%.*}") != 0 )); then
+ printf "The podman package in version %s requires containers/common in version %s but we are trying to build version %s\n" $_podman_pkgver ${_podman_common_ver%.*} ${pkgver%.*}
+ exit 1
+ fi
+ if (( $(vercmp "${_podman_image_ver%.*}" "${_image_pkgver%.*}") != 0 )); then
+ printf "The podman package in version %s requires containers/image in version %s but we are trying to use version %s\n" $_podman_pkgver ${_podman_image_ver%.*} ${_image_pkgver%.*}
+ exit 1
+ fi
+ if (( $(vercmp "${_podman_storage_ver%.*}" "${_storage_pkgver%.*}") != 0 )); then
+ printf "The podman package in version %s requires containers/storage in version %s but we are trying to use version %s\n" $_podman_pkgver ${_podman_storage_ver%.*} ${_storage_pkgver%.*}
+ exit 1
+ fi
+}
+
+package() {
+ # directories
+ install -vdm 755 "$pkgdir/etc/containers/oci/hooks.d/"
+ install -vdm 755 "$pkgdir/etc/containers/registries.conf.d/"
+ install -vdm 755 "$pkgdir/usr/share/containers/oci/hooks.d/"
+ install -vdm 755 "$pkgdir/var/lib/containers/"
+
+ # configs
+ install -vDm 644 mounts.conf -t "$pkgdir/etc/containers/"
+
+ (
+ cd common-$pkgver
+ # configs
+ install -vDm 644 pkg/config/containers.conf -t "$pkgdir/etc/containers/"
+ install -vDm 644 pkg/config/containers.conf -t "$pkgdir/usr/share/containers/"
+ install -vDm 644 pkg/seccomp/seccomp.json -t "$pkgdir/etc/containers/"
+ install -vDm 644 pkg/seccomp/seccomp.json -t "$pkgdir/usr/share/containers/"
+ )
+ (
+ cd image-$_image_pkgver
+ # configs
+ install -vDm 644 registries.conf -t "$pkgdir/etc/containers/"
+ )
+ (
+ cd shortnames-$_shortnames_pkgver
+ install -vDm 644 shortnames.conf "$pkgdir/etc/containers/registries.conf.d/00-shortnames.conf"
+ )
+ (
+ cd skopeo-$_skopeo_pkgver
+ # configs
+ install -vDm 644 default-policy.json "$pkgdir/etc/containers/policy.json"
+ install -vDm 644 default.yaml -t "$pkgdir/etc/containers/registries.d/"
+ )
+ (
+ cd storage-$_storage_pkgver
+ # configs
+ install -vDm 644 storage.conf -t "$pkgdir/etc/containers/"
+ install -vDm 644 storage.conf -t "$pkgdir/usr/share/containers/"
+ # man pages
+ install -vDm 644 docs/*.1 -t "$pkgdir/usr/share/man/man1/"
+ install -vDm 644 docs/*.5 -t "$pkgdir/usr/share/man/man5/"
+ )
+ # man pages
+ install -vDm 644 build/man1/*.1 "$pkgdir/usr/share/man/man1/"
+ install -vDm 644 build/man5/*.5 "$pkgdir/usr/share/man/man5/"
+}
Copied: containers-common/repos/community-staging-any/containers-common-0.48.0-init_path.patch (from rev 1265948, containers-common/trunk/containers-common-0.48.0-init_path.patch)
===================================================================
--- community-staging-any/containers-common-0.48.0-init_path.patch (rev 0)
+++ community-staging-any/containers-common-0.48.0-init_path.patch 2022-08-13 11:19:33 UTC (rev 1265949)
@@ -0,0 +1,13 @@
+diff --git i/pkg/config/containers.conf w/pkg/config/containers.conf
+index a4e755a6..f13c7860 100644
+--- i/pkg/config/containers.conf
++++ w/pkg/config/containers.conf
+@@ -146,7 +146,7 @@ default_sysctls = [
+
+ # Container init binary, if init=true, this is the init binary to be used for containers.
+ #
+-#init_path = "/usr/libexec/podman/catatonit"
++#init_path = "/usr/lib/podman/catatonit"
+
+ # Default way to to create an IPC namespace (POSIX SysV IPC) for the container
+ # Options are:
Copied: containers-common/repos/community-staging-any/mounts.conf (from rev 1265948, containers-common/trunk/mounts.conf)
===================================================================
--- community-staging-any/mounts.conf (rev 0)
+++ community-staging-any/mounts.conf 2022-08-13 11:19:33 UTC (rev 1265949)
@@ -0,0 +1,3 @@
+# Configuration file for default mounts in containers (see man 5
+# containers-mounts.conf for further information)
+
More information about the arch-commits
mailing list