Date: Thursday, March 9, 2023 @ 16:46:30
Author: dvzrv
Revision: 1417128
archrelease: copy trunk to community-x86_64
Added:
cri-o/repos/community-x86_64/PKGBUILD
(from rev 1417127, cri-o/trunk/PKGBUILD)
cri-o/repos/community-x86_64/cri-o.install
(from rev 1417127, cri-o/trunk/cri-o.install)
cri-o/repos/community-x86_64/modules-cri-o.conf
(from rev 1417127, cri-o/trunk/modules-cri-o.conf)
cri-o/repos/community-x86_64/sysctl-cri-o.conf
(from rev 1417127, 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 | 181 ++++++++++++++++++++++++++++-----------------------
cri-o.install | 16 ++--
modules-cri-o.conf | 4 -
sysctl-cri-o.conf | 6 -
4 files changed, 113 insertions(+), 94 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-09 16:46:06 UTC (rev 1417127)
+++ PKGBUILD 2023-03-09 16:46:30 UTC (rev 1417128)
@@ -1,81 +0,0 @@
-# Maintainer: David Runge <[email protected]>
-# Maintainer: Morten Linderud <[email protected]>
-# Contributor: Tony Lambiris <[email protected]>
-
-pkgname=cri-o
-pkgver=1.26.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 conntrack-tools containers-common device-mapper
-glibc gpgme iproute2 iptables oci-runtime)
-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
-)
-# 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=('c2608c73c47068bf51c6e32051c0122ed2350d211d473c0eabe349309cf903ac365fcf59cfaac5878f2818c4c9836833f377556823a67a3203a9f66a36f944c6'
-
'85ee1310cb36c85c42b4068a9549a3ef72b856cd61b2c1036c3e871ef43a69ed80b43599ad94ce5b069ddd823e730596bb3d3875d4ba8cd77c4cc1985335ffff'
-
'fbcc3c29d5d3dedf56ea96577dec50cb2656b4a22f5a82bf2d600ae20c6b113d35d5db116bac5520398d47a22d40835f56b86433c5713924060e1a7018d297ec')
-b2sums=('42bdcbbe9cc9d571eaf6144e9c4ade3bcc38824f7bb6c9687972a685ce6d6f60236b17e36e65ffb180f31f3bef69a307132b3a316b3690fc18a48eb2125f1ffa'
-
'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 V=1 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"
- # drop-in config dir for CNI plugins
- install -vdm 755 "$pkgdir/etc/cni/net.d/"
- # 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/*.{conflist,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 1417127,
cri-o/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-09 16:46:30 UTC (rev 1417128)
@@ -0,0 +1,100 @@
+# Maintainer: David Runge <[email protected]>
+# Maintainer: Morten Linderud <[email protected]>
+# Contributor: Tony Lambiris <[email protected]>
+
+pkgname=cri-o
+pkgver=1.26.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)
+depends=(
+ cni-plugins
+ conmon
+ conntrack-tools
+ containers-common
+ glibc
+ gpgme # NOTE: dlopen'd
+ iproute2
+ iptables
+ oci-runtime
+)
+makedepends=(
+ apparmor
+ btrfs-progs
+ device-mapper
+ go
+ go-md2man
+ libassuan
+ libseccomp
+ ostree
+)
+optdepends=(
+ 'apparmor: for apparmor integration'
+ 'btrfs-progs: for btrfs support'
+)
+provides=(container-runtime)
+backup=(
+ etc/crio/crio.conf
+)
+# configuration override and hook directories should exist
+options=(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=('d6e169f6f33c5777d905bf10ddd514b9c10ec318c6a95b764d64a524c53045c3c160a3b6a1e7cde8df5407b1857f199b4222c0faf276209af903a5386d8f0733'
+
'85ee1310cb36c85c42b4068a9549a3ef72b856cd61b2c1036c3e871ef43a69ed80b43599ad94ce5b069ddd823e730596bb3d3875d4ba8cd77c4cc1985335ffff'
+
'fbcc3c29d5d3dedf56ea96577dec50cb2656b4a22f5a82bf2d600ae20c6b113d35d5db116bac5520398d47a22d40835f56b86433c5713924060e1a7018d297ec')
+b2sums=('dbbbe25291e7fd860770b1be72fb0f1f86fe645f3c9ddf3b54f5a80f24666d77c7e0e0f5ef1f8d39a25a2e0c8f687bb242b13d0361428199232983bb4af6108c'
+
'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 V=1 GO_MD2MAN=/usr/bin/go-md2man
+}
+
+package() {
+ depends+=(
+ device-mapper libdevmapper.so
+ libseccomp 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"
+ # drop-in config dir for CNI plugins
+ install -vdm 755 "$pkgdir/etc/cni/net.d/"
+ # 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/*.{conflist,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 2023-03-09 16:46:06 UTC (rev 1417127)
+++ cri-o.install 2023-03-09 16:46:30 UTC (rev 1417128)
@@ -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 1417127,
cri-o/trunk/cri-o.install)
===================================================================
--- cri-o.install (rev 0)
+++ cri-o.install 2023-03-09 16:46:30 UTC (rev 1417128)
@@ -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 2023-03-09 16:46:06 UTC (rev 1417127)
+++ modules-cri-o.conf 2023-03-09 16:46:30 UTC (rev 1417128)
@@ -1,2 +0,0 @@
-br_netfilter
-overlay
Copied: cri-o/repos/community-x86_64/modules-cri-o.conf (from rev 1417127,
cri-o/trunk/modules-cri-o.conf)
===================================================================
--- modules-cri-o.conf (rev 0)
+++ modules-cri-o.conf 2023-03-09 16:46:30 UTC (rev 1417128)
@@ -0,0 +1,2 @@
+br_netfilter
+overlay
Deleted: sysctl-cri-o.conf
===================================================================
--- sysctl-cri-o.conf 2023-03-09 16:46:06 UTC (rev 1417127)
+++ sysctl-cri-o.conf 2023-03-09 16:46:30 UTC (rev 1417128)
@@ -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 1417127,
cri-o/trunk/sysctl-cri-o.conf)
===================================================================
--- sysctl-cri-o.conf (rev 0)
+++ sysctl-cri-o.conf 2023-03-09 16:46:30 UTC (rev 1417128)
@@ -0,0 +1,3 @@
+net.bridge.bridge-nf-call-iptables = 1
+net.bridge.bridge-nf-call-ip6tables = 1
+net.ipv4.ip_forward = 1
