fkf9: 1 testing/cri-o: upgrade to 1.22.0 2 files changed, 8 insertions(+), 14 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/3646/mbox | git am -3Learn more about email & git
--- testing/cri-o/APKBUILD | 6 +++--- testing/cri-o/makefile-fix-install.patch | 16 +++++----------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/testing/cri-o/APKBUILD b/testing/cri-o/APKBUILD index 0cb35f1ca3..219688119b 100644 --- a/testing/cri-o/APKBUILD +++ b/testing/cri-o/APKBUILD @@ -3,7 +3,7 @@ # Contributor: TBK <alpine@jjtc.eu> # Maintainer: ungleich <foss@ungleich.ch> pkgname=cri-o -pkgver=1.21.0 +pkgver=1.22.0 pkgrel=3 pkgdesc="OCI-based implementation of Kubernetes Container Runtime Interface" url="https://github.com/cri-o/cri-o/" @@ -85,12 +85,12 @@ contrib_cni() { } sha512sums=" -69c13b00d259f9dc45192493dff0ab853f181629fba5408d895a96e291c2ed20235beea18b70ab77d6d8f593dc0a2c06ca29a40211caaedf51d89b58afcfe77e cri-o-1.21.0.tar.gz +2b72115ec63354c5b4fae17e2f51ede85d1975e539a8264e60bbeba36b804e6bca030ca2d11579bad8eb6e09746e83268fe0ee2deaae55e3efd4848dc8d206ff cri-o-1.22.0.tar.gz e026f056ed92489413e16ed7955a9dcd7d1f4df1cc28e3ea785771b44d43811fea4f5b953cc46bc0c4aeac8ad07115bfff304d7516ebd24f2e58fe782ff812c8 crio.conf 29561e95398975748236217bbd9df64997f6e3de6c0555d007306bd0535895a648368385a13079eb7d52c06249a91980523a73b6563e86d0575d9cd9c3fa4ee9 crio.initd 1115228546a696eeebeb6d4b3e5c3152af0c99a2559097fc5829d8b416d979c457b4b1789e0120054babf57f585d3f63cbe49949d40417ae7aab613184bf4516 crio.logrotated 0a567dfa431ab1e53f2a351689be8d588a60cc5fcdbda403ec4f8b6ab9b1c18ad425f6c47f9a5ab1491e3a61a269dc4efa6a59e91e7521fa2b6bb165074aa8e0 cni-plugins-path.patch -64f3741c12f1c23ce2b0cba38e3a9839c6614bcdca194d3ebff6cd8666f9717c9bfafa2ec1119fbb0f20ab506ec1bbf1bffd3a89b92eedf68da883248aa39f47 makefile-fix-install.patch +9fec53fbe8f61941056dce210d7a4afd8d9c292a6ccba6c28878fe3f82d8270dc229bc4467398e5e2456013d3e12a7837d248f7d6e6bca1dedb6506bf3cfcdd3 makefile-fix-install.patch 26ed10b478feb19cb11f5916b24301943f9e316fdd62d53ec310bb05ffcf4213ceece1340d2486461557abb04074e85002b11b6347fddaaa45ad7439e907a5a7 fix-test.patch 78c150f87027de489289596371dce0465159ced0758776b445deb58990e099de9c654406183c9da3cc909878b24d28db62121b7056cd180a6f2820e79e165cc6 remove-systemd-files.patch " diff --git a/testing/cri-o/makefile-fix-install.patch b/testing/cri-o/makefile-fix-install.patch index 3b1558d48c..8b44339677 100644 --- a/testing/cri-o/makefile-fix-install.patch +++ b/testing/cri-o/makefile-fix-install.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -8,11 +8,11 @@ +@@ -9,11 +9,11 @@ PROJECT := github.com/cri-o/cri-o CRIO_INSTANCE := crio_dev @@ -14,16 +14,16 @@ ETCDIR_CRIO ?= ${ETCDIR}/crio DATAROOTDIR ?= ${PREFIX}/share/containers BUILDTAGS ?= containers_image_ostree_stub \ -@@ -24,7 +24,7 @@ - $(shell hack/openpgp_tag.sh) \ +@@ -26,7 +26,7 @@ $(shell hack/seccomp_tag.sh) \ - $(shell hack/selinux_tag.sh) + $(shell hack/selinux_tag.sh) \ + $(shell hack/libsubid_tag.sh) -CRICTL_CONFIG_DIR=${DESTDIR}/etc +CRICTL_CONFIG_DIR = /etc CONTAINER_RUNTIME ?= podman BUILD_PATH := $(shell pwd)/build BUILD_BIN_PATH := ${BUILD_PATH}/bin -@@ -436,71 +436,73 @@ +@@ -420,68 +420,70 @@ install: .gopathok install.bin install.man install.completions install.systemd install.config install.bin-nobuild: @@ -85,12 +85,8 @@ install.systemd: - install ${SELINUXOPT} -D -m 644 contrib/systemd/crio.service $(PREFIX)/lib/systemd/system/crio.service -- ln -sf crio.service $(PREFIX)/lib/systemd/system/cri-o.service -- install ${SELINUXOPT} -D -m 644 contrib/systemd/crio-shutdown.service $(PREFIX)/lib/systemd/system/crio-shutdown.service - install ${SELINUXOPT} -D -m 644 contrib/systemd/crio-wipe.service $(PREFIX)/lib/systemd/system/crio-wipe.service + install ${SELINUXOPT} -D -m 644 contrib/systemd/crio.service ${DESTDIR}$(PREFIX)/lib/systemd/system/crio.service -+ ln -sf crio.service ${DESTDIR}$(PREFIX)/lib/systemd/system/cri-o.service -+ install ${SELINUXOPT} -D -m 644 contrib/systemd/crio-shutdown.service ${DESTDIR}$(PREFIX)/lib/systemd/system/crio-shutdown.service + install ${SELINUXOPT} -D -m 644 contrib/systemd/crio-wipe.service ${DESTDIR}$(PREFIX)/lib/systemd/system/crio-wipe.service uninstall: @@ -115,7 +111,6 @@ - rm -f ${FISHINSTALLDIR}/crio-status.fish - rm -f ${ZSHINSTALLDIR}/_crio-status - rm -f $(PREFIX)/lib/systemd/system/crio-wipe.service -- rm -f $(PREFIX)/lib/systemd/system/crio-shutdown.service - rm -f $(PREFIX)/lib/systemd/system/crio.service - rm -f $(PREFIX)/lib/systemd/system/cri-o.service - rm -rf $(DATAROOTDIR)/oci/hooks.d @@ -130,7 +125,6 @@ + rm -f $(DESTDIR)${FISHINSTALLDIR}/crio-status.fish + rm -f $(DESTDIR)${ZSHINSTALLDIR}/_crio-status + rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/crio-wipe.service -+ rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/crio-shutdown.service + rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/crio.service + rm -f $(DESTDIR)$(PREFIX)/lib/systemd/system/cri-o.service + rm -f $(DESTDIR)$(ETCDIR_CRIO)/crio.conf -- 2.20.1
pkgrel must be reset to 0 -- via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/25034#note_178780
Andy Postnikov <no-reply@dispatch.alpinelinux.org>also checksum needs fix -- via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/25034#note_178801
Andy Postnikov <no-reply@dispatch.alpinelinux.org>Fixed via !25052 -- via https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/25034#note_178808