Hello community, here is the log from the commit of package katacontainers for openSUSE:Factory checked in at 2019-09-05 12:46:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/katacontainers (Old) and /work/SRC/openSUSE:Factory/.katacontainers.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "katacontainers" Thu Sep 5 12:46:29 2019 rev:5 rq:728320 version:1.9.0~alpha0 Changes: -------- --- /work/SRC/openSUSE:Factory/katacontainers/katacontainers.changes 2019-08-28 18:35:34.085282808 +0200 +++ /work/SRC/openSUSE:Factory/.katacontainers.new.7948/katacontainers.changes 2019-09-05 12:46:34.987463498 +0200 @@ -1,0 +2,6 @@ +Wed Sep 4 14:40:50 UTC 2019 - Marco Vedovati <[email protected]> + +- Add config file in /etc/kata-containers +- Build with golang >= 1.12 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ katacontainers.spec ++++++ --- /var/tmp/diff_new_pack.4qNLf3/_old 2019-09-05 12:46:36.471463755 +0200 +++ /var/tmp/diff_new_pack.4qNLf3/_new 2019-09-05 12:46:36.471463755 +0200 @@ -34,10 +34,11 @@ %endif %endif -%define configACRN %{_datarootdir}/defaults/kata-containers/configuration-acrn.toml -%define configFC %{_datarootdir}/defaults/kata-containers/configuration-fc.toml -%define configNEMU %{_datarootdir}/defaults/kata-containers/configuration-nemu.toml -%define configQEMU %{_datarootdir}/defaults/kata-containers/configuration-qemu.toml +%define configPath %{_datarootdir}/defaults/kata-containers/ +%define configACRN configuration-acrn.toml +%define configFC configuration-fc.toml +%define configNEMU configuration-nemu.toml +%define configQEMU configuration-qemu.toml %ifarch x86_64 # Note: braces used for bash brace expansion %define defaultConfigFiles \{%{configACRN},%{configFC},%{configNEMU},%{configQEMU}\} @@ -48,7 +49,7 @@ Name: katacontainers Version: 1.9.0~alpha0 Release: <CI_CNT>.<B_CNT> -Summary: Kata Containers core components +Summary: Kata Containers OCI container runtime License: Apache-2.0 Group: System/Management Url: https://github.com/kata-containers @@ -59,12 +60,9 @@ Source4: kata-fc Source5: kata-qemu Source6: katacontainers.rpmlintrc +ExclusiveArch: x86_64 aarch64 ppc64le s390x BuildRequires: fdupes -%if 0%{?suse_version} -BuildRequires: golang(API) = 1.11 -%else -BuildRequires: go = 1.11 -%endif +BuildRequires: golang(API) >= 1.12 Requires: katacontainers-image-initrd = %{version} # Requires: are also required for build, to correctly detect the kernel # version to use @@ -131,13 +129,19 @@ QEMUCMD=%{QEMUCMD} \ install -# Using initrd, so delete the image entries where both image and initrd is specified -for f in %{buildroot}/%{defaultConfigFiles}; do +# Only initrd is supported: delete the "image =" entries only in files where +# both "image =" and "initrd =" is specified +for f in %{buildroot}%{configPath}/%{defaultConfigFiles}; do grep -q "^image =" "$f" && grep -q "^initrd = " "$f" && sed -i -E -e '/^image =/d' $f done -# Properly set libexec path -sed -i -E -e 's,/usr/libexec,%{_libexecdir},' %{buildroot}/%{defaultConfigFiles} +# Replace /usr/libexec path with /usr/lib +sed -i -E \ + -e "s,/usr/libexec,%{_libexecdir}," \ + -e "s,^kernel =.*$,kernel = \"%{_datarootdir}/kata-containers/vmlinuz\"," \ + %{buildroot}%{configPath}/%{defaultConfigFiles} + +install -m 644 -D %{buildroot}%{configPath}/configuration.toml %{buildroot}%{_sysconfdir}/kata-containers/configuration.toml cd $HOME/go/src/%{kata_project}/proxy make \ @@ -188,7 +192,6 @@ %post %service_add_post kata-ksm-throttler.service %service_add_post kata-vc-throttler.service -sed -i -E -e "s,^kernel =.*$,kernel = \"%{_datarootdir}/kata-containers/vmlinuz\"," %{defaultConfigFiles} %preun %service_del_preun kata-ksm-throttler.service @@ -210,16 +213,14 @@ %{_libexecdir}/kata-containers/kata-netmon %{_bindir}/kata-collect-data.sh # Manpages +# Configs +%dir %{_sysconfdir}/kata-containers +%config(noreplace) %{_sysconfdir}/kata-containers/configuration.toml # Default configs %dir %{_datarootdir}/defaults %dir %{_datarootdir}/defaults/kata-containers -%doc %{_datarootdir}/defaults/kata-containers/configuration-qemu.toml -%ifarch x86_64 -%doc %{_datarootdir}/defaults/kata-containers/configuration-acrn.toml -%doc %{_datarootdir}/defaults/kata-containers/configuration-fc.toml -%doc %{_datarootdir}/defaults/kata-containers/configuration-nemu.toml -%endif -%doc %{_datarootdir}/defaults/kata-containers/configuration.toml +%config %{_datarootdir}/defaults/kata-containers/configuration.toml +%config %{_datarootdir}/defaults/kata-containers/configuration-*.toml # Completion %{_datarootdir}/bash-completion/completions/kata-runtime ++++++ katacontainers.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.4qNLf3/_old 2019-09-05 12:46:36.515463763 +0200 +++ /var/tmp/diff_new_pack.4qNLf3/_new 2019-09-05 12:46:36.515463763 +0200 @@ -1,3 +1,4 @@ #non-executable-script: #! comes from upstream addFilter (".* W: non-executable-script /usr/share/bash-completion/completions/kata-runtime") addFilter ("^katacontainers.*: W: no-version-in-last-changelog") +addFilter ("^katacontainers.*: W: non-etc-or-var-file-marked-as-conffile /usr/share/defaults/kata-containers/configuration.*")
