Date: Monday, May 31, 2021 @ 18:31:43 Author: dvzrv Revision: 952858 archrelease: copy trunk to community-any
Added: containers-common/repos/community-any/PKGBUILD (from rev 952857, containers-common/trunk/PKGBUILD) containers-common/repos/community-any/mounts.conf (from rev 952857, 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-05-31 18:31:35 UTC (rev 952857) +++ PKGBUILD 2021-05-31 18:31:43 UTC (rev 952858) @@ -1,130 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> - -pkgname=containers-common -pkgver=0.38.3 -_image_pkgver=5.12.0 -_podman_pkgver=3.1.2 -_skopeo_pkgver=1.2.3 -_storage_pkgver=1.31.1 -pkgrel=2 -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=('e813f9d7300ad69fdde41a1f6e065809b56c09d03aa4178e15ae6e55215c10ff721c8046e71f2e509d4de53cc754d7d5376fe9b96d284717e99e53c63a4eacf7' - 'c690b1c4fd67754c41cc590279382a8f4228e3160db5ba482455b4c0ef4b6bd40ea92d0ca7662b2cc1504d82afdb33bdce8d60552ba3e216102ed34e1418d8c0' - 'fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d' - '06e3ddc17f45a7b145c44c58d67894d3fff809cd1521753027c703c44425241d4580096fd44d9156eae70336544110e2af95ab6f9d22deff88903c6e77bbe4d8' - '995f0d83bd0bae056c4c74461315ac9866a31efe60c44177d23b7f336add9dceb8e22bccfb0c1b9f036d6e3771fcaf4e41d0eff445946554cfd86b0645bf058d' - '11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1') -b2sums=('f316c7973d1b0de05f4c2ff16ec3c86b6d3e30895406694fe5f622fce3d30fa1db6992462123c3834bf0c417c329b49cd2d2eb7a2c940f36d0e49b2024847705' - 'c90e13a400fd7de3d4d57e6e5490d36f47949aa2170f832cd22d34e663ede528fa85cc84c836d48301568657b78a8fafcea2c7ed475da179dc6f0507b8501523' - '8536f6856e436467541f7714e75d5055545e1514604d6541671894117e752609a9e791355c162ef8fcdbc0cbd992823ecab8a3ab760bab3a469d9768b6b008e4' - '3db447726d6a545f5225aa37a215da8a7893ea8beae08547bf93148d632a80863173b014949cc69cb033a2e68653738fe86d1c8758b12fc3c2c16ebb5582b203' - '49ab70d460c55599416c0e39eef15dbed4df882ba2be59ef89f10b8af5e8655d460c7b2ad8ab0d8a5b02a0f817dcea9eee3b9f77c222166c21c1af4c2f399f07' - '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 952857, containers-common/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-05-31 18:31:43 UTC (rev 952858) @@ -0,0 +1,130 @@ +# Maintainer: David Runge <dv...@archlinux.org> + +pkgname=containers-common +pkgver=0.39.0 +_image_pkgver=5.12.0 +_podman_pkgver=3.1.2 +_skopeo_pkgver=1.3.0 +_storage_pkgver=1.32.1 +pkgrel=2 +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=('da9ebd09d59196580d06b3eedab5f15bc9edb3e137e1098d7547dc3f054f4a4c0d7b6026c113f3061a3a01ffa6434f07c119d34b47dc5aefaddfb78a526d0526' + 'c690b1c4fd67754c41cc590279382a8f4228e3160db5ba482455b4c0ef4b6bd40ea92d0ca7662b2cc1504d82afdb33bdce8d60552ba3e216102ed34e1418d8c0' + 'fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d' + '5b6e96fff4670d8dcbc787cd5a568112337a111e7c44111226fa5684edffa880a1d632660238c55b6193ba26496697dd7e38d7d015cdfd61ce5efb119f0e12eb' + 'fb914dfe8c5fa6bf77ea9926faaef8dbfe1d82e2b2f902ef8a1afc8115891b8c5f890f94bec0b37b7fd762e783d1083d1764aa990fd64e12275e25adde27e445' + '11fa515bbb0686d2b49c4fd2ab35348cb19f9c6780d6eb951a33b07ed7b7c72a676627f36e8c74e1a2d15e306d4537178f0e127fd3490f6131d078e56b46d5e1') +b2sums=('deefda3ae131bb6bfb63a47e000c142d3f5381fb1c1e5e475abcf2e85fae2372a3716544c58016cb9ec5c9e550e7d0505f22ddab3fd4b907625634838815e2bf' + 'c90e13a400fd7de3d4d57e6e5490d36f47949aa2170f832cd22d34e663ede528fa85cc84c836d48301568657b78a8fafcea2c7ed475da179dc6f0507b8501523' + '8536f6856e436467541f7714e75d5055545e1514604d6541671894117e752609a9e791355c162ef8fcdbc0cbd992823ecab8a3ab760bab3a469d9768b6b008e4' + 'b26e39d821e63b31a1cbd23bf7b836fbe3185f45ad086c8d0f427309590dbaf196fe09af9aca4aae10c30423c3828375ffe6c95c9c9fb1dea739404e98d8554e' + 'e0220b140ea1b44572640631b8c13f43db072c516d61ef01bfe99ba56ec23715a159a9bbbdd30a2c40a165cf34f43fcd11b830be513056faa9e2d0957e376724' + '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-05-31 18:31:35 UTC (rev 952857) +++ mounts.conf 2021-05-31 18:31:43 UTC (rev 952858) @@ -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 952857, containers-common/trunk/mounts.conf) =================================================================== --- mounts.conf (rev 0) +++ mounts.conf 2021-05-31 18:31:43 UTC (rev 952858) @@ -0,0 +1,3 @@ +# Configuration file for default mounts in containers (see man 5 +# containers-mounts.conf for further information) +