Date: Thursday, August 19, 2021 @ 20:20:00 Author: dvzrv Revision: 1003897
archrelease: copy trunk to community-any Added: containers-common/repos/community-any/PKGBUILD (from rev 1003896, containers-common/trunk/PKGBUILD) containers-common/repos/community-any/mounts.conf (from rev 1003896, containers-common/trunk/mounts.conf) Deleted: containers-common/repos/community-any/PKGBUILD containers-common/repos/community-any/mounts.conf -------------+ PKGBUILD | 260 +++++++++++++++++++++++++++++----------------------------- mounts.conf | 6 - 2 files changed, 133 insertions(+), 133 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-08-19 20:19:52 UTC (rev 1003896) +++ PKGBUILD 2021-08-19 20:20:00 UTC (rev 1003897) @@ -1,130 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> - -pkgname=containers-common -pkgver=0.43.1 -_image_pkgver=5.15.0 -_podman_pkgver=3.2.3 -_skopeo_pkgver=1.4.0 -_storage_pkgver=1.34.0 -pkgrel=1 -pkgdesc="Configuration files and manpages for containers" -arch=('any') -url="https://github.com/containers" -license=('Apache') -makedepends=('go-md2man') -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" - 'mounts.conf' -) -sha512sums=('7e854b7fc5724f5ea7ffb691916cd6797f846466b1649eb026acd2a24dcf3c7275e639c7667e87cd40acb3f7acf1c59a8b7fec15d9d0e9b63fc173dfe97e5ee4' - '65acadc3863e2d21b56c7a60d12e57a78281c75af2bfe69cce861a28b18d4cfff06d4c637c196622e5863438afe05df883cd4c3c3233633c359952b2188c1058' - 'e9df45b0f6afbcdce1f5ef0b2fa7dfc0f374699d0a080b4989c47bbff54d2e5a85d6eb899e17726948e8d233393454b4441d83c2be5a8068fa75c40e1dc1c2bf' - '2a21ed33ef39c700fc8247876d33ee7592129d8454eac09ee0a896d7c7c59ee02dd714c38bf4cab03c51b5060ea638ee0da6a2e6ed37f1846de296ce4c843076' - '1a7f62aab5f666db256942bfabc7fa6bcb608328ad0240141ff0c7f9894b921ac0db6476de7f97bc801c72e9dac4b1b24224525d1febe04c3559def0a0f9fa02' - '11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1') -b2sums=('c2038202dff38cf44afdfa778e88caab86c746d79e5f86ad5dabd6c573e4a62b6f1228788c61cf9b3bfd8711481b77364871581ba474aac33f4313f038c7c573' - '9b0449802b079bd7a0c0b98e34125b1d91e8ec5f6d49ed771ab03df62f151c5d3e72f9f805ad33bc7a799a7b04fa8101ed5a94c86dd7dc3cd638864df5bea1d9' - '544a2053618c1ff2f77604fdbb2291d45701b8a02b2aef50b67d34cde8bfd366fb4c283c8f918e5d70a0548cb9b7d80e554fb148313cda8dca5bc3081fb3c765' - '2150742ebf146d42b841e8e3f1b28e0c6875b10214fd323ce6915f6b776dca85e8cbf1fcd8477dd600cf4104fba2b2aca8358bbb091e3c9ff3a3e89ddbdc6cb7' - '1582c7510ef3b91ca4b36377f883031af715f7cb08fb047bbfcaa2b53b8e72e2450dd2d6be8ad4d4e2c1f42c9b099d0d42523a11cfe8df20252a67c9a5e29d29' - '2f4b0af3271103362a898e7fcc3ec05f06755902ad664ac3107bb8debb8b2ac0d50de311d5fc651279a817a56e3ff05864a7e77c0d8fc628ff7411bfb98c9b69') - -prepare() { - ( - cd "storage-${_storage_pkgver}" - sed -r 's/(GOMD2MAN = ).*/\1 go-md2man/' -i docs/Makefile - ) -} - -build() { - ( - cd "common-${pkgver}/docs" - for _man_page in *.md; do - go-md2man -in "$_man_page" -out "${_man_page//.md}" - done - ) - ( - cd "image-${_image_pkgver}/docs" - mkdir -vp man5 - mv -v *.5.md man5/ - for _man_page in *.md; do - go-md2man -in "$_man_page" -out "${_man_page//.md}.1" - done - for _man_page in man5/*.md; do - go-md2man -in "$_man_page" -out "${_man_page//.md}" - done - ) - ( - cd "podman-${_podman_pkgver}" - go-md2man -in docs/source/markdown/containers-mounts.conf.5.md \ - -out containers-mounts.conf.5 - go-md2man -in pkg/hooks/docs/oci-hooks.5.md \ - -out oci-hooks.5 - ) - ( - cd "storage-${_storage_pkgver}" - make -C docs - ) -} - -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/" - # man pages - install -vDm 644 docs/*.5 -t "${pkgdir}/usr/share/man/man5/" - ) - ( - cd "image-${_image_pkgver}" - # configs - install -vDm 644 registries.conf -t "${pkgdir}/etc/containers/" - # man pages - install -vDm 644 docs/*.1 -t "${pkgdir}/usr/share/man/man1/" - install -vDm 644 docs/man5/*.5 -t "${pkgdir}/usr/share/man/man5/" - ) - ( - cd "podman-${_podman_pkgver}" - install -vDm 644 *.5 -t "${pkgdir}/usr/share/man/man5/" - ) - ( - 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/" - ) -} Copied: containers-common/repos/community-any/PKGBUILD (from rev 1003896, containers-common/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-08-19 20:20:00 UTC (rev 1003897) @@ -0,0 +1,130 @@ +# Maintainer: David Runge <dv...@archlinux.org> + +pkgname=containers-common +pkgver=0.43.2 +_image_pkgver=5.15.2 +_podman_pkgver=3.2.3 +_skopeo_pkgver=1.4.0 +_storage_pkgver=1.34.0 +pkgrel=1 +pkgdesc="Configuration files and manpages for containers" +arch=('any') +url="https://github.com/containers" +license=('Apache') +makedepends=('go-md2man') +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" + 'mounts.conf' +) +sha512sums=('25658720a9b032b2588a96e489c1d1dcd985036716f2410fa8f071754d9780a95f244784dc2caf13c4f85d420d2a3068d839b6197c3fd24c073b57f912e4d5ab' + '239bf7d58f5126fcd1e721ecc5e14ab28284535348fc39fd9232a5cd2725a397f5e51287e22ac5e1e4f7fcf1b0159eecd0660da9a50d52d0cdbf9503bf39fb47' + 'e9df45b0f6afbcdce1f5ef0b2fa7dfc0f374699d0a080b4989c47bbff54d2e5a85d6eb899e17726948e8d233393454b4441d83c2be5a8068fa75c40e1dc1c2bf' + '2a21ed33ef39c700fc8247876d33ee7592129d8454eac09ee0a896d7c7c59ee02dd714c38bf4cab03c51b5060ea638ee0da6a2e6ed37f1846de296ce4c843076' + '1a7f62aab5f666db256942bfabc7fa6bcb608328ad0240141ff0c7f9894b921ac0db6476de7f97bc801c72e9dac4b1b24224525d1febe04c3559def0a0f9fa02' + '11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1') +b2sums=('8f35d9ce203fc388e1cc9160e5f3481c24a05977272841bb04af2e75cbad67a0f47aeff856a4ee2cfc070e432d35bc74afcb07e582bd3bb470917e4dfecbf5da' + 'f5725486b2a643c94d23455577ab9235e765d92b5b67950674eba962a36952a0856530bbdeb0cdbb54baae3eeb990148f1de8726f2c78937f3c3ba533f0f3978' + '544a2053618c1ff2f77604fdbb2291d45701b8a02b2aef50b67d34cde8bfd366fb4c283c8f918e5d70a0548cb9b7d80e554fb148313cda8dca5bc3081fb3c765' + '2150742ebf146d42b841e8e3f1b28e0c6875b10214fd323ce6915f6b776dca85e8cbf1fcd8477dd600cf4104fba2b2aca8358bbb091e3c9ff3a3e89ddbdc6cb7' + '1582c7510ef3b91ca4b36377f883031af715f7cb08fb047bbfcaa2b53b8e72e2450dd2d6be8ad4d4e2c1f42c9b099d0d42523a11cfe8df20252a67c9a5e29d29' + '2f4b0af3271103362a898e7fcc3ec05f06755902ad664ac3107bb8debb8b2ac0d50de311d5fc651279a817a56e3ff05864a7e77c0d8fc628ff7411bfb98c9b69') + +prepare() { + ( + cd "storage-${_storage_pkgver}" + sed -r 's/(GOMD2MAN = ).*/\1 go-md2man/' -i docs/Makefile + ) +} + +build() { + ( + cd "common-${pkgver}/docs" + for _man_page in *.md; do + go-md2man -in "$_man_page" -out "${_man_page//.md}" + done + ) + ( + cd "image-${_image_pkgver}/docs" + mkdir -vp man5 + mv -v *.5.md man5/ + for _man_page in *.md; do + go-md2man -in "$_man_page" -out "${_man_page//.md}.1" + done + for _man_page in man5/*.md; do + go-md2man -in "$_man_page" -out "${_man_page//.md}" + done + ) + ( + cd "podman-${_podman_pkgver}" + go-md2man -in docs/source/markdown/containers-mounts.conf.5.md \ + -out containers-mounts.conf.5 + go-md2man -in pkg/hooks/docs/oci-hooks.5.md \ + -out oci-hooks.5 + ) + ( + cd "storage-${_storage_pkgver}" + make -C docs + ) +} + +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/" + # man pages + install -vDm 644 docs/*.5 -t "${pkgdir}/usr/share/man/man5/" + ) + ( + cd "image-${_image_pkgver}" + # configs + install -vDm 644 registries.conf -t "${pkgdir}/etc/containers/" + # man pages + install -vDm 644 docs/*.1 -t "${pkgdir}/usr/share/man/man1/" + install -vDm 644 docs/man5/*.5 -t "${pkgdir}/usr/share/man/man5/" + ) + ( + cd "podman-${_podman_pkgver}" + install -vDm 644 *.5 -t "${pkgdir}/usr/share/man/man5/" + ) + ( + 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/" + ) +} Deleted: mounts.conf =================================================================== --- mounts.conf 2021-08-19 20:19:52 UTC (rev 1003896) +++ mounts.conf 2021-08-19 20:20:00 UTC (rev 1003897) @@ -1,3 +0,0 @@ -# Configuration file for default mounts in containers (see man 5 -# containers-mounts.conf for further information) - Copied: containers-common/repos/community-any/mounts.conf (from rev 1003896, containers-common/trunk/mounts.conf) =================================================================== --- mounts.conf (rev 0) +++ mounts.conf 2021-08-19 20:20:00 UTC (rev 1003897) @@ -0,0 +1,3 @@ +# Configuration file for default mounts in containers (see man 5 +# containers-mounts.conf for further information) +