[arch-commits] Commit in cri-o/repos/community-x86_64 (8 files)
Morten Linderud
foxboron at gemini.archlinux.org
Tue Aug 9 17:46:34 UTC 2022
Date: Tuesday, August 9, 2022 @ 17:46:33
Author: foxboron
Revision: 1264280
archrelease: copy trunk to community-x86_64
Added:
cri-o/repos/community-x86_64/PKGBUILD
(from rev 1264279, cri-o/trunk/PKGBUILD)
cri-o/repos/community-x86_64/cri-o.install
(from rev 1264279, cri-o/trunk/cri-o.install)
cri-o/repos/community-x86_64/modules-cri-o.conf
(from rev 1264279, cri-o/trunk/modules-cri-o.conf)
cri-o/repos/community-x86_64/sysctl-cri-o.conf
(from rev 1264279, cri-o/trunk/sysctl-cri-o.conf)
Deleted:
cri-o/repos/community-x86_64/PKGBUILD
cri-o/repos/community-x86_64/cri-o.install
cri-o/repos/community-x86_64/modules-cri-o.conf
cri-o/repos/community-x86_64/sysctl-cri-o.conf
--------------------+
PKGBUILD | 168 +++++++++++++++++++++++++--------------------------
cri-o.install | 16 ++--
modules-cri-o.conf | 4 -
sysctl-cri-o.conf | 6 -
4 files changed, 97 insertions(+), 97 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-09 17:46:28 UTC (rev 1264279)
+++ PKGBUILD 2022-08-09 17:46:33 UTC (rev 1264280)
@@ -1,84 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-# Contributor: Tony Lambiris <tony at libpcap.net>
-
-pkgname=cri-o
-pkgver=1.24.1
-pkgrel=1
-pkgdesc="Open Container Initiative-based implementation of Kubernetes Container Runtime Interface"
-arch=(x86_64)
-url="https://github.com/cri-o/cri-o"
-license=(Apache)
-# NOTE: gpgme is dlopen'd
-depends=(cni-plugins conmon crun conntrack-tools containers-common
-device-mapper glibc gpgme iproute2 iptables runc)
-makedepends=(apparmor btrfs-progs go go-md2man libassuan libseccomp
-ostree)
-optdepends=(
- 'apparmor: for apparmor integration'
- 'btrfs-progs: for btrfs support'
-)
-provides=(container-runtime)
-backup=(
- etc/crio/crio.conf
- etc/cni/net.d/100-crio-bridge.conf
- etc/cni/net.d/199-crio-loopback.conf
-)
-# configuration override and hook directories should exist
-options=(debug emptydirs)
-install=$pkgname.install
-source=(
- $pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
- modules-$pkgname.conf
- sysctl-$pkgname.conf
-)
-sha512sums=('899efb61c70be3a0e950dc239245e1a4dca66e2130d8b355a7ad73c1e91088a2d42c6a4cc05f879cc6a1252d40294e9a8845fd2b110148a05a9d63f61077c498'
- '85ee1310cb36c85c42b4068a9549a3ef72b856cd61b2c1036c3e871ef43a69ed80b43599ad94ce5b069ddd823e730596bb3d3875d4ba8cd77c4cc1985335ffff'
- 'fbcc3c29d5d3dedf56ea96577dec50cb2656b4a22f5a82bf2d600ae20c6b113d35d5db116bac5520398d47a22d40835f56b86433c5713924060e1a7018d297ec')
-b2sums=('13840967b7555e680652cdfe71e358fee5afcfbdbc28771960a5e28c88d6242909a595212559b7967c05cfc7cf9921d6d227b810a26bdc66cb75ffed917bcb23'
- '2771c64b45876d728fc139aa90754df8aadb07e14a7e1126a1488dfcbad7ebcbca923cb0230c4b87acdc6dad8243af2ad06ef4ce587d5c71fc200e40835d8b8d'
- 'c8a2133df6575c54eb9bd0a89a0c6c764c0cd456bff7338c4a2e1ef4f70a5a778d5a05c335fcf2491ed55e15fc36c677853c0bc8ab66d673f1950fa2c7695f6e')
-
-prepare() {
- cd $pkgname-$pkgver
- # make sure that /run instead of /var/run is used
- sed -e 's|/var/run|/run|g' \
- -i crictl.yaml pkg/config/config{,_unix}.go \
- docs/*.md crio-umount.conf \
- vendor/github.com/containers/conmon/runner/config/config_unix.go
- # make sure that /usr/bin is used in systemd units
- sed -e 's|/usr/local|/usr|g' -i contrib/systemd/*.service
- # set the correct default PATH for cni-plugins
- sed -e 's|/opt/cni/bin/|/usr/lib/cni/|g' -i pkg/config/config_unix.go
-}
-
-build() {
- cd $pkgname-$pkgver
- export CGO_CPPFLAGS="$CPPFLAGS"
- export CGO_CFLAGS="$CFLAGS"
- export CGO_CXXFLAGS="$CXXFLAGS"
- export CGO_LDFLAGS="$LDFLAGS"
- export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
-
- make GO_MD2MAN=/usr/bin/go-md2man
-}
-
-package() {
- depends+=(libdevmapper.so libseccomp.so)
-
- cd $pkgname-$pkgver
- # makefile is mixing DESTDIR and PREFIX
- make install install.systemd GO_MD2MAN=/usr/bin/go-md2man DESTDIR="$pkgdir" PREFIX="$pkgdir/usr"
- # install CNI configs
- install -vDm 644 contrib/cni/10-crio-bridge.conf "$pkgdir/etc/cni/net.d/100-crio-bridge.conf"
- install -vDm 644 contrib/cni/99-loopback.conf "$pkgdir/etc/cni/net.d/199-crio-loopback.conf"
- # modules
- install -vDm 644 ../modules-$pkgname.conf "$pkgdir/usr/lib/modules-load.d/cri-o.conf"
- # sysctl
- install -vDm 644 ../sysctl-$pkgname.conf "$pkgdir/usr/lib/sysctl.d/90-cri-o.conf"
- # docs
- install -vDm 644 {CONTRIBUTING,README,awesome,code-of-conduct,install,transfer,tutorial}.md -t "$pkgdir/usr/share/doc/$pkgname/"
- install -vDm 644 tutorials/*.md -t "$pkgdir/usr/share/doc/$pkgname/tutorials/"
- install -vDm 644 contrib/cni/*.{conf,md} -t "$pkgdir/usr/share/doc/$pkgname/examples/cni/"
- install -vDm 644 contrib/metrics-exporter/{Containerfile,*.{yaml,gif,json,go}} -t "$pkgdir/usr/share/doc/$pkgname/examples/metrics-exporter/"
-}
Copied: cri-o/repos/community-x86_64/PKGBUILD (from rev 1264279, cri-o/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-09 17:46:33 UTC (rev 1264280)
@@ -0,0 +1,84 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Contributor: Tony Lambiris <tony at libpcap.net>
+
+pkgname=cri-o
+pkgver=1.24.2
+pkgrel=1
+pkgdesc="Open Container Initiative-based implementation of Kubernetes Container Runtime Interface"
+arch=(x86_64)
+url="https://github.com/cri-o/cri-o"
+license=(Apache)
+# NOTE: gpgme is dlopen'd
+depends=(cni-plugins conmon crun conntrack-tools containers-common
+device-mapper glibc gpgme iproute2 iptables runc)
+makedepends=(apparmor btrfs-progs go go-md2man libassuan libseccomp
+ostree)
+optdepends=(
+ 'apparmor: for apparmor integration'
+ 'btrfs-progs: for btrfs support'
+)
+provides=(container-runtime)
+backup=(
+ etc/crio/crio.conf
+ etc/cni/net.d/100-crio-bridge.conf
+ etc/cni/net.d/199-crio-loopback.conf
+)
+# configuration override and hook directories should exist
+options=(debug emptydirs)
+install=$pkgname.install
+source=(
+ $pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
+ modules-$pkgname.conf
+ sysctl-$pkgname.conf
+)
+sha512sums=('97403b4bebfd65d577e1008251ba122d6e49623531abe2d66458ab263bdffa3fd1aa6d1c993fbff0b8705e4080ca56fbbc0b21aea19b5e76765dae2c54beb36b'
+ '85ee1310cb36c85c42b4068a9549a3ef72b856cd61b2c1036c3e871ef43a69ed80b43599ad94ce5b069ddd823e730596bb3d3875d4ba8cd77c4cc1985335ffff'
+ 'fbcc3c29d5d3dedf56ea96577dec50cb2656b4a22f5a82bf2d600ae20c6b113d35d5db116bac5520398d47a22d40835f56b86433c5713924060e1a7018d297ec')
+b2sums=('7e6e30d3b974ab4a276322bf4281ae4e32a2a05792151359a40b08992549b522d5ebf2d0d52b849065f0546f00d3ecbdff4f53afb712fe8ae4c37250996e6695'
+ '2771c64b45876d728fc139aa90754df8aadb07e14a7e1126a1488dfcbad7ebcbca923cb0230c4b87acdc6dad8243af2ad06ef4ce587d5c71fc200e40835d8b8d'
+ 'c8a2133df6575c54eb9bd0a89a0c6c764c0cd456bff7338c4a2e1ef4f70a5a778d5a05c335fcf2491ed55e15fc36c677853c0bc8ab66d673f1950fa2c7695f6e')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # make sure that /run instead of /var/run is used
+ sed -e 's|/var/run|/run|g' \
+ -i crictl.yaml pkg/config/config{,_unix}.go \
+ docs/*.md crio-umount.conf \
+ vendor/github.com/containers/conmon/runner/config/config_unix.go
+ # make sure that /usr/bin is used in systemd units
+ sed -e 's|/usr/local|/usr|g' -i contrib/systemd/*.service
+ # set the correct default PATH for cni-plugins
+ sed -e 's|/opt/cni/bin/|/usr/lib/cni/|g' -i pkg/config/config_unix.go
+}
+
+build() {
+ cd $pkgname-$pkgver
+ export CGO_CPPFLAGS="$CPPFLAGS"
+ export CGO_CFLAGS="$CFLAGS"
+ export CGO_CXXFLAGS="$CXXFLAGS"
+ export CGO_LDFLAGS="$LDFLAGS"
+ export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+
+ make GO_MD2MAN=/usr/bin/go-md2man
+}
+
+package() {
+ depends+=(libdevmapper.so libseccomp.so)
+
+ cd $pkgname-$pkgver
+ # makefile is mixing DESTDIR and PREFIX
+ make install install.systemd GO_MD2MAN=/usr/bin/go-md2man DESTDIR="$pkgdir" PREFIX="$pkgdir/usr"
+ # install CNI configs
+ install -vDm 644 contrib/cni/10-crio-bridge.conf "$pkgdir/etc/cni/net.d/100-crio-bridge.conf"
+ install -vDm 644 contrib/cni/99-loopback.conf "$pkgdir/etc/cni/net.d/199-crio-loopback.conf"
+ # modules
+ install -vDm 644 ../modules-$pkgname.conf "$pkgdir/usr/lib/modules-load.d/cri-o.conf"
+ # sysctl
+ install -vDm 644 ../sysctl-$pkgname.conf "$pkgdir/usr/lib/sysctl.d/90-cri-o.conf"
+ # docs
+ install -vDm 644 {CONTRIBUTING,README,awesome,code-of-conduct,install,transfer,tutorial}.md -t "$pkgdir/usr/share/doc/$pkgname/"
+ install -vDm 644 tutorials/*.md -t "$pkgdir/usr/share/doc/$pkgname/tutorials/"
+ install -vDm 644 contrib/cni/*.{conf,md} -t "$pkgdir/usr/share/doc/$pkgname/examples/cni/"
+ install -vDm 644 contrib/metrics-exporter/{Containerfile,*.{yaml,gif,json,go}} -t "$pkgdir/usr/share/doc/$pkgname/examples/metrics-exporter/"
+}
Deleted: cri-o.install
===================================================================
--- cri-o.install 2022-08-09 17:46:28 UTC (rev 1264279)
+++ cri-o.install 2022-08-09 17:46:33 UTC (rev 1264280)
@@ -1,8 +0,0 @@
-post_install() {
- if ! grep "br_netfilter" /proc/modules; then
- echo "Load the br_netfilter kernel module or reboot: modprobe br_netfilter."
- fi
- if ! grep "overlay" /proc/modules; then
- echo "Load the overlay kernel module (if required) or reboot: modprobe overlay."
- fi
-}
Copied: cri-o/repos/community-x86_64/cri-o.install (from rev 1264279, cri-o/trunk/cri-o.install)
===================================================================
--- cri-o.install (rev 0)
+++ cri-o.install 2022-08-09 17:46:33 UTC (rev 1264280)
@@ -0,0 +1,8 @@
+post_install() {
+ if ! grep "br_netfilter" /proc/modules; then
+ echo "Load the br_netfilter kernel module or reboot: modprobe br_netfilter."
+ fi
+ if ! grep "overlay" /proc/modules; then
+ echo "Load the overlay kernel module (if required) or reboot: modprobe overlay."
+ fi
+}
Deleted: modules-cri-o.conf
===================================================================
--- modules-cri-o.conf 2022-08-09 17:46:28 UTC (rev 1264279)
+++ modules-cri-o.conf 2022-08-09 17:46:33 UTC (rev 1264280)
@@ -1,2 +0,0 @@
-br_netfilter
-overlay
Copied: cri-o/repos/community-x86_64/modules-cri-o.conf (from rev 1264279, cri-o/trunk/modules-cri-o.conf)
===================================================================
--- modules-cri-o.conf (rev 0)
+++ modules-cri-o.conf 2022-08-09 17:46:33 UTC (rev 1264280)
@@ -0,0 +1,2 @@
+br_netfilter
+overlay
Deleted: sysctl-cri-o.conf
===================================================================
--- sysctl-cri-o.conf 2022-08-09 17:46:28 UTC (rev 1264279)
+++ sysctl-cri-o.conf 2022-08-09 17:46:33 UTC (rev 1264280)
@@ -1,3 +0,0 @@
-net.bridge.bridge-nf-call-iptables = 1
-net.bridge.bridge-nf-call-ip6tables = 1
-net.ipv4.ip_forward = 1
Copied: cri-o/repos/community-x86_64/sysctl-cri-o.conf (from rev 1264279, cri-o/trunk/sysctl-cri-o.conf)
===================================================================
--- sysctl-cri-o.conf (rev 0)
+++ sysctl-cri-o.conf 2022-08-09 17:46:33 UTC (rev 1264280)
@@ -0,0 +1,3 @@
+net.bridge.bridge-nf-call-iptables = 1
+net.bridge.bridge-nf-call-ip6tables = 1
+net.ipv4.ip_forward = 1
More information about the arch-commits
mailing list