diff --git a/.gitignore b/.gitignore index 839e3bb..af6ec1b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,21 +29,9 @@ /v1.20.0.tar.gz /v1.20.1.tar.gz /v1.20.2.tar.gz +/cri-o-1.21.3.tar.gz /cri-o-1.21.1.tar.gz /cri-o-1.21.2.tar.gz -/cri-o-1.22.0.tar.gz -/cri-o-1.22.1.tar.gz -/cri-o-1.23.0.tar.gz -/cri-o-1.23.1.tar.gz -/cri-o-1.23.2.tar.gz -/cri-o-1.24.1.tar.gz -/cri-o-1.26.1.tar.gz -/cri-o-1.27.0.tar.gz -/cri-o-1.27.1.tar.gz -/cri-o-1.28.0.tar.gz -/cri-o-1.28.2.tar.gz -/cri-o-1.29.2.tar.gz -/cri-o-1.29.3.tar.gz -/cri-o-1.29.4.tar.gz -/cri-o-1.31.1.tar.gz -/cri-o-1.32.0.tar.gz +/cri-o-1.21.4.tar.gz +/cri-o-1.21.5.tar.gz +/cri-o-1.21.6.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 6f0a55b..a639f79 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,22 +1,15 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -%global service_name crio +Version: 1.21.6 -# Related: github.com/cri-o/cri-o/issues/3684 -%global build_timestamp %(date -u +'%Y-%m-%dT%H:%M:%SZ') -%global git_tree_state clean -%global criocli_path "" - -Version: 1.32.0 - -%if 0%{?rhel} && 0%{?rhel} <= 9 +%if 0%{?rhel} && 0%{?rhel} <= 8 %define gobuild(o:) %{expand: # https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12 %global _dwz_low_mem_die_limit 0 %ifnarch ppc64 - go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${BASE_LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**}; + go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**}; %else - go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${BASE_LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**}; + go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**}; %endif } %bcond_with check @@ -25,22 +18,39 @@ Version: 1.32.0 %bcond_without check %endif +# Related: github.com/cri-o/cri-o/issues/3684 +%global build_timestamp %(date -u +'%Y-%m-%dT%H:%M:%SZ') +%global git_tree_state clean +%global criocli_path "" + +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%global built_tag v%{version} +%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%global crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') + +# Services +%global service_name crio + # Commit for the builds -%global commit0 b7f3c240bcbda6fae8d43561694d18317e09e167 +%global commit0 c03e400ec69fb22256a1b9c8f3ae8011a3539582 Name: cri-o Epoch: 0 -Release: 5%{?dist} +Release: 2%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface + # Upstream license specification: Apache-2.0 -# Automatically converted from old format: ASL 2.0 - review is highly recommended. -License: Apache-2.0 +License: ASL 2.0 URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz +Source3: %{service_name}-network.sysconfig +Source4: %{service_name}-storage.sysconfig +Source5: %{service_name}-metrics.sysconfig %if 0%{?rhel} -BuildRequires: golang >= 1.23 +BuildRequires: golang %endif %if 0%{?rhel} && 0%{?rhel} <= 8 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -72,11 +82,10 @@ Requires: container-selinux Requires: containers-common >= 1:0.1.31-14 %if 0%{?rhel} && 0%{?rhel} < 8 Requires: runc >= 1.0.0-16 -Requires: containernetworking-plugins >= 1.0.0-1 %else Recommends: runc >= 1.0.0-16 -Suggests: containernetworking-plugins >= 1.0.0-1 %endif +Requires: containernetworking-plugins >= 0.7.5-1 Requires: conmon >= 2.0.2-1 Requires: socat @@ -89,7 +98,7 @@ Open Container Initiative-based implementation of Kubernetes Container Runtime Interface. %prep -%if 0%{?rhel} && 0%{?rhel} <= 9 +%if 0%{?rhel} && 0%{?rhel} <= 8 %autosetup -p1 -n %{name}-%{version} %else %goprep -k @@ -104,22 +113,16 @@ sed -i 's/\/local//' contrib/systemd/%{service_name}.service sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service %build -%global __golang_extldflags -Wl,-z,undefs - export GO111MODULE=on export GOFLAGS=-mod=vendor -export BUILDTAGS="containers_image_ostree_stub -$(hack/btrfs_installed_tag.sh) -$(hack/btrfs_tag.sh) $(hack/openpgp_tag.sh) -$(hack/seccomp_tag.sh) $(hack/selinux_tag.sh) -$(hack/libsubid_tag.sh) exclude_graphdriver_devicemapper" +export BUILDTAGS="$(hack/btrfs_installed_tag.sh) +$(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) +$(hack/libdm_no_deferred_remove_tag.sh) +$(hack/seccomp_tag.sh) +$(hack/selinux_tag.sh)" -%if 0%{?rhel} && 0%{?rhel} <= 8 -BUILDTAGS="$BUILDTAGS containers_image_openpgp" -%endif - -export BASE_LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path} +export LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path} -X %{goipath}/internal/version.buildDate=%{build_timestamp} -X %{goipath}/internal/version.gitCommit=%{commit0} -X %{goipath}/internal/version.version=%{version} @@ -152,8 +155,8 @@ install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir} # install conf files install -dp %{buildroot}%{_sysconfdir}/cni/net.d -install -p -m 644 contrib/cni/10-crio-bridge.conflist %{buildroot}%{_sysconfdir}/cni/net.d/100-crio-bridge.conflist -install -p -m 644 contrib/cni/99-loopback.conflist %{buildroot}%{_sysconfdir}/cni/net.d/200-loopback.conflist +install -p -m 644 contrib/cni/10-crio-bridge.conf %{buildroot}%{_sysconfdir}/cni/net.d/100-crio-bridge.conf +install -p -m 644 contrib/cni/99-loopback.conf %{buildroot}%{_sysconfdir}/cni/net.d/200-loopback.conf install -dp %{buildroot}%{_sysconfdir}/%{service_name} install -dp %{buildroot}%{_datadir}/containers/oci/hooks.d @@ -163,6 +166,12 @@ install -p -m 644 crio.conf %{buildroot}%{_sysconfdir}/%{service_name} install -p -m 644 crio-umount.conf %{buildroot}%{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf install -p -m 644 crictl.yaml %{buildroot}%{_sysconfdir} +install -dp %{buildroot}%{_sysconfdir}/sysconfig +install -p -m 644 contrib/sysconfig/%{service_name} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name} +install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-network +install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-storage +install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-metrics + %make_install PREFIX=%{buildroot}%{_prefix} \ install.bin \ install.completions \ @@ -194,20 +203,27 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %systemd_postun_with_restart %{service_name} %files -%license LICENSE vendor/modules.txt +%license LICENSE %doc docs code-of-conduct.md tutorial.md ADOPTERS.md CONTRIBUTING.md README.md %doc awesome.md transfer.md %{_bindir}/%{service_name} +%{_bindir}/%{service_name}-status %{_bindir}/pinns %{_mandir}/man5/%{service_name}.conf*5* %{_mandir}/man8/%{service_name}*.8* %dir %{_sysconfdir}/%{service_name} %config(noreplace) %{_sysconfdir}/%{service_name}/%{service_name}.conf -%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conflist -%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conflist +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name} +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-storage +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-network +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-metrics +%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conf +%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf %config(noreplace) %{_sysconfdir}/crictl.yaml %dir %{_libexecdir}/%{service_name} %{_unitdir}/%{service_name}.service +%{_unitdir}/%{name}.service +%{_unitdir}/%{service_name}-shutdown.service %{_unitdir}/%{service_name}-wipe.service %dir %{_sharedstatedir}/containers %dir %{_datadir}/containers @@ -224,127 +240,23 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog -* Fri Oct 10 2025 Alejandro Sáez - 0:1.32.0-5 -- rebuild +* Thu Mar 24 2022 Peter Hunt - 0:1.21.6-2 +- drop check section -* Fri Aug 15 2025 Maxwell G - 0:1.32.0-4 -- Rebuild for golang-1.25.0 +* Tue Mar 15 2022 Peter Hunt - 0:1.21.6-1 +- bump to v1.21.6 -* Wed Jul 23 2025 Fedora Release Engineering - 0:1.32.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild +* Thu Mar 10 2022 Peter Hunt - 0:1.21.5-1 +- bump to v1.21.5 -* Thu Jan 16 2025 Fedora Release Engineering - 0:1.32.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Dec 23 2024 Bradley G Smith - 0:1.32.0-1 -- Bump to v1.32.0 -- Add -Wl,-z,undefs linker flags to resolve https://github.com/cri-o/cri-o/issues/8860 -- Update BUILDTAGS to conform to upstream - -* Thu Oct 24 2024 Dennis Gilmore - 0:1.31.1-1 -- update to 1.31.1 - -* Wed Jul 24 2024 Miroslav Suchý - 0:1.29.4-3 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 0:1.29.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Apr 30 2024 Bradley G Smith - 0:1.29.4-1 -- Bump to v1.29.4 -- Resolves CVE-2024-3154, a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime. - -* Sat Apr 27 2024 Bradley G Smith - 0:1.29.3-1 -- Bump to v1.29.3 -- Add support for autogenerated bundled provides -- Remove otelttrpc patch added in v1.29.2 to fix rpm build error. No longer needed. - -* Thu Mar 21 2024 Peter Hunt - 0:1.29.2-1 -- bump to v1.29.2 - -* Sun Feb 11 2024 Maxwell G - 0:1.28.2-5 -- Rebuild for golang 1.22.0 - -* Sun Feb 11 2024 Maxwell G - 0:1.28.2-4 -- Rebuild for golang 1.22.0 - -* Wed Jan 24 2024 Fedora Release Engineering - 0:1.28.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 0:1.28.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 04 2023 Christian Glombek - 0:1.28.2-1 -- bump to v1.28.2 - -* Thu Aug 24 2023 Peter Hunt - 0:1.28.0-1 -- bump to v1.28.0 - -* Thu Jul 20 2023 T K Chandra Hasan - 0:1.27.1-1 -- bump to v1.27.1 - -* Wed Jul 19 2023 Fedora Release Engineering - 0:1.27.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Apr 25 2023 Peter Hunt - 0:1.27.0-1 -- bump to v1.27.0 - -* Wed Jan 25 2023 Peter Hunt~ - 0:1.26.1-2 -- update for obs - -* Tue Jan 10 2023 Peter Hunt~ - 0:1.26.1-1 -- bump to v1.26.1 - -* Fri Dec 23 2022 Peter Hunt~ - 0:1.26.0-1 -- bump to v1.26.0 - -* Fri Oct 07 2022 Peter Hunt~ - 0:1.25.1-1 -- bump to v1.25.1 - -* Mon Aug 29 2022 Peter Hunt~ - 0:1.25.0-1 -- bump to v1.25.0 - -* Mon Aug 29 2022 Peter Hunt~ - 0:1.25.0-1 -- bump to v1.25.0 - -* Tue Aug 09 2022 Peter Hunt~ - 0:1.24.2-1 -- bump to v1.24.2 - -* Mon Jun 06 2022 Peter Hunt - 0:1.24.1-1 -- bump to v1.24.1 - -* Wed May 11 2022 Peter Hunt - 0:1.24.0-1 -- bump to v1.24.0 - -* Tue Mar 15 2022 Peter Hunt - 0:1.23.2-1 -- bump to v1.23.2 - -* Tue Mar 15 2022 Peter Hunt - 0:1.23.2-1 -- bump to v1.23.2 - -* Fri Feb 11 2022 Peter Hunt - 0:1.23.1-1 -- bump to v1.23.1 - -* Fri Feb 11 2022 Peter Hunt - 0:1.23.1-1 -- bump to v1.23.1 - -* Fri Dec 17 2021 Peter Hunt - 0:1.23.0-1 -- bump to v1.23.0 - -* Fri Dec 03 2021 Peter Hunt - 0:1.22.1-2 +* Mon Dec 06 2021 Peter Hunt - 0:1.21.4-2 - fix bogus date -* Thu Nov 11 2021 Peter Hunt - 0:1.22.1-1 -- bump to v1.22.1 +* Thu Nov 11 2021 Peter Hunt - 0:1.21.4-1 +- bump to v1.21.4 -* Mon Nov 08 2021 Peter Hunt - 0:1.22.0-4 -- update golang version - -* Mon Sep 13 2021 Peter Hunt - 0:1.22.0-3 -- fix spec - -* Wed Aug 25 2021 Peter Hunt - 0:1.22.0-2 -- bump to v1.22.0 +* Wed Sep 15 2021 Peter Hunt - 0:1.21.3-1 +- bump to v1.21.3 * Tue Jul 20 2021 Peter Hunt - 0:1.21.2-1 - bump to v1.21.2 @@ -665,7 +577,7 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf - Configurable image volume support - Bugs and Stability fixes - OCI 1.0 runtime support -- Dropped internal runc, and now use systems runc +- Dropped internal runc, and now use systems runc * Fri Jun 30 2017 Lokesh Mandvekar - 1.0.0.alpha.0-1.git91977d3 - built commit 91977d3 diff --git a/crio-metrics.sysconfig b/crio-metrics.sysconfig new file mode 100644 index 0000000..3b20226 --- /dev/null +++ b/crio-metrics.sysconfig @@ -0,0 +1,2 @@ +# /etc/sysconfig/crio-metrics +CRIO_METRICS_OPTIONS= diff --git a/crio-network.sysconfig b/crio-network.sysconfig new file mode 100644 index 0000000..75fe035 --- /dev/null +++ b/crio-network.sysconfig @@ -0,0 +1,2 @@ +# /etc/sysconfig/crio-network +CRIO_NETWORK_OPTIONS= diff --git a/crio-storage.sysconfig b/crio-storage.sysconfig new file mode 100644 index 0000000..fbc68c5 --- /dev/null +++ b/crio-storage.sysconfig @@ -0,0 +1,2 @@ +# /etc/sysconfig/crio-storage +CRIO_STORAGE_OPTIONS= diff --git a/sources b/sources index 9249c0d..7bcf6ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96 +SHA512 (cri-o-1.21.6.tar.gz) = 3ad23983d4822f19a0f227968d2b80648c725f6f18bec3467e426af2966b3e1e16b720b86fff8339c8c1503f78019779558e38ee4b325ec2eb52cfb639ac4fdc