Hello community, here is the log from the commit of package cri-o for openSUSE:Factory checked in at 2018-08-15 10:38:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cri-o (Old) and /work/SRC/openSUSE:Factory/.cri-o.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cri-o" Wed Aug 15 10:38:23 2018 rev:16 rq:629197 version:1.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes 2018-07-10 16:17:58.257300211 +0200 +++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-08-15 10:38:24.912293926 +0200 @@ -1,0 +2,19 @@ +Tue Aug 14 09:03:49 UTC 2018 - [email protected] + +- Use btrfs storage driver to be consistant with other supported + runtimes + +------------------------------------------------------------------- +Thu Aug 2 08:52:41 UTC 2018 - [email protected] + +- Do not provide `/etc/crictl.yaml` anymore. Although being shipped by + upstream this package belongs into the `cri-tools` package. + bsc#1104598 + +- add Fix-AppArmor-build.patch to temporarily fix apparmor builds + +- Update cri-o to v1.11.1: + * server: Don't make additional copy of config.json + * cri-tools: Use release-1.11 branch + +------------------------------------------------------------------- Old: ---- cri-o-1.10.6.tar.xz New: ---- Fix-AppArmor-build.patch cri-o-1.11.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cri-o.spec ++++++ --- /var/tmp/diff_new_pack.f2varG/_old 2018-08-15 10:38:25.696295356 +0200 +++ /var/tmp/diff_new_pack.f2varG/_new 2018-08-15 10:38:25.696295356 +0200 @@ -31,7 +31,7 @@ %define name_source2 sysconfig.crio %define name_source3 crio.conf Name: cri-o -Version: 1.10.6 +Version: 1.11.1 Release: 0 Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: Apache-2.0 @@ -42,6 +42,8 @@ Source2: %{name_source2} Source3: %{name_source3} Source4: cri-o-rpmlintrc +# Upstream PR: https://github.com/kubernetes-incubator/cri-o/pull/1718 +Patch0: Fix-AppArmor-build.patch BuildRequires: device-mapper-devel BuildRequires: fdupes BuildRequires: git-core @@ -78,6 +80,7 @@ %prep %setup -q +%patch0 -p1 %build # We can't use symlinks here because go-list gets confused by symlinks, so we @@ -101,10 +104,10 @@ %{project}/cmd/crio # Build conmon -make conmon +make bin/conmon # Build pause -make pause +make bin/pause # Build manpages make %{?_smp_mflags} docs @@ -151,7 +154,6 @@ install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/crio/%{name_source3} install -D -m 0644 seccomp.json %{buildroot}/%{_sysconfdir}/crio/seccomp.json install -D -m 0644 crio-umount.conf %{buildroot}/%{_datadir}/oci-umount/oci-umount.d/cri-umount.conf -install -D -m 0644 crictl.yaml %{buildroot}/%{_sysconfdir}/crictl.yaml install -D -m 0644 %{SOURCE2} %{buildroot}%{_fillupdir}/%{name_source2} # Systemd install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name_source1} @@ -180,7 +182,6 @@ %dir %{_datadir}/oci-umount %dir %{_datadir}/oci-umount/oci-umount.d %{_datadir}/oci-umount/oci-umount.d/cri-umount.conf -%config(noreplace) %{_sysconfdir}/crictl.yaml %{_fillupdir}/%{name_source2} # Systemd %{_unitdir}/%{name_source1} ++++++ Fix-AppArmor-build.patch ++++++ >From eb1a05f57dd01771862884de9ee737b98fe26e44 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg <[email protected]> Date: Thu, 2 Aug 2018 11:38:34 +0200 Subject: [PATCH] Fix AppArmor build Signed-off-by: Valentin Rothberg <[email protected]> --- pkg/apparmor/apparmor_supported.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/apparmor/apparmor_supported.go b/pkg/apparmor/apparmor_supported.go index 49360470de31..be29ed024d99 100644 --- a/pkg/apparmor/apparmor_supported.go +++ b/pkg/apparmor/apparmor_supported.go @@ -10,8 +10,8 @@ import ( "os" "path" "strings" + "text/template" - "github.com/docker/docker/pkg/templates" "github.com/opencontainers/runc/libcontainer/apparmor" ) @@ -108,7 +108,7 @@ func IsLoaded(name string) (bool, error) { // generateDefault creates an apparmor profile from ProfileData. func (p *profileData) generateDefault(out io.Writer) error { - compiled, err := templates.NewParse("apparmor_profile", baseTemplate) + compiled, err := template.New("apparmor_profile").Parse(baseTemplate) if err != nil { return err } -- 2.16.4 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.f2varG/_old 2018-08-15 10:38:25.732295422 +0200 +++ /var/tmp/diff_new_pack.f2varG/_new 2018-08-15 10:38:25.732295422 +0200 @@ -2,8 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/kubernetes-incubator/cri-o</param> <param name="scm">git</param> -<param name="versionformat">1.10.6</param> -<param name="revision">v1.10.6</param> +<param name="versionformat">1.11.1</param> +<param name="revision">v1.11.1</param> </service> <service name="recompress" mode="disabled"> <param name="file">cri-o-*.tar</param> ++++++ cri-o-1.10.6.tar.xz -> cri-o-1.11.1.tar.xz ++++++ ++++ 100137 lines of diff (skipped) ++++++ crio.conf ++++++ --- /var/tmp/diff_new_pack.f2varG/_old 2018-08-15 10:38:27.376298419 +0200 +++ /var/tmp/diff_new_pack.f2varG/_new 2018-08-15 10:38:27.376298419 +0200 @@ -12,7 +12,7 @@ # storage_driver select which storage driver is used to manage storage # of images and containers. -storage_driver = "" +storage_driver = "btrfs" # storage_option is used to pass an option to the storage driver. storage_option = [
