Date: Thursday, December 2, 2021 @ 20:27:35 Author: dvzrv Revision: 1062561
archrelease: copy trunk to community-any Added: containers-common/repos/community-any/PKGBUILD (from rev 1062560, containers-common/trunk/PKGBUILD) containers-common/repos/community-any/mounts.conf (from rev 1062560, containers-common/trunk/mounts.conf) Deleted: containers-common/repos/community-any/PKGBUILD containers-common/repos/community-any/mounts.conf -------------+ PKGBUILD | 256 +++++++++++++++++++++++++++++----------------------------- mounts.conf | 6 - 2 files changed, 131 insertions(+), 131 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-12-02 20:27:27 UTC (rev 1062560) +++ PKGBUILD 2021-12-02 20:27:35 UTC (rev 1062561) @@ -1,128 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> - -pkgname=containers-common -pkgver=0.46.0 -pkgrel=6 -_image_pkgver=5.17.0 -_podman_pkgver=3.4.2 -_skopeo_pkgver=1.5.1 -_storage_pkgver=1.37.0 -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=('e4406b8996e0ae374c463433ce00a392c1ca8259b512a324845e0332bf925284f71d92071eb1d511c00070b3ab41318fbe08bf47d98a6404e7c6d4231143be48' - '20dabc2a8931c97f94bf53c845e5fe4a6ddc13d255d266e4b6181f9ee6970fae50075ddfedeb0d023344310e68cea91b3d6cecc50c59757c0702e05b9442c294' - '849a4d5897de7dae5d6ac71fab11449f7a814e6414a0f463846ddd3817cd91c5f12e288bd44e64cc5bdf5f6073d52dfbf77aba5cbc1fec6ac12a7b222d2a21a2' - '3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde' - '3a65a50946e1eed1c79ea77b65feb1c6c8cf58a0b7b81932acb8891b6daa25e007582eb7f70ef7e7f2a6d8262be5db7757ead2fe079e47c99114b47917d81084' - '11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1') -b2sums=('9a6c5ad52a91d3186aceba301f36dbc9e98088a71a0c2babe119837b25381461bb92b52f16f1b4c6696e9449c502ef87e5026cac6d295d8398a8a68eda3a3ec0' - '13a1268f2b7229245b3ecebb6d4b3a410a551ae9dc926e66d224ce8ae537dc74aac14be831797de662dc244eb0a72e476e0ce0c7b79f15a7fe1684ebaf149c5a' - '6c5ead8f4dc6e79edeb16e72fb906c6aa77f84b53bdd2435f100f923f7cb708c68898d3a1837db2c154700730adcedfb9769b996b5f602954f8388fda09c3650' - '7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c' - 'ebe5c8e562149a9d007ac87d7fc615d29ad7decbfd6b1b8d919b14684a6341575d8f65080a808ba52674664d187a18bb47e88f10e1a02a2975898862873dadf9' - '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 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 1062560, containers-common/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-12-02 20:27:35 UTC (rev 1062561) @@ -0,0 +1,128 @@ +# Maintainer: David Runge <dv...@archlinux.org> + +pkgname=containers-common +pkgver=0.46.0 +pkgrel=7 +_image_pkgver=5.17.0 +_podman_pkgver=3.4.2 +_skopeo_pkgver=1.5.2 +_storage_pkgver=1.37.0 +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=('e4406b8996e0ae374c463433ce00a392c1ca8259b512a324845e0332bf925284f71d92071eb1d511c00070b3ab41318fbe08bf47d98a6404e7c6d4231143be48' + '20dabc2a8931c97f94bf53c845e5fe4a6ddc13d255d266e4b6181f9ee6970fae50075ddfedeb0d023344310e68cea91b3d6cecc50c59757c0702e05b9442c294' + '849a4d5897de7dae5d6ac71fab11449f7a814e6414a0f463846ddd3817cd91c5f12e288bd44e64cc5bdf5f6073d52dfbf77aba5cbc1fec6ac12a7b222d2a21a2' + '7f1dfa41e4fa6a145187413252672b12e59a11ce445d9d5c47c78c4dbb8aa4ffe6925bea20b11034e40725fdb2ac5eacfbb646e7b8cfdd11f07bbb6fc020dda7' + '3a65a50946e1eed1c79ea77b65feb1c6c8cf58a0b7b81932acb8891b6daa25e007582eb7f70ef7e7f2a6d8262be5db7757ead2fe079e47c99114b47917d81084' + '11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1') +b2sums=('9a6c5ad52a91d3186aceba301f36dbc9e98088a71a0c2babe119837b25381461bb92b52f16f1b4c6696e9449c502ef87e5026cac6d295d8398a8a68eda3a3ec0' + '13a1268f2b7229245b3ecebb6d4b3a410a551ae9dc926e66d224ce8ae537dc74aac14be831797de662dc244eb0a72e476e0ce0c7b79f15a7fe1684ebaf149c5a' + '6c5ead8f4dc6e79edeb16e72fb906c6aa77f84b53bdd2435f100f923f7cb708c68898d3a1837db2c154700730adcedfb9769b996b5f602954f8388fda09c3650' + '009f820d0784ae098d434418e126d4cc7318bbef72839b0438073eee02c4644195a6c5108334b3c1efd3e5c655035460994b151e5f4f3f30ae3046a31eab27b2' + 'ebe5c8e562149a9d007ac87d7fc615d29ad7decbfd6b1b8d919b14684a6341575d8f65080a808ba52674664d187a18bb47e88f10e1a02a2975898862873dadf9' + '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 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-12-02 20:27:27 UTC (rev 1062560) +++ mounts.conf 2021-12-02 20:27:35 UTC (rev 1062561) @@ -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 1062560, containers-common/trunk/mounts.conf) =================================================================== --- mounts.conf (rev 0) +++ mounts.conf 2021-12-02 20:27:35 UTC (rev 1062561) @@ -0,0 +1,3 @@ +# Configuration file for default mounts in containers (see man 5 +# containers-mounts.conf for further information) +