Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cri-o for openSUSE:Factory checked in at 2021-04-15 16:57:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cri-o (Old) and /work/SRC/openSUSE:Factory/.cri-o.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cri-o" Thu Apr 15 16:57:05 2021 rev:58 rq:884638 version:1.20.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes 2021-01-11 17:13:37.832373698 +0100 +++ /work/SRC/openSUSE:Factory/.cri-o.new.12324/cri-o.changes 2021-04-15 16:57:19.222665096 +0200 @@ -1,0 +2,16 @@ +Fri Apr 09 21:10:01 UTC 2021 - alexandre.vice...@suse.com + +- Update to version 1.20.2: + * bump to latest c/storage 1.24 branch + * Remove check for CI env variable for release-notes and dependencies + * fix lint + * test: pin cri-tools to 1.20 + * bump to v1.20.2 + * Run GitHub actions on release branches + * Pin gocapability to v0.0.0-20180916011248-d98352740cb2 + * [PATCH 9/9] add method comment + * [PATCH 8/9] restore irqbalance config only on system restart +- Add vendor.tar.gz to avoid dependency downloads +- Add config-fix-tz.patch to fix crio validation error while building + +------------------------------------------------------------------- Old: ---- cri-o-1.19.1.tar.xz New: ---- config-fix-tz.patch cri-o-1.20.2.tar.gz vendor.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cri-o.spec ++++++ --- /var/tmp/diff_new_pack.RLgoYj/_old 2021-04-15 16:57:20.254666729 +0200 +++ /var/tmp/diff_new_pack.RLgoYj/_new 2021-04-15 16:57:20.258666735 +0200 @@ -24,18 +24,23 @@ %define project github.com/cri-o/cri-o # Define macros for further referenced sources Name: cri-o -Version: 1.19.1 +Version: 1.20.2 Release: 0 Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: Apache-2.0 Url: https://github.com/cri-o/cri-o ExcludeArch: i586 -Source0: %{name}-%{version}.tar.xz -Source1: crio.service -Source2: sysconfig.crio -Source3: crio.conf -Source4: cri-o-rpmlintrc -Source5: kubelet.env +Source0: %{name}-%{version}.tar.gz +Source1: vendor.tar.gz +Source2: crio.service +Source3: sysconfig.crio +Source4: crio.conf +Source5: cri-o-rpmlintrc +Source6: kubelet.env +# See https://github.com/containers/common/commit/27a6951e3644d9031a79819abb1bcb2bba8486ca +# OBS has no zoneinfo, until the above patch comes to cri-o +# we need to keep this one otherwise crio build fails. +Patch1: config-fix-tz.patch BuildRequires: device-mapper-devel BuildRequires: fdupes BuildRequires: glib2-devel-static @@ -81,14 +86,15 @@ This package provides the CRI-O container runtime configuration for kubeadm %prep -%setup -q +%setup -qa1 +%patch1 -p1 %build # Keep cgroupfs as the default cgroup manager for SLE15 builds %if 0%{?sle_version} >= 150000 && !0%{?is_opensuse} -sed -i "s|.*apparmor_profile =.*|apparmor_profile = \"crio-default-%{version}\"|" %{SOURCE3} -sed -i "s|^cgroup_manager = \"systemd\"$|cgroup_manager = \"cgroupfs\"|g" %{SOURCE3} -sed -i "s|--cgroup-driver=systemd|--cgroup-driver=cgroupfs|g" %{SOURCE5} +sed -i "s|.*apparmor_profile =.*|apparmor_profile = \"crio-default-%{version}\"|" %{SOURCE4} +sed -i "s|^cgroup_manager = \"systemd\"$|cgroup_manager = \"cgroupfs\"|g" %{SOURCE4} +sed -i "s|--cgroup-driver=systemd|--cgroup-driver=cgroupfs|g" %{SOURCE6} %endif # We can't use symlinks here because go-list gets confused by symlinks, so we @@ -100,7 +106,7 @@ cd $HOME/go/src/%{project} # Build crio -make +GO_BUILD="go build -mod vendor" make %pre %service_add_pre crio.service @@ -141,14 +147,14 @@ install -m 0644 docs/crio.conf.5 %{buildroot}/%{_mandir}/man5 install -m 0644 docs/crio.8 %{buildroot}/%{_mandir}/man8 # Configs -sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE3} -install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/crio/crio.conf.d/00-default.conf +sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE4} +install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/crio/crio.conf.d/00-default.conf install -D -m 0644 crio-umount.conf %{buildroot}/%{_datadir}/oci-umount/oci-umount.d/cri-umount.conf -install -D -m 0644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.crio +install -D -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.crio # Systemd -install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/crio.service +install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/crio.service # place kubelet.env in fillupdir -install -D -m 0644 %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.kubelet +install -D -m 0644 %{SOURCE6} %{buildroot}%{_fillupdir}/sysconfig.kubelet # Symlinks to rc files install -d -m 0755 %{buildroot}%{_sbindir} ln -sf service %{buildroot}%{_sbindir}/rccrio ++++++ _service ++++++ --- /var/tmp/diff_new_pack.RLgoYj/_old 2021-04-15 16:57:20.290666786 +0200 +++ /var/tmp/diff_new_pack.RLgoYj/_new 2021-04-15 16:57:20.294666792 +0200 @@ -1,16 +1,18 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">https://github.com/cri-o/cri-o</param> + <param name="url">https://github.com/cri-o/cri-o.git</param> <param name="scm">git</param> - <param name="versionformat">1.19.1</param> - <param name="revision">v1.19.1</param> + <param name="revision">v1.20.2</param> + <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> + <param name="versionrewrite-pattern">v(.*)</param> + </service> + <service mode="disabled" name="set_version"> </service> <service name="recompress" mode="disabled"> - <param name="file">cri-o-*.tar</param> - <param name="compression">xz</param> + <param name="file">*.tar</param> + <param name="compression">gz</param> </service> - <service name="set_version" mode="disabled"> - <param name="basename">cri-o</param> + <service name="go_modules" mode="disabled"> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.RLgoYj/_old 2021-04-15 16:57:20.310666817 +0200 +++ /var/tmp/diff_new_pack.RLgoYj/_new 2021-04-15 16:57:20.314666824 +0200 @@ -1,4 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/cri-o/cri-o</param> - <param name="changesrevision">4e159cc8db813fb38e7429ba39ad2cf73b174446</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">4e159cc8db813fb38e7429ba39ad2cf73b174446</param></service><service name="tar_scm"> + <param name="url">https://github.com/cri-o/cri-o.git</param> + <param name="changesrevision">d3ddab5440ec6ac2668cbbfe8b6db328f17bfd91</param></service></servicedata> \ No newline at end of file ++++++ config-fix-tz.patch ++++++ diff --git a/vendor/github.com/containers/common/pkg/config/config_local.go b/vendor/github.com/containers/common/pkg/config/config_local.go index 8a27c9626..21dab043f 100644 --- a/vendor/github.com/containers/common/pkg/config/config_local.go +++ b/vendor/github.com/containers/common/pkg/config/config_local.go @@ -79,7 +79,7 @@ func (c *ContainersConfig) validateUlimits() error { } func (c *ContainersConfig) validateTZ() error { - if c.TZ == "local" { + if c.TZ == "local" || c.TZ == "" { return nil }
