[arch-commits] Commit in cri-o/repos (6 files)
David Runge
dvzrv at archlinux.org
Thu Apr 15 09:44:48 UTC 2021
Date: Thursday, April 15, 2021 @ 09:44:48
Author: dvzrv
Revision: 918972
archrelease: copy trunk to community-testing-x86_64
Added:
cri-o/repos/community-testing-x86_64/
cri-o/repos/community-testing-x86_64/PKGBUILD
(from rev 918971, cri-o/trunk/PKGBUILD)
cri-o/repos/community-testing-x86_64/cri-o-1.21.0-pinns_pie.patch
(from rev 918971, cri-o/trunk/cri-o-1.21.0-pinns_pie.patch)
cri-o/repos/community-testing-x86_64/cri-o.install
(from rev 918971, cri-o/trunk/cri-o.install)
cri-o/repos/community-testing-x86_64/modules-cri-o.conf
(from rev 918971, cri-o/trunk/modules-cri-o.conf)
cri-o/repos/community-testing-x86_64/sysctl-cri-o.conf
(from rev 918971, cri-o/trunk/sysctl-cri-o.conf)
------------------------------+
PKGBUILD | 87 +++++++++++++++++++++++++++++++++++++++++
cri-o-1.21.0-pinns_pie.patch | 24 +++++++++++
cri-o.install | 8 +++
modules-cri-o.conf | 2
sysctl-cri-o.conf | 3 +
5 files changed, 124 insertions(+)
Copied: cri-o/repos/community-testing-x86_64/PKGBUILD (from rev 918971, cri-o/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2021-04-15 09:44:48 UTC (rev 918972)
@@ -0,0 +1,87 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Tony Lambiris <tony at libpcap.net>
+
+pkgname=cri-o
+pkgver=1.21.0
+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'
+'device-mapper' 'glibc' 'iproute2' 'iptables' 'runc')
+makedepends=('apparmor' 'btrfs-progs' 'gpgme' '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=('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"
+ "${pkgname}-1.21.0-pinns_pie.patch")
+sha512sums=('69c13b00d259f9dc45192493dff0ab853f181629fba5408d895a96e291c2ed20235beea18b70ab77d6d8f593dc0a2c06ca29a40211caaedf51d89b58afcfe77e'
+ '85ee1310cb36c85c42b4068a9549a3ef72b856cd61b2c1036c3e871ef43a69ed80b43599ad94ce5b069ddd823e730596bb3d3875d4ba8cd77c4cc1985335ffff'
+ 'fbcc3c29d5d3dedf56ea96577dec50cb2656b4a22f5a82bf2d600ae20c6b113d35d5db116bac5520398d47a22d40835f56b86433c5713924060e1a7018d297ec'
+ 'dbe51c558a50212065de97794b87af3205b3624b43d073f70be245528a309d2f2bf5c6f6a15e4137d9f3e737a38166d08fed87ede27e33fad843b3b01194eb34')
+b2sums=('352f0313eba7b984dd37e64791c25e5d1dd1ab52ed7123062485362542f7b143aa2324b0788ff86a30423e10ec6b9df276a97f2ab7f7c2f2db0c4516f7c78931'
+ '2771c64b45876d728fc139aa90754df8aadb07e14a7e1126a1488dfcbad7ebcbca923cb0230c4b87acdc6dad8243af2ad06ef4ce587d5c71fc200e40835d8b8d'
+ 'c8a2133df6575c54eb9bd0a89a0c6c764c0cd456bff7338c4a2e1ef4f70a5a778d5a05c335fcf2491ed55e15fc36c677853c0bc8ab66d673f1950fa2c7695f6e'
+ '06558ff67ba4dd6386ada8d50883b7fbc6a74ee6110ad9dc1ee167c43ba48c2c4f15c6a3f7bcabdf6363c235fc482d6fad077821188d65489249ee5764fe7680')
+
+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
+ # do not statically link pinns and enable PIE
+ patch -Np1 -i "../${pkgname}-1.21.0-pinns_pie.patch"
+}
+
+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' 'libgpgme.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-testing-x86_64/cri-o-1.21.0-pinns_pie.patch (from rev 918971, cri-o/trunk/cri-o-1.21.0-pinns_pie.patch)
===================================================================
--- community-testing-x86_64/cri-o-1.21.0-pinns_pie.patch (rev 0)
+++ community-testing-x86_64/cri-o-1.21.0-pinns_pie.patch 2021-04-15 09:44:48 UTC (rev 918972)
@@ -0,0 +1,24 @@
+diff -ruN a/Makefile b/Makefile
+--- a/Makefile 2021-04-13 23:47:29.000000000 +0200
++++ b/Makefile 2021-04-15 11:18:45.140171673 +0200
+@@ -153,7 +153,7 @@
+ ${SHELLFILES} ${BATS_FILES}
+
+ bin/pinns:
+- $(MAKE) -C pinns
++ $(MAKE) -C pinns LDFLAGS=$(LDFLAGS)
+
+ test/copyimg/copyimg: $(GO_FILES) .gopathok
+ $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ $(PROJECT)/test/copyimg
+diff -ruN a/pinns/Makefile b/pinns/Makefile
+--- a/pinns/Makefile 2021-04-13 23:47:29.000000000 +0200
++++ b/pinns/Makefile 2021-04-15 11:21:01.100633321 +0200
+@@ -8,7 +8,7 @@
+ all: ../bin/pinns
+
+ ../bin/pinns: $(obj) | ../bin
+- $(CC) -o $@ $^ $(CFLAGS) $(LIBS)
++ $(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS) $(LIBS)
+ $(STRIP) -s $@
+
+ %.o: %.c $(HEADERS)
Copied: cri-o/repos/community-testing-x86_64/cri-o.install (from rev 918971, cri-o/trunk/cri-o.install)
===================================================================
--- community-testing-x86_64/cri-o.install (rev 0)
+++ community-testing-x86_64/cri-o.install 2021-04-15 09:44:48 UTC (rev 918972)
@@ -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
+}
Copied: cri-o/repos/community-testing-x86_64/modules-cri-o.conf (from rev 918971, cri-o/trunk/modules-cri-o.conf)
===================================================================
--- community-testing-x86_64/modules-cri-o.conf (rev 0)
+++ community-testing-x86_64/modules-cri-o.conf 2021-04-15 09:44:48 UTC (rev 918972)
@@ -0,0 +1,2 @@
+br_netfilter
+overlay
Copied: cri-o/repos/community-testing-x86_64/sysctl-cri-o.conf (from rev 918971, cri-o/trunk/sysctl-cri-o.conf)
===================================================================
--- community-testing-x86_64/sysctl-cri-o.conf (rev 0)
+++ community-testing-x86_64/sysctl-cri-o.conf 2021-04-15 09:44:48 UTC (rev 918972)
@@ -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