Hello community, here is the log from the commit of package patterns-caasp for openSUSE:Factory checked in at 2018-09-05 13:46:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/patterns-caasp (Old) and /work/SRC/openSUSE:Factory/.patterns-caasp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "patterns-caasp" Wed Sep 5 13:46:47 2018 rev:46 rq:633295 version:4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/patterns-caasp/patterns-caasp.changes 2018-08-15 10:35:28.783972871 +0200 +++ /work/SRC/openSUSE:Factory/.patterns-caasp.new/patterns-caasp.changes 2018-09-05 13:46:49.686083798 +0200 @@ -1,0 +2,29 @@ +Wed Sep 5 09:41:31 UTC 2018 - Richard Brown <[email protected]> + +- Move kernel-default-base to alt-onlyDVD pattern + +------------------------------------------------------------------- +Wed Sep 5 08:52:51 UTC 2018 - [email protected] + +- Add alt-onlyDVD pattern and move docker-kubic-kubeadm-criconfig + so both criconfig packages can be available on the media + +------------------------------------------------------------------- +Fri Aug 31 11:00:49 CEST 2018 - [email protected] + +- Add kernel-default-base to DVD, so that we can make small + virtual installations from it. + +------------------------------------------------------------------- +Fri Aug 17 08:59:13 UTC 2018 - [email protected] + +- Remove suse-build-key from Kubic, add openSUSE-build-key + +------------------------------------------------------------------- +Tue Aug 14 16:38:53 UTC 2018 - [email protected] + +- Make crio default, docker as alternative runtime (boo#1104821) +- Configure kubernetes CRI runtime with $runtime-kubeadm-criconfig + packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-caasp.spec ++++++ --- /var/tmp/diff_new_pack.JBMPjx/_old 2018-09-05 13:46:50.338084891 +0200 +++ /var/tmp/diff_new_pack.JBMPjx/_new 2018-09-05 13:46:50.342084898 +0200 @@ -97,7 +97,6 @@ Requires: shadow Requires: snapper Requires: supportutils -Requires: suse-build-key Requires: sysconfig Requires: sysfsutils Requires: systemd @@ -119,8 +118,10 @@ %endif %if 0%{?is_susecaasp} Requires: caasp-release +Requires: suse-build-key %else Requires: openSUSE-Tumbleweed-Kubic-release +Requires: openSUSE-build-key %endif %ifnarch s390x %if 0%{?is_susecaasp} @@ -168,16 +169,15 @@ Provides: pattern-visible() Requires: autofs Requires: ceph-common -Requires: cri-o +Requires: cri-runtime Requires: cri-tools Requires: kubernetes-client Requires: kubernetes-kubeadm +Requires: kubernetes-kubeadm-criconfig Requires: kubernetes-kubelet -Requires: kubernetes-salt Requires: lvm2 Requires: multipath-tools Requires: nfs-client -Requires: podman Requires: rpcbind Requires: pattern() = basesystem @@ -204,7 +204,8 @@ Summary: Container Runtime Group: Metapackages Provides: pattern-category() = %{pattern_category} -Requires: docker-kubic +Requires: cri-o +Requires: podman Provides: pattern() = SUSE%2dMicroOS%2dcontainer%2druntime Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 9040 @@ -213,6 +214,19 @@ %description container-runtime This pattern installs the default container runtime packages. +%package alt-container-runtime +Summary: Alternative Container Runtime +Group: Metapackages +Provides: pattern-category() = %{pattern_category} +Requires: docker-kubic +Provides: pattern() = SUSE%2dMicroOS%2dalt%2dcontainer%2druntime +Provides: pattern-icon() = pattern-generic +Provides: pattern-order() = 9045 +Provides: pattern-visible() + +%description alt-container-runtime +This pattern installs the alternative container runtime packages. + %package apparmor Summary: Apparmor Support Group: Metapackages @@ -264,6 +278,7 @@ Group: Metapackages Provides: pattern-category() = %{pattern_category} Requires: cracklib-dict-full +Requires: cri-o-kubeadm-criconfig Requires: glibc-locale Requires: iscsiuio %ifarch %ix86 x86_64 @@ -278,6 +293,7 @@ Provides: pattern() = SUSE%2dCaaSP%2donlyDVD Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 9900 +Requires: pattern() = SUSE%2dMicroOS%2dalt%2dcontainer%2druntime Requires: pattern() = SUSE%2dMicroOS%2dapparmor Requires: pattern() = SUSE%2dMicroOS%2dcontainer%2druntime Requires: pattern() = SUSE%2dMicroOS%2dhardware @@ -287,6 +303,25 @@ %description onlyDVD Additonal packages on a openSUSE Kubic DVD. +%package alt-onlyDVD +Summary: Alternative Packages only for the DVD of %{product_name} +Group: Metapackages +Provides: pattern-category() = %{pattern_category} +Requires: docker-kubic-kubeadm-criconfig +Requires: kernel-default-base +Provides: pattern() = SUSE%2dCaaSP%2dalt%2donlyDVD +Provides: pattern-icon() = pattern-generic +Provides: pattern-order() = 9901 +Requires: pattern() = SUSE%2dMicroOS%2dalt%2dcontainer%2druntime +Requires: pattern() = SUSE%2dMicroOS%2dapparmor +Requires: pattern() = SUSE%2dMicroOS%2dcontainer%2druntime +Requires: pattern() = SUSE%2dMicroOS%2dima_evm +Requires: pattern() = SUSE%2dMicroOS%2dsssd_ldap + +%description alt-onlyDVD +Alternative additonal packages on a openSUSE Kubic DVD. + + %prep # empty on purpose @@ -302,8 +337,10 @@ echo 'This file marks the pattern apparmor to be installed.' >%buildroot/usr/share/doc/packages/patterns-caasp/apparmor.txt echo 'This file marks the pattern sssd-ldap to be installed.' >%buildroot/usr/share/doc/packages/patterns-caasp/sssd-ldap.txt echo 'This file marks the pattern container-runtime to be installed.' >%buildroot/usr/share/doc/packages/patterns-caasp/container-runtime.txt +echo 'This file marks the pattern alt-container-runtime to be installed.' >%buildroot/usr/share/doc/packages/patterns-caasp/alt-container-runtime.txt %if !0%{?is_susecaasp} echo 'This file marks the pattern onlyDVD to be installed.' >%buildroot/usr/share/doc/packages/patterns-caasp/onlyDVD.txt +echo 'This file marks the pattern alt-onlyDVD to be installed.' >%buildroot/usr/share/doc/packages/patterns-caasp/alt-onlyDVD.txt %endif %files MicroOS @@ -326,6 +363,11 @@ %dir %{_docdir}/patterns-caasp %{_docdir}/patterns-caasp/container-runtime.txt +%files alt-container-runtime +%defattr(-,root,root) +%dir %{_docdir}/patterns-caasp +%{_docdir}/patterns-caasp/alt-container-runtime.txt + %files sssd-ldap %defattr(-,root,root) %dir %{_docdir}/patterns-caasp @@ -346,6 +388,11 @@ %defattr(-,root,root) %dir %{_docdir}/patterns-caasp %{_docdir}/patterns-caasp/onlyDVD.txt + +%files alt-onlyDVD +%defattr(-,root,root) +%dir %{_docdir}/patterns-caasp +%{_docdir}/patterns-caasp/alt-onlyDVD.txt %endif %changelog
