commit skelcd-control-CAASP for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-control-CAASP for openSUSE:Factory checked in at 2019-02-04 16:09:50 Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new.28833 (New) Package is "skelcd-control-CAASP" Mon Feb 4 16:09:50 2019 rev:14 rq:670324 version:15.5 Changes: --- /work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes 2018-11-10 16:49:09.952509279 +0100 +++ /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new.28833/skelcd-control-CAASP.changes 2019-02-04 16:09:51.989993442 +0100 @@ -1,0 +2,6 @@ +Thu Jan 31 10:16:01 UTC 2019 - jlo...@suse.com + +- Force btrfs filesystem in Guided Setup (needed for bsc#1099485). +- 15.5 + +--- Old: skelcd-control-CAASP-15.4.tar.bz2 New: skelcd-control-CAASP-15.5.tar.bz2 Other differences: -- ++ skelcd-control-CAASP.spec ++ --- /var/tmp/diff_new_pack.NibSTc/_old 2019-02-04 16:09:52.449993155 +0100 +++ /var/tmp/diff_new_pack.NibSTc/_new 2019-02-04 16:09:52.449993155 +0100 @@ -1,7 +1,7 @@ # # spec file for package skelcd-control-CAASP # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -102,7 +102,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.4 +Version:15.5 Release:0 Summary:The CaaSP control file needed for installation License:MIT ++ skelcd-control-CAASP-15.4.tar.bz2 -> skelcd-control-CAASP-15.5.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.4/control/control.CAASP.xml new/skelcd-control-CAASP-15.5/control/control.CAASP.xml --- old/skelcd-control-CAASP-15.4/control/control.CAASP.xml 2018-11-07 12:52:53.0 +0100 +++ new/skelcd-control-CAASP-15.5/control/control.CAASP.xml 2019-01-31 12:22:07.0 +0100 @@ -144,6 +144,8 @@ / btrfs + +btrfs 25 GiB 20 GiB 30 GiB @@ -216,6 +218,8 @@ /var/lib/docker btrfs + +btrfs false false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.4/package/skelcd-control-CAASP.changes new/skelcd-control-CAASP-15.5/package/skelcd-control-CAASP.changes --- old/skelcd-control-CAASP-15.4/package/skelcd-control-CAASP.changes 2018-11-07 12:52:53.0 +0100 +++ new/skelcd-control-CAASP-15.5/package/skelcd-control-CAASP.changes 2019-01-31 12:22:07.0 +0100 @@ -1,4 +1,10 @@ --- +Thu Jan 31 10:16:01 UTC 2019 - jlo...@suse.com + +- Force btrfs filesystem in Guided Setup (needed for bsc#1099485). +- 15.5 + +--- Tue Nov 6 13:45:16 UTC 2018 - lsle...@suse.cz - Display new role dialogs in the workflow (FATE#325834) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.4/package/skelcd-control-CAASP.spec new/skelcd-control-CAASP-15.5/package/skelcd-control-CAASP.spec --- old/skelcd-control-CAASP-15.4/package/skelcd-control-CAASP.spec 2018-11-07 12:52:53.0 +0100 +++ new/skelcd-control-CAASP-15.5/package/skelcd-control-CAASP.spec 2019-01-31 12:22:07.0 +0100 @@ -101,7 +101,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.4 +Version:15.5 Release:0 Summary:The CaaSP control file needed for installation License:MIT
commit skelcd-control-CAASP for openSUSE:Factory
Hello community,
here is the log from the commit of package skelcd-control-CAASP for
openSUSE:Factory checked in at 2018-11-10 16:48:57
Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New)
Package is "skelcd-control-CAASP"
Sat Nov 10 16:48:57 2018 rev:13 rq:646958 version:15.4
Changes:
---
/work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes
2018-11-01 18:55:03.037966245 +0100
+++
/work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes
2018-11-10 16:49:09.952509279 +0100
@@ -0,0 +1,9 @@
+---
+Tue Nov 6 13:45:16 UTC 2018 - lsle...@suse.cz
+
+- Display new role dialogs in the workflow (FATE#325834)
+- Clean up (removed the openSUSE Kubic parts, it has been moved to
+ to a separate package)
+- 15.4
+
+---
Old:
skelcd-control-CAASP-15.3.tar.bz2
New:
skelcd-control-CAASP-15.4.tar.bz2
Other differences:
--
++ skelcd-control-CAASP.spec ++
--- /var/tmp/diff_new_pack.71NVW3/_old 2018-11-10 16:49:12.236506384 +0100
+++ /var/tmp/diff_new_pack.71NVW3/_new 2018-11-10 16:49:12.236506384 +0100
@@ -33,29 +33,19 @@
# RNG validation schema
BuildRequires: yast2-installation-control >= 4.0.10
-%if 0%{?is_opensuse}
-# xsltproc - for building control.Kubic.xml from control.CAASP.xml
-BuildRequires: diffutils
-BuildRequires: libxslt-tools
-# we need to copy some parts from the openSUSE control.xml to Kubic
-BuildRequires: skelcd-control-openSUSE
-%endif
-
##
#
# Here is the list of Yast packages which are needed in the
# installation system (inst-sys) for the Yast installer
#
-# SLES specific Yast packages needed in the inst-sys
+# CaaSP specific Yast packages needed in the inst-sys
# to provide the functionality needed by this control file
+
+# new role dialogs
+Requires: yast2-caasp >= 4.0.6
Requires: yast2-registration
-%if 0%{?is_susecaasp}
Requires: yast2-theme-SLE
-%else
-Requires: yast2-branding-openSUSE
-Requires: yast2-qt-branding-openSUSE
-%endif
# Generic Yast packages needed for the installer
Requires: autoyast2
@@ -65,8 +55,8 @@
Requires: yast2-fcoe-client
# For creating the AutoYast profile at the end of installation (bnc#887406)
Requires: yast2-firewall
-# instsys_cleanup
-Requires: yast2-installation >= 3.1.217.9
+# fixed role selection
+Requires: yast2-installation >= 4.0.73
Requires: yast2-iscsi-client
Requires: yast2-kdump
Requires: yast2-multipath
@@ -112,7 +102,7 @@
Url:https://github.com/yast/skelcd-control-CAASP
AutoReqProv:off
-Version:15.3
+Version:15.4
Release:0
Summary:The CaaSP control file needed for installation
License:MIT
@@ -131,15 +121,6 @@
%setup -n %{name}-%{version}
-%if 0%{?is_opensuse}
-%build
-# build control.Kubic.xml from control.CAASP.xml
-make -C control control.Kubic.xml
-# display the changes (just for easier debugging)
-# don't fail, a difference is expected
-diff -u control/control.CAASP.xml control/control.Kubic.xml || :
-%endif
-
%check
#
# Verify syntax
@@ -151,13 +132,7 @@
# Add control file
#
mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
-%if 0%{?is_susecaasp}
install -m 644 control/control.CAASP.xml
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
-%else
-%if 0%{?is_opensuse}
-install -m 644 control/control.Kubic.xml
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
-%endif
-%endif
# install LICENSE (required by build service check)
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
@@ -165,14 +140,12 @@
%files
%defattr(644,root,root,755)
-%if 0%{?is_susecaasp}%{?is_opensuse}
%if %{defined skelcdpath}
%dir %{skelcdpath}
%endif
%dir %{?skelcdpath}/CD1
%{?skelcdpath}/CD1/control.xml
-%endif
%doc %dir %{_prefix}/share/doc/packages/%{name}
-%doc %{_prefix}/share/doc/packages/%{name}/LICENSE
+%license %{_prefix}/share/doc/packages/%{name}/LICENSE
%changelog
++ skelcd-control-CAASP-15.3.tar.bz2 -> skelcd-control-CAASP-15.4.tar.bz2
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.3/.travis.sh
new/skelcd-control-CAASP-15.4/.travis.sh
--- old/skelcd-control-CAASP-15.3/.travis.sh2018-10-16 11:01:45.0
+0200
+++ new/skelcd-control-CAASP-15.4/.travis.sh2018-11-07 12:52:53.0
+0100
@@ -1,26 +1,7 @@
#! /bin/bash
-# fold the Travis output to make it better readable
commit skelcd-control-CAASP for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-control-CAASP for openSUSE:Factory checked in at 2018-11-01 18:55:00 Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New) Package is "skelcd-control-CAASP" Thu Nov 1 18:55:00 2018 rev:12 rq:642234 version:15.3 Changes: --- /work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes 2018-07-13 10:17:14.222161491 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes 2018-11-01 18:55:03.037966245 +0100 @@ -0,0 +1,15 @@ +Thu Oct 11 14:43:55 UTC 2018 - jmassaguer...@suse.com + +- fix bsc#541: do not enable container-feeder since this does + not exist in caasp4. +- 15.3 + +--- +Thu Oct 11 08:35:10 UTC 2018 - jmassaguer...@suse.com + +- fix bsc#1110300 by running disc proposal before bootloader + Port of commit + https://github.com/yast/skelcd-control-Kubic/commit/3a28ac79d59b50200755990812cad560513522cd + to CaaSP4 +- 15.2 + Old: skelcd-control-CAASP-15.1.tar.bz2 New: skelcd-control-CAASP-15.3.tar.bz2 Other differences: -- ++ skelcd-control-CAASP.spec ++ --- /var/tmp/diff_new_pack.QumWb2/_old 2018-11-01 18:55:03.517966285 +0100 +++ /var/tmp/diff_new_pack.QumWb2/_new 2018-11-01 18:55:03.529966286 +0100 @@ -112,7 +112,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.1 +Version:15.3 Release:0 Summary:The CaaSP control file needed for installation License:MIT ++ skelcd-control-CAASP-15.1.tar.bz2 -> skelcd-control-CAASP-15.3.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.1/control/control.CAASP.xml new/skelcd-control-CAASP-15.3/control/control.CAASP.xml --- old/skelcd-control-CAASP-15.1/control/control.CAASP.xml 2018-07-06 15:58:40.0 +0200 +++ new/skelcd-control-CAASP-15.3/control/control.CAASP.xml 2018-10-16 11:01:45.0 +0200 @@ -251,7 +251,6 @@ dashboard_role - container-feeder docker etcd kubelet @@ -269,7 +268,6 @@ docker - container-feeder salt-minion systemd-timesyncd @@ -386,6 +384,10 @@ no +partitions +10 + + bootloader 40 @@ -394,10 +396,6 @@ 80 -partitions -10 - - timezone 25 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.1/package/skelcd-control-CAASP.changes new/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.changes --- old/skelcd-control-CAASP-15.1/package/skelcd-control-CAASP.changes 2018-07-06 15:58:40.0 +0200 +++ new/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.changes 2018-10-16 11:01:45.0 +0200 @@ -1,3 +1,18 @@ +Thu Oct 11 14:43:55 UTC 2018 - jmassaguer...@suse.com + +- fix bsc#541: do not enable container-feeder since this does + not exist in caasp4. +- 15.3 + +--- +Thu Oct 11 08:35:10 UTC 2018 - jmassaguer...@suse.com + +- fix bsc#1110300 by running disc proposal before bootloader + Port of commit + https://github.com/yast/skelcd-control-Kubic/commit/3a28ac79d59b50200755990812cad560513522cd + to CaaSP4 +- 15.2 + --- Thu Jun 28 15:25:12 UTC 2018 - rbr...@suse.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.1/package/skelcd-control-CAASP.spec new/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.spec --- old/skelcd-control-CAASP-15.1/package/skelcd-control-CAASP.spec 2018-07-06 15:58:40.0 +0200 +++ new/skelcd-control-CAASP-15.3/package/skelcd-control-CAASP.spec 2018-10-16 11:01:45.0 +0200 @@ -112,7 +112,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.1 +Version:15.3 Release:0 Summary:The CaaSP control file needed for installation License:MIT
commit skelcd-control-CAASP for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-control-CAASP for openSUSE:Factory checked in at 2018-07-13 10:17:11 Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New) Package is "skelcd-control-CAASP" Fri Jul 13 10:17:11 2018 rev:11 rq:621343 version:15.1 Changes: --- /work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes 2018-05-11 14:27:04.342713930 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes 2018-07-13 10:17:14.222161491 +0200 @@ -1,0 +2,15 @@ +Thu Jun 28 15:25:12 UTC 2018 - rbr...@suse.com + +- Initial CaaSPv4 installation workflow (fate#325834) +- Remove dependency of yast2-caasp +- Multi-step workflow using standard SLE/openSUSE YaST modules +- Show partitioning, software selection, timezone on Summary stage +- Allow editing of Timezone +- System Role descriptions based on those in Kubic +- Include new SUSE-MicroOS-container-runtime pattern +- Enable new SLE15 & CaaSP Services in system roles +- Remove unused MicroOS system role +- libstorage-ng style storage configuration for full disk use +- 15.1 + +--- Old: skelcd-control-CAASP-15.0.16.tar.bz2 New: skelcd-control-CAASP-15.1.tar.bz2 Other differences: -- ++ skelcd-control-CAASP.spec ++ --- /var/tmp/diff_new_pack.ZOdbxK/_old 2018-07-13 10:17:14.570161903 +0200 +++ /var/tmp/diff_new_pack.ZOdbxK/_new 2018-07-13 10:17:14.570161903 +0200 @@ -57,9 +57,6 @@ Requires: yast2-qt-branding-openSUSE %endif -# the CaaSP specific packages -Requires: yast2-caasp - # Generic Yast packages needed for the installer Requires: autoyast2 Requires: yast2-add-on @@ -115,7 +112,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.0.16 +Version:15.1 Release:0 Summary:The CaaSP control file needed for installation License:MIT ++ skelcd-control-CAASP-15.0.16.tar.bz2 -> skelcd-control-CAASP-15.1.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.16/control/control.CAASP.xml new/skelcd-control-CAASP-15.1/control/control.CAASP.xml --- old/skelcd-control-CAASP-15.0.16/control/control.CAASP.xml 2018-05-10 09:12:46.0 +0200 +++ new/skelcd-control-CAASP-15.1/control/control.CAASP.xml 2018-07-06 15:58:40.0 +0200 @@ -14,7 +14,8 @@ false false true -true +UTC +false false @@ -108,7 +109,7 @@ -SUSE-MicroOS SUSE-MicroOS-hardware SUSE-MicroOS-apparmor SUSE-CaaSP-Stack +SUSE-MicroOS SUSE-MicroOS-hardware SUSE-MicroOS-apparmor SUSE-CaaSP-Stack SUSE-MicroOS-container-runtime 32bit @@ -130,7 +131,11 @@ false -false +true +all +all +all + @@ -252,6 +257,8 @@ kubelet salt-minion admin-node-setup + admin-node-init + chronyd 100 @@ -264,6 +271,7 @@ docker container-feeder salt-minion + systemd-timesyncd 200 @@ -276,97 +284,6 @@ - -micro_os_role - - 400 - - -SUSE-MicroOS SUSE-MicroOS-hardware SUSE-MicroOS-apparmor - - -true - - -false -false - - - - - -/ - -btrfs -25 GiB -16 GiB -30 GiB -80 - -true -false - - -false - - -@ - - -true - - - - - - -root - - -tmp - - -home - - -cloud-init-config - - - -var -false
commit skelcd-control-CAASP for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-control-CAASP for openSUSE:Factory checked in at 2018-05-11 14:27:01 Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New) Package is "skelcd-control-CAASP" Fri May 11 14:27:01 2018 rev:10 rq:606088 version:15.0.16 Changes: --- /work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes 2018-04-26 13:26:29.689438935 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes 2018-05-11 14:27:04.342713930 +0200 @@ -1,0 +2,6 @@ +Thu May 10 07:07:27 UTC 2018 - knut.anders...@suse.com + +- Added subvolume /opt (bsc#1092174) +- 15.0.16 + +--- Old: skelcd-control-CAASP-15.0.15.tar.bz2 New: skelcd-control-CAASP-15.0.16.tar.bz2 Other differences: -- ++ skelcd-control-CAASP.spec ++ --- /var/tmp/diff_new_pack.Norfez/_old 2018-05-11 14:27:04.930692567 +0200 +++ /var/tmp/diff_new_pack.Norfez/_new 2018-05-11 14:27:04.930692567 +0200 @@ -115,7 +115,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.0.15 +Version:15.0.16 Release:0 Summary:The CaaSP control file needed for installation License:MIT ++ skelcd-control-CAASP-15.0.15.tar.bz2 -> skelcd-control-CAASP-15.0.16.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.15/control/control.CAASP.xml new/skelcd-control-CAASP-15.0.16/control/control.CAASP.xml --- old/skelcd-control-CAASP-15.0.15/control/control.CAASP.xml 2018-04-10 15:44:27.0 +0200 +++ new/skelcd-control-CAASP-15.0.16/control/control.CAASP.xml 2018-05-10 09:12:46.0 +0200 @@ -170,6 +170,9 @@ home +opt + + cloud-init-config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.15/package/skelcd-control-CAASP.changes new/skelcd-control-CAASP-15.0.16/package/skelcd-control-CAASP.changes --- old/skelcd-control-CAASP-15.0.15/package/skelcd-control-CAASP.changes 2018-04-10 15:44:27.0 +0200 +++ new/skelcd-control-CAASP-15.0.16/package/skelcd-control-CAASP.changes 2018-05-10 09:12:46.0 +0200 @@ -1,4 +1,10 @@ --- +Thu May 10 07:07:27 UTC 2018 - knut.anders...@suse.com + +- Added subvolume /opt (bsc#1092174) +- 15.0.16 + +--- Tue Apr 10 13:36:19 UTC 2018 - jreidin...@suse.com - Do not build on 32-bit architecture as some dependencies are not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.15/package/skelcd-control-CAASP.spec new/skelcd-control-CAASP-15.0.16/package/skelcd-control-CAASP.spec --- old/skelcd-control-CAASP-15.0.15/package/skelcd-control-CAASP.spec 2018-04-10 15:44:27.0 +0200 +++ new/skelcd-control-CAASP-15.0.16/package/skelcd-control-CAASP.spec 2018-05-10 09:12:46.0 +0200 @@ -115,7 +115,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.0.15 +Version:15.0.16 Release:0 Summary:The CaaSP control file needed for installation License:MIT
commit skelcd-control-CAASP for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-control-CAASP for openSUSE:Factory checked in at 2018-04-26 13:26:28 Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New) Package is "skelcd-control-CAASP" Thu Apr 26 13:26:28 2018 rev:9 rq:595286 version:15.0.15 Changes: --- /work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes 2018-03-14 19:34:33.874735125 +0100 +++ /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes 2018-04-26 13:26:29.689438935 +0200 @@ -1,0 +2,7 @@ +Tue Apr 10 13:36:19 UTC 2018 - jreidin...@suse.com + +- Do not build on 32-bit architecture as some dependencies are not + available there (bsc#1088852) +- 15.0.15 + +--- Old: skelcd-control-CAASP-15.0.14.tar.bz2 New: skelcd-control-CAASP-15.0.15.tar.bz2 Other differences: -- ++ skelcd-control-CAASP.spec ++ --- /var/tmp/diff_new_pack.YlMHpa/_old 2018-04-26 13:26:30.149422091 +0200 +++ /var/tmp/diff_new_pack.YlMHpa/_new 2018-04-26 13:26:30.153421945 +0200 @@ -106,12 +106,16 @@ Requires: yast2-vm %endif +# SUSEConnect does not build for i586 and s390 and is not supported on those architectures +# bsc#1088552 so also yast2-registration is not there. +ExcludeArch:%ix86 s390 + # ## Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.0.14 +Version:15.0.15 Release:0 Summary:The CaaSP control file needed for installation License:MIT ++ skelcd-control-CAASP-15.0.14.tar.bz2 -> skelcd-control-CAASP-15.0.15.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.14/package/skelcd-control-CAASP.changes new/skelcd-control-CAASP-15.0.15/package/skelcd-control-CAASP.changes --- old/skelcd-control-CAASP-15.0.14/package/skelcd-control-CAASP.changes 2018-03-13 15:35:00.0 +0100 +++ new/skelcd-control-CAASP-15.0.15/package/skelcd-control-CAASP.changes 2018-04-10 15:44:27.0 +0200 @@ -1,4 +1,11 @@ --- +Tue Apr 10 13:36:19 UTC 2018 - jreidin...@suse.com + +- Do not build on 32-bit architecture as some dependencies are not + available there (bsc#1088852) +- 15.0.15 + +--- Tue Mar 13 08:54:10 UTC 2018 - igonzalezs...@suse.com - Replace root_subvolume_read_only with btrfs_read_only (related diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.14/package/skelcd-control-CAASP.spec new/skelcd-control-CAASP-15.0.15/package/skelcd-control-CAASP.spec --- old/skelcd-control-CAASP-15.0.14/package/skelcd-control-CAASP.spec 2018-03-13 15:35:00.0 +0100 +++ new/skelcd-control-CAASP-15.0.15/package/skelcd-control-CAASP.spec 2018-04-10 15:44:27.0 +0200 @@ -106,12 +106,16 @@ Requires: yast2-vm %endif +# SUSEConnect does not build for i586 and s390 and is not supported on those architectures +# bsc#1088552 so also yast2-registration is not there. +ExcludeArch:%ix86 s390 + # ## Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.0.14 +Version:15.0.15 Release:0 Summary:The CaaSP control file needed for installation License:MIT
commit skelcd-control-CAASP for openSUSE:Factory
Hello community,
here is the log from the commit of package skelcd-control-CAASP for
openSUSE:Factory checked in at 2018-03-14 19:34:30
Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New)
Package is "skelcd-control-CAASP"
Wed Mar 14 19:34:30 2018 rev:8 rq:586426 version:15.0.14
Changes:
---
/work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes
2018-01-28 00:38:04.553290706 +0100
+++
/work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes
2018-03-14 19:34:33.874735125 +0100
@@ -1,0 +2,7 @@
+Tue Mar 13 08:54:10 UTC 2018 - igonzalezs...@suse.com
+
+- Replace root_subvolume_read_only with btrfs_read_only (related
+ to bsc#1079000).
+- 15.0.14
+
+---
Old:
skelcd-control-CAASP-15.0.13.tar.bz2
New:
skelcd-control-CAASP-15.0.14.tar.bz2
Other differences:
--
++ skelcd-control-CAASP.spec ++
--- /var/tmp/diff_new_pack.aPt5YP/_old 2018-03-14 19:34:35.346682847 +0100
+++ /var/tmp/diff_new_pack.aPt5YP/_new 2018-03-14 19:34:35.350682705 +0100
@@ -31,7 +31,7 @@
# xmllint (for validation)
BuildRequires: libxml2-tools
# RNG validation schema
-BuildRequires: yast2-installation-control >= 4.0.0
+BuildRequires: yast2-installation-control >= 4.0.10
%if 0%{?is_opensuse}
# xsltproc - for building control.Kubic.xml from control.CAASP.xml
@@ -111,7 +111,7 @@
Url:https://github.com/yast/skelcd-control-CAASP
AutoReqProv:off
-Version:15.0.13
+Version:15.0.14
Release:0
Summary:The CaaSP control file needed for installation
License:MIT
++ skelcd-control-CAASP-15.0.13.tar.bz2 ->
skelcd-control-CAASP-15.0.14.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.13/control/control.CAASP.glade
new/skelcd-control-CAASP-15.0.14/control/control.CAASP.glade
--- old/skelcd-control-CAASP-15.0.13/control/control.CAASP.glade
1970-01-01 01:00:00.0 +0100
+++ new/skelcd-control-CAASP-15.0.14/control/control.CAASP.glade
2018-03-14 19:34:35.558675317 +0100
@@ -0,0 +1 @@
+symbolic link to control.CAASP.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.13/control/control.CAASP.xml
new/skelcd-control-CAASP-15.0.14/control/control.CAASP.xml
--- old/skelcd-control-CAASP-15.0.13/control/control.CAASP.xml 2018-01-26
09:36:17.0 +0100
+++ new/skelcd-control-CAASP-15.0.14/control/control.CAASP.xml 2018-03-13
15:35:00.0 +0100
@@ -131,7 +131,6 @@
false
false
-true
@@ -154,6 +153,9 @@
@
+
+true
+
@@ -285,7 +287,6 @@
false
false
-true
@@ -308,6 +309,9 @@
@
+
+true
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.13/package/skelcd-control-CAASP.changes
new/skelcd-control-CAASP-15.0.14/package/skelcd-control-CAASP.changes
--- old/skelcd-control-CAASP-15.0.13/package/skelcd-control-CAASP.changes
2018-01-26 09:36:17.0 +0100
+++ new/skelcd-control-CAASP-15.0.14/package/skelcd-control-CAASP.changes
2018-03-13 15:35:00.0 +0100
@@ -1,4 +1,11 @@
---
+Tue Mar 13 08:54:10 UTC 2018 - igonzalezs...@suse.com
+
+- Replace root_subvolume_read_only with btrfs_read_only (related
+ to bsc#1079000).
+- 15.0.14
+
+---
Fri Jan 26 08:31:39 UTC 2018 - jsr...@suse.cz
- always use 'zypper dup' equivalent when doing upgrade
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-15.0.13/package/skelcd-control-CAASP.spec
new/skelcd-control-CAASP-15.0.14/package/skelcd-control-CAASP.spec
--- old/skelcd-control-CAASP-15.0.13/package/skelcd-control-CAASP.spec
2018-01-26 09:36:17.0 +0100
+++ new/skelcd-control-CAASP-15.0.14/package/skelcd-control-CAASP.spec
2018-03-13 15:35:00.0 +0100
@@ -31,7 +31,7 @@
# xmllint (for validation)
BuildRequires: libxml2-tools
# RNG validation schema
-BuildRequires:
commit skelcd-control-CAASP for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-control-CAASP for openSUSE:Factory checked in at 2018-01-28 00:38:02 Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New) Package is "skelcd-control-CAASP" Sun Jan 28 00:38:02 2018 rev:7 rq:569809 version:15.0.13 Changes: --- /work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes 2018-01-20 11:19:31.508534260 +0100 +++ /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes 2018-01-28 00:38:04.553290706 +0100 @@ -1,0 +2,7 @@ +Fri Jan 26 08:31:39 UTC 2018 - jsr...@suse.cz + +- always use 'zypper dup' equivalent when doing upgrade + (bsc#1071708) +- 15.0.13 + +--- Old: skelcd-control-CAASP-15.0.12.tar.bz2 New: skelcd-control-CAASP-15.0.13.tar.bz2 Other differences: -- ++ skelcd-control-CAASP.spec ++ --- /var/tmp/diff_new_pack.LKM0uH/_old 2018-01-28 00:38:05.085265924 +0100 +++ /var/tmp/diff_new_pack.LKM0uH/_new 2018-01-28 00:38:05.089265737 +0100 @@ -111,7 +111,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.0.12 +Version:15.0.13 Release:0 Summary:The CaaSP control file needed for installation License:MIT ++ skelcd-control-CAASP-15.0.12.tar.bz2 -> skelcd-control-CAASP-15.0.13.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.12/control/control.CAASP.xml new/skelcd-control-CAASP-15.0.13/control/control.CAASP.xml --- old/skelcd-control-CAASP-15.0.12/control/control.CAASP.xml 2018-01-18 11:08:53.0 +0100 +++ new/skelcd-control-CAASP-15.0.13/control/control.CAASP.xml 2018-01-26 09:36:17.0 +0100 @@ -97,13 +97,6 @@ ^SUSE (LINUX|Linux) Enterprise Server 12.*$ - -false - - -^SUSE (LINUX|Linux) Enterprise Server 12.*$ - - ^SUSE (LINUX|Linux) Enterprise Server 11.*$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.12/package/skelcd-control-CAASP.changes new/skelcd-control-CAASP-15.0.13/package/skelcd-control-CAASP.changes --- old/skelcd-control-CAASP-15.0.12/package/skelcd-control-CAASP.changes 2018-01-18 11:08:53.0 +0100 +++ new/skelcd-control-CAASP-15.0.13/package/skelcd-control-CAASP.changes 2018-01-26 09:36:17.0 +0100 @@ -1,4 +1,11 @@ --- +Fri Jan 26 08:31:39 UTC 2018 - jsr...@suse.cz + +- always use 'zypper dup' equivalent when doing upgrade + (bsc#1071708) +- 15.0.13 + +--- Thu Jan 18 06:07:41 UTC 2018 - jsr...@suse.cz - adjusted patterns list (bsc#1075998) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.12/package/skelcd-control-CAASP.spec new/skelcd-control-CAASP-15.0.13/package/skelcd-control-CAASP.spec --- old/skelcd-control-CAASP-15.0.12/package/skelcd-control-CAASP.spec 2018-01-18 11:08:53.0 +0100 +++ new/skelcd-control-CAASP-15.0.13/package/skelcd-control-CAASP.spec 2018-01-26 09:36:17.0 +0100 @@ -111,7 +111,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.0.12 +Version:15.0.13 Release:0 Summary:The CaaSP control file needed for installation License:MIT
commit skelcd-control-CAASP for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-control-CAASP for openSUSE:Factory checked in at 2018-01-20 11:19:30 Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New) Package is "skelcd-control-CAASP" Sat Jan 20 11:19:30 2018 rev:6 rq:567313 version:15.0.12 Changes: --- /work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes 2018-01-17 21:44:06.287101392 +0100 +++ /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes 2018-01-20 11:19:31.508534260 +0100 @@ -1,0 +2,7 @@ +Thu Jan 18 06:07:41 UTC 2018 - jsr...@suse.cz + +- adjusted patterns list (bsc#1075998) +- defined role for plain MicroOS +- 15.0.12 + +--- Old: skelcd-control-CAASP-15.0.11.tar.bz2 New: skelcd-control-CAASP-15.0.12.tar.bz2 Other differences: -- ++ skelcd-control-CAASP.spec ++ --- /var/tmp/diff_new_pack.NxNry0/_old 2018-01-20 11:19:32.092506960 +0100 +++ /var/tmp/diff_new_pack.NxNry0/_new 2018-01-20 11:19:32.092506960 +0100 @@ -111,7 +111,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:15.0.11 +Version:15.0.12 Release:0 Summary:The CaaSP control file needed for installation License:MIT ++ skelcd-control-CAASP-15.0.11.tar.bz2 -> skelcd-control-CAASP-15.0.12.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.11/control/control.CAASP.xml new/skelcd-control-CAASP-15.0.12/control/control.CAASP.xml --- old/skelcd-control-CAASP-15.0.11/control/control.CAASP.xml 2018-01-16 17:34:58.0 +0100 +++ new/skelcd-control-CAASP-15.0.12/control/control.CAASP.xml 2018-01-18 11:08:53.0 +0100 @@ -115,7 +115,7 @@ -SUSE-MicroOS SUSE-CaaSP-Stack +SUSE-MicroOS SUSE-MicroOS-hardware SUSE-MicroOS-apparmor SUSE-CaaSP-Stack 32bit @@ -275,6 +275,97 @@ none_role 300 + + + + +micro_os_role + + 400 + + +SUSE-MicroOS SUSE-MicroOS-hardware SUSE-MicroOS-apparmor + + +true + + +false +false +true + + + + + +/ + +btrfs +25 GiB +16 GiB +30 GiB +80 + +true +false + + +false + + +@ + + + + + + +root + + +tmp + + +home + + +cloud-init-config + + + +var +false + + + + + +boot/grub2/arm64-efi +aarch64 + + +boot/grub2/i386-pc +x86_64 + + +boot/grub2/powerpc-ieee1275 +ppc,!board_powernv + + +boot/grub2/s390x-emu +s390 + + +boot/grub2/x86_64-efi +x86_64 + + + + + + + + @@ -362,6 +453,13 @@ • No services started by default. + + + SUSE MicroOS + + + • No services started by default. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-15.0.11/control/control.Kubic.xsl new/skelcd-control-CAASP-15.0.12/control/control.Kubic.xsl ---
commit skelcd-control-CAASP for openSUSE:Factory
Hello community,
here is the log from the commit of package skelcd-control-CAASP for
openSUSE:Factory checked in at 2018-01-17 21:44:05
Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New)
Package is "skelcd-control-CAASP"
Wed Jan 17 21:44:05 2018 rev:5 rq:566472 version:15.0.11
Changes:
---
/work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes
2017-09-19 16:20:43.721890555 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes
2018-01-17 21:44:06.287101392 +0100
@@ -1,0 +2,62 @@
+Tue Jan 16 17:01:09 UTC 2018 - rbr...@suse.com
+
+- do not define control.xml in %files when not CaaSP or openSUSE
+ (boo#1076173)
+- 15.0.11
+
+---
+Tue Jan 16 14:37:52 UTC 2018 - rbr...@suse.com
+
+- use Tumbleweed style skelcdpath control file location macros
+ (boo#1076173)
+- 15.0.10
+
+---
+Tue Jan 16 12:18:12 UTC 2018 - rbr...@suse.com
+
+- correct spec to not install control file in SLE 15 staging
+ (boo#1076173)
+- 15.0.9
+
+---
+Fri Jan 12 13:49:33 UTC 2018 - rbr...@suse.com
+
+- correct Kubic.xsl related spec refs to use %is_opensuse instead
+ of !%is_susecaasp. skelcd-control-CaaSP is built for non-openSUSE
+ products that are not susecaasp, and previous arrangement caused
+ build failures. (boo#1075802)
+- 15.0.8
+
+---
+Tue Dec 12 17:11:12 UTC 2017 - rbr...@suse.com
+
+- adjust subvolume list to have NoCOW /var instead of many
+ subvolumes (boo#1075369)
+- 15.0.7
+
+---
+Tue Dec 5 08:31:11 UTC 2017 - lsle...@suse.cz
+
+- openSUSE Kubic: copy "extra_urls" configuration from the standard
+ openSUSE product (bsc#1071217)
+- 15.0.6
+
+---
+Thu Oct 26 15:15:58 CEST 2017 - snw...@suse.de
+
+- adjust subvolume list in control.xml to support all archs (fate#318196)
+- 15.0.5
+
+---
+Mon Oct 23 17:22:58 CEST 2017 - snw...@suse.de
+
+- Use new storage-ng elements for partitioning in control.xml (fate#318196)
+- 15.0.4
+
+---
+Thu Sep 21 07:34:53 UTC 2017 - jreidin...@suse.cz
+
+- Adapt to changes in roles (needed for fixing bsc#1049297)
+- 15.0.3
+
+---
Old:
skelcd-control-CAASP-15.0.2.tar.bz2
New:
skelcd-control-CAASP-15.0.11.tar.bz2
Other differences:
--
++ skelcd-control-CAASP.spec ++
--- /var/tmp/diff_new_pack.p2HNph/_old 2018-01-17 21:44:06.827076118 +0100
+++ /var/tmp/diff_new_pack.p2HNph/_new 2018-01-17 21:44:06.831075930 +0100
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-CAASP
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,12 +31,14 @@
# xmllint (for validation)
BuildRequires: libxml2-tools
# RNG validation schema
-BuildRequires: yast2-installation-control >= 3.1.13.12
+BuildRequires: yast2-installation-control >= 4.0.0
-%if !0%{?is_susecaasp}
+%if 0%{?is_opensuse}
# xsltproc - for building control.Kubic.xml from control.CAASP.xml
BuildRequires: diffutils
BuildRequires: libxslt-tools
+# we need to copy some parts from the openSUSE control.xml to Kubic
+BuildRequires: skelcd-control-openSUSE
%endif
##
@@ -109,7 +111,7 @@
Url:https://github.com/yast/skelcd-control-CAASP
AutoReqProv:off
-Version:15.0.2
+Version:15.0.11
Release:0
Summary:The CaaSP control file needed for installation
License:MIT
@@ -117,6 +119,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{version}.tar.bz2
+%if 0%{?suse_version} >= 1500 && !0%{?skelcd_compat}
+%define skelcdpath /usr/lib/skelcd
+%endif
+
%description
The package contains the CaaSP control file needed for installation.
@@ -124,7 +130,7 @@
%setup -n %{name}-%{version}
-%if !0%{?is_susecaasp}
+%if 0%{?is_opensuse}
%build
# build control.Kubic.xml from control.CAASP.xml
make -C control control.Kubic.xml
@@ -143,12 +149,13 @@
#
# Add control file
#
commit skelcd-control-CAASP for openSUSE:Factory
Hello community,
here is the log from the commit of package skelcd-control-CAASP for
openSUSE:Factory checked in at 2017-09-19 16:20:41
Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New)
Package is "skelcd-control-CAASP"
Tue Sep 19 16:20:41 2017 rev:4 rq:527294 version:15.0.2
Changes:
---
/work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes
2017-09-12 20:12:32.266450772 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes
2017-09-19 16:20:43.721890555 +0200
@@ -1,0 +2,20 @@
+Tue Sep 19 08:13:49 UTC 2017 - lsle...@suse.cz
+
+- Patch control.Kubic.xml using a XSL file, that's more robust
+ then a plain text diff (bsc#1059299)
+- 15.0.2
+
+---
+Mon Sep 18 14:40:15 UTC 2017 - lsle...@suse.cz
+
+- Adjust the install path for Kubic (openSUSE still uses the old
+ product builder in OBS)
+
+---
+Mon Sep 18 12:35:24 UTC 2017 - rbr...@suse.com
+
+- Adjust control.Kubic.diff, remove non-existing admin-node-setup
+ service (bsc#1058749)
+- 15.0.1
+
+---
@@ -51,0 +72,5 @@
+
+---
+Wed May 24 14:51:45 CEST 2017 - behl...@suse.de
+
+- /usr/lib/skelcd/CD1 instead of /CD1
Old:
control.Kubic.diff
skelcd-control-CAASP-15.0.0.tar.bz2
New:
skelcd-control-CAASP-15.0.2.tar.bz2
Other differences:
--
++ skelcd-control-CAASP.spec ++
--- /var/tmp/diff_new_pack.1NApsr/_old 2017-09-19 16:20:44.549773857 +0200
+++ /var/tmp/diff_new_pack.1NApsr/_new 2017-09-19 16:20:44.549773857 +0200
@@ -33,6 +33,12 @@
# RNG validation schema
BuildRequires: yast2-installation-control >= 3.1.13.12
+%if !0%{?is_susecaasp}
+# xsltproc - for building control.Kubic.xml from control.CAASP.xml
+BuildRequires: diffutils
+BuildRequires: libxslt-tools
+%endif
+
##
#
# Here is the list of Yast packages which are needed in the
@@ -103,14 +109,13 @@
Url:https://github.com/yast/skelcd-control-CAASP
AutoReqProv:off
-Version:15.0.0
+Version:15.0.2
Release:0
Summary:The CaaSP control file needed for installation
License:MIT
Group: Metapackages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{version}.tar.bz2
-Patch: control.Kubic.diff
%description
The package contains the CaaSP control file needed for installation.
@@ -118,8 +123,14 @@
%prep
%setup -n %{name}-%{version}
+
%if !0%{?is_susecaasp}
-%patch -p0
+%build
+# build control.Kubic.xml from control.CAASP.xml
+make -C control control.Kubic.xml
+# display the changes (just for easier debugging)
+# don't fail, a difference is expected
+diff -u control/control.CAASP.xml control/control.Kubic.xml || :
%endif
%check
@@ -132,8 +143,13 @@
#
# Add control file
#
+%if 0%{?is_susecaasp}
+mkdir -p $RPM_BUILD_ROOT/usr/lib/skelcd/CD1
+install -m 644 control/control.CAASP.xml
$RPM_BUILD_ROOT/usr/lib/skelcd/CD1/control.xml
+%else
mkdir -p $RPM_BUILD_ROOT/CD1
-install -m 644 control/control.CAASP.xml $RPM_BUILD_ROOT/CD1/control.xml
+install -m 644 control/control.Kubic.xml $RPM_BUILD_ROOT/CD1/control.xml
+%endif
# install LICENSE (required by build service check)
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/%{name}
@@ -141,7 +157,12 @@
%files
%defattr(644,root,root,755)
+%if 0%{?is_susecaasp}
+%dir /usr/lib/skelcd
+/usr/lib/skelcd/CD1
+%else
/CD1
+%endif
%doc %dir %{_prefix}/share/doc/packages/%{name}
%doc %{_prefix}/share/doc/packages/%{name}/LICENSE
++ skelcd-control-CAASP-15.0.0.tar.bz2 ->
skelcd-control-CAASP-15.0.2.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-15.0.0/.travis.sh
new/skelcd-control-CAASP-15.0.2/.travis.sh
--- old/skelcd-control-CAASP-15.0.0/.travis.sh 2017-09-01 13:06:49.845038573
+0200
+++ new/skelcd-control-CAASP-15.0.2/.travis.sh 2017-09-19 14:07:13.032827172
+0200
@@ -2,7 +2,20 @@
set -e -x
-# validate the control file
+if [ "$BUILD_FLAVOR" == "kubic" ]; then
+ # build the file
+ make -C control control.Kubic.xml
+ # pretend we are running in an openSUSE Kubic build
+ echo "%is_susecaasp 0" >> ~/.rpmmacros
+elif [ "$BUILD_FLAVOR" == "caasp" ]; then
+ # pretend we are running in a SUSE CaaSP build
+ echo "%is_susecaasp 1" >> ~/.rpmmacros
+else
+ echo "Uknown BUILD_FLAVOR: $BUILD_FLAVOR"
+
commit skelcd-control-CAASP for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-control-CAASP for openSUSE:Factory checked in at 2017-09-12 20:12:29 Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New) Package is "skelcd-control-CAASP" Tue Sep 12 20:12:29 2017 rev:3 rq:522798 version:15.0.0 Changes: --- /work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes 2017-05-22 18:09:16.470868979 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes 2017-09-12 20:12:32.266450772 +0200 @@ -1,0 +2,52 @@ +Fri Sep 1 10:36:24 UTC 2017 - lsle...@suse.cz + +- Added yast2-s390 dependency to fix failed disk activation + (bsc#1055871) +- 15.0.0 + +--- +Wed Aug 16 11:35:46 CEST 2017 - shundham...@suse.de + +- Make filesystem type for home and root configurable (bsc#1051762) +- 12.2.38 + +--- +Tue Jul 4 14:17:04 CEST 2017 - shundham...@suse.de + +- Reduce min size to create a separate /var/lib/docker partition + to 35 GB (Fate#323532) +- 12.2.37 + +--- +Tue Jun 27 13:16:11 UTC 2017 - jsr...@suse.cz + +- enabled the admin-node-setup service on admin (bsc#1046162) +- 12.2.36 + +--- +Tue Jun 27 11:02:42 UTC 2017 - jsr...@suse.cz + +- added "swapaccount=1" to kernel parameters (fate#323562) +- 12.2.35 + +--- +Mon Jun 26 11:15:57 CEST 2017 - shundham...@suse.de + +- Hack: Use home partition as /var/lib/docker (Fate#323532) +- 12.2.34 + +--- +Fri Jun 23 07:23:49 UTC 2017 - knut.anders...@suse.com + +- Enable salt-minion service in dashboard role (bsc#1045350) +- 12.2.33 + +--- +Tue Jun 20 11:42:06 UTC 2017 - jsr...@suse.cz + +- added subvolume for /var/lib/ca-certificates (bsc#1045125) +- adjusted NoCoW attributes for subvolumes (bsc#1045125) +- enable docker on cluster nodes (bsc#1045125) +- 12.2.32 + +--- Old: skelcd-control-CAASP-12.2.32.tar.bz2 New: skelcd-control-CAASP-15.0.0.tar.bz2 Other differences: -- ++ skelcd-control-CAASP.spec ++ --- /var/tmp/diff_new_pack.X7u5fi/_old 2017-09-12 20:12:32.786377663 +0200 +++ /var/tmp/diff_new_pack.X7u5fi/_new 2017-09-12 20:12:32.790377100 +0200 @@ -31,7 +31,7 @@ # xmllint (for validation) BuildRequires: libxml2-tools # RNG validation schema -BuildRequires: yast2-installation-control >= 3.1.13.2 +BuildRequires: yast2-installation-control >= 3.1.13.12 ## # @@ -91,6 +91,7 @@ # %ifarch s390 s390x Requires: yast2-reipl >= 3.1.4 +Requires: yast2-s390 %endif %ifarch %ix86 x86_64 @@ -102,7 +103,7 @@ Url:https://github.com/yast/skelcd-control-CAASP AutoReqProv:off -Version:12.2.32 +Version:15.0.0 Release:0 Summary:The CaaSP control file needed for installation License:MIT ++ control.Kubic.diff ++ --- /var/tmp/diff_new_pack.X7u5fi/_old 2017-09-12 20:12:32.822372601 +0200 +++ /var/tmp/diff_new_pack.X7u5fi/_new 2017-09-12 20:12:32.826372040 +0200 @@ -1,6 +1,6 @@ --- control/control.CAASP.xml -+++ control/control.CAASP.xml 2017/05/08 10:55:52 -@@ -260,7 +260,6 @@ control/control.CAASP.xml 2017/06/20 11:05:54 +@@ -264,7 +264,6 @@ dashboard_role @@ -8,10 +8,10 @@ docker etcd kubelet -@@ -271,7 +270,6 @@ - worker_role +@@ -276,7 +275,6 @@ + docker - container-feeder salt-minion ++ skelcd-control-CAASP-12.2.32.tar.bz2 -> skelcd-control-CAASP-15.0.0.tar.bz2 ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-CAASP-12.2.32/Dockerfile new/skelcd-control-CAASP-15.0.0/Dockerfile --- old/skelcd-control-CAASP-12.2.32/Dockerfile 2017-05-19 10:08:30.666356636 +0200 +++ new/skelcd-control-CAASP-15.0.0/Dockerfile 2017-09-01 13:06:49.845038573 +0200 @@ -1,4 +1,2 @@ -# FIXME: switch to yastdevel/cpp:caasp-1_0 when available to avoid running -# useless Ruby checks -FROM yastdevel/ruby:caasp-1_0 +FROM yastdevel/ruby COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore'
commit skelcd-control-CAASP for openSUSE:Factory
Hello community,
here is the log from the commit of package skelcd-control-CAASP for
openSUSE:Factory checked in at 2017-05-22 18:09:15
Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New)
Package is "skelcd-control-CAASP"
Mon May 22 18:09:15 2017 rev:2 rq:496495 version:12.2.32
Changes:
---
/work/SRC/openSUSE:Factory/skelcd-control-CAASP/skelcd-control-CAASP.changes
2017-05-06 20:46:17.119186454 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes
2017-05-22 18:09:16.470868979 +0200
@@ -1,0 +2,14 @@
+Wed May 17 11:46:23 CEST 2017 - shundham...@suse.de
+
+- Added subvolume /home (bsc#1039237)
+- 12.2.31
+
+---
+Tue May 9 13:47:02 UTC 2017 - lsle...@suse.cz
+
+- Update the default pattern names (bsc#1038267)
+- Adapt the package to build also for openSUSE (added
+ control.Kubic.diff patch)
+- 12.2.31
+
+---
Old:
skelcd-control-CAASP-12.2.30.tar.bz2
New:
control.Kubic.diff
skelcd-control-CAASP-12.2.32.tar.bz2
Other differences:
--
++ skelcd-control-CAASP.spec ++
--- /var/tmp/diff_new_pack.FNKwqK/_old 2017-05-22 18:09:17.154772578 +0200
+++ /var/tmp/diff_new_pack.FNKwqK/_new 2017-05-22 18:09:17.158772014 +0200
@@ -42,7 +42,12 @@
# SLES specific Yast packages needed in the inst-sys
# to provide the functionality needed by this control file
Requires: yast2-registration
+%if 0%{?is_susecaasp}
Requires: yast2-theme-SLE
+%else
+Requires: yast2-branding-openSUSE
+Requires: yast2-qt-branding-openSUSE
+%endif
# the CaaSP specific packages
Requires: yast2-caasp
@@ -97,13 +102,14 @@
Url:https://github.com/yast/skelcd-control-CAASP
AutoReqProv:off
-Version:12.2.30
+Version:12.2.32
Release:0
Summary:The CaaSP control file needed for installation
License:MIT
Group: Metapackages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: %{name}-%{version}.tar.bz2
+Patch: control.Kubic.diff
%description
The package contains the CaaSP control file needed for installation.
@@ -111,6 +117,9 @@
%prep
%setup -n %{name}-%{version}
+%if !0%{?is_susecaasp}
+%patch -p0
+%endif
%check
#
++ control.Kubic.diff ++
--- control/control.CAASP.xml
+++ control/control.CAASP.xml 2017/05/08 10:55:52
@@ -260,7 +260,6 @@
dashboard_role
- container-feeder
docker
etcd
kubelet
@@ -271,7 +270,6 @@
worker_role
- container-feeder
salt-minion
++ skelcd-control-CAASP-12.2.30.tar.bz2 ->
skelcd-control-CAASP-12.2.32.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-CAASP-12.2.30/README.md
new/skelcd-control-CAASP-12.2.32/README.md
--- old/skelcd-control-CAASP-12.2.30/README.md 2017-05-05 08:48:00.974679700
+0200
+++ new/skelcd-control-CAASP-12.2.32/README.md 2017-05-19 10:08:30.666356636
+0200
@@ -4,7 +4,7 @@
[](https://travis-ci.org/yast/skelcd-control-CAASP)
-Installation control file for SUSE Linux Enterprise CaaSP product
+Installation control file for SUSE CaaS Platform product
See also the [documentation for the `control.xml` file][1].
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-12.2.30/control/control.CAASP.xml
new/skelcd-control-CAASP-12.2.32/control/control.CAASP.xml
--- old/skelcd-control-CAASP-12.2.30/control/control.CAASP.xml 2017-05-05
08:48:00.974679700 +0200
+++ new/skelcd-control-CAASP-12.2.32/control/control.CAASP.xml 2017-05-19
10:08:30.666356636 +0200
@@ -115,7 +115,7 @@
-MicroOS Stack
+SUSE-MicroOS SUSE-CaaSP-Stack
32bit
@@ -160,6 +160,9 @@
tmp
+home
+
+
cloud-init-config
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-CAASP-12.2.30/package/control.Kubic.diff
new/skelcd-control-CAASP-12.2.32/package/control.Kubic.diff
--- old/skelcd-control-CAASP-12.2.30/package/control.Kubic.diff 1970-01-01
01:00:00.0 +0100
+++ new/skelcd-control-CAASP-12.2.32/package/control.Kubic.diff 2017-05-19
10:08:30.666356636 +0200
@@ -0,0 +1,18 @@
commit skelcd-control-CAASP for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-control-CAASP for openSUSE:Factory checked in at 2017-05-06 20:46:15 Comparing /work/SRC/openSUSE:Factory/skelcd-control-CAASP (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new (New) Package is "skelcd-control-CAASP" Sat May 6 20:46:15 2017 rev:1 rq:492974 version:12.2.30 Changes: New Changes file: --- /dev/null 2017-03-01 00:40:19.279048016 +0100 +++ /work/SRC/openSUSE:Factory/.skelcd-control-CAASP.new/skelcd-control-CAASP.changes 2017-05-06 20:46:17.119186454 +0200 @@ -0,0 +1,210 @@ +--- +Thu May 4 08:47:25 UTC 2017 - lsle...@suse.cz + +- The package has been renamed from skelcd-control-CASP to + skelcd-control-CAASP (bsc#1037541) +- 12.2.30 + +--- +Thu May 4 09:48:44 CEST 2017 - shundham...@suse.de + +- Added NoCOW subvolume /var/lib/dockershim (bsc#1037208) +- 12.2.29 + +--- +Tue Apr 4 13:06:02 UTC 2017 - mvid...@suse.com + +- bsc#1032057 + - Role names: Administration Node, Cluster Node, Plain System + - Enable container-feeder and other services +- 12.2.28 + +--- +Tue Apr 4 09:15:05 UTC 2017 - mvid...@suse.com + +- Include yast2-caasp in the instsys (bsc#1032010). +- 12.2.27 + +--- +Thu Mar 16 13:37:37 UTC 2017 - kanders...@suse.com + +- bsc#1029325 + - Added subvolume /var/lib/mysql without copy on write. + - Disabled copy on write on /var/lib/kubelet and /var/lib/docker +- 12.2.26 + +--- +Mon Mar 13 13:43:51 UTC 2017 - kanders...@suse.com + +- Added subvolume /var/lib/vmware (bsc#1028647) +- 12.2.25 + +--- +Tue Feb 28 14:36:55 CET 2017 - shundham...@suse.de + +- Added subvolumes /var/lib/kubelet and /var/lib/ntp (bsc#1026473) +- 12.2.24 + +--- +Thu Feb 16 12:44:10 UTC 2017 - mfi...@suse.com + +- fate#322328 + - appended (defaul) to "Administrative Dashboard" label to make +it more obvious that such role will be used by default. +- 12.2.23 + +--- +Tue Feb 7 13:03:25 UTC 2017 - jsr...@suse.cz + +- remove installer update also from AutoYaST workflow (bsc#1024032) +- 12.2.22 + +--- +Tue Feb 7 11:25:44 UTC 2017 - kanders...@suse.com + +- Removed additional dialog for worker role which is not used + anymore (FATE#322328). +- 12.2.21 + +--- +Fri Feb 3 14:17:57 UTC 2017 - igonzalezs...@suse.com + +- Remove AutoYaST second stage because it's not available in CaaSP + (bsc#1022267) +- 12.2.20 + +--- +Thu Jan 26 10:08:32 UTC 2017 - jreidin...@suse.com + +- initial set of services adaptation for CASP roles (FATE#322328) +- 12.2.19 + +--- +Wed Jan 25 15:36:45 UTC 2017 - mvid...@suse.com + +- Use the all-in-one installation overview dialog (FATE#322328) +- 12.2.18 + +--- +Mon Jan 16 11:08:50 UTC 2017 - igonzalezs...@suse.com + +- Set minimalistic configuration for libzypp (only required + packages, no documentation and no multiversion) + (FATE#321764) +- 12.2.17 + +--- +Mon Jan 16 09:17:52 UTC 2017 - mfi...@suse.com + +- fate#321739 + - use soft read-only flag for software proposal to allow +modification in case of error +- 12.2.16 + +--- +Fri Jan 13 09:17:18 UTC 2017 - jsr...@suse.cz + +- Adjusted root filesystem minimal size (bsc#1019652) +- 12.2.15 + +--- +Fri Dec 23 15:34:02 UTC 2016 - kanders...@suse.com + +- Added subvol for etcd without copy on write (bsc#1017145) +- 12.2.14 + +--- +Mon Dec 19 12:08:02 CET 2016 - shundham...@suse.de + +- Added subvol for docker, not libvirt (bsc#1015720) +- 12.2.13 + +--- +Wed Dec 14 15:31:51 UTC 2016 - igonzalezs...@suse.com + +- Set timezone as read-only (FATE#321754). +- 12.2.12 + +--- +Wed Dec 14 12:31:14 UTC 2016 - kanders...@suse.com +
