Hello community,
here is the log from the commit of package skelcd-control-openSUSE for
openSUSE:Factory checked in at 2018-01-17 21:44:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-openSUSE"
Wed Jan 17 21:44:15 2018 rev:189 rq:566608 version:42.3.99.18
Changes:
--------
---
/work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE-promo.changes
2017-07-02 13:32:54.307675876 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new/skelcd-control-openSUSE-promo.changes
2018-01-17 21:44:16.942602631 +0100
@@ -1,0 +2,61 @@
+Wed Jan 17 13:33:36 CET 2018 - [email protected]
+
+- rewrite partitioning section to use new storage-ng setting
+- 42.3.99.18
+
+-------------------------------------------------------------------
+Tue Dec 12 17:11:12 UTC 2017 - [email protected]
+
+- adjust subvolume list to have NoCOW /var instead of many
+ subvolumes (boo#1075369)
+- 42.3.99.17
+
+-------------------------------------------------------------------
+Fri Dec 1 12:21:48 UTC 2017 - [email protected]
+
+- In case prjconf defines skelcd_compat, do not yet move skelcdpath
+ to /usr/lib. This allows TW to move suse_version ahead of
+ SLE15, without being forced to switch to the new product builder
+ (boo#1071232).
+- 42.3.99.16
+
+-------------------------------------------------------------------
+Fri Oct 6 09:56:49 UTC 2017 - [email protected]
+
+- use /usr/lib/skelcd conditionally
+- 42.3.99.15
+
+-------------------------------------------------------------------
+Thu Sep 21 07:09:27 UTC 2017 - [email protected]
+
+- Adapt to changes in roles (needed for fixing bsc#1049297)
+- 42.3.99.14
+
+-------------------------------------------------------------------
+Wed Sep 6 07:46:57 UTC 2017 - [email protected]
+
+- Initialize libzypp in advance in order to read the product's
+ license (fate#322276)
+- 42.3.99.13
+
+-------------------------------------------------------------------
+Wed Aug 30 15:09:35 UTC 2017 - [email protected]
+
+- Added complex welcome module to autoinstallation in order to
+ display README.BETA in case it exists. (bsc#1047060)
+- 42.3.99.12
+
+-------------------------------------------------------------------
+Thu Aug 17 10:36:53 UTC 2017 - [email protected]
+
+- Use HTTPS protocol for downloading the community repositories
+ (bsc#1054198)
+- 42.3.99.11
+
+-------------------------------------------------------------------
+Thu Aug 3 06:31:13 UTC 2017 - [email protected]
+
+- place skelcd to /usr/lib/skelcd (bsc#1031335)
+- 42.3.99.10
+
+-------------------------------------------------------------------
skelcd-control-openSUSE.changes: same change
Old:
----
skelcd-control-openSUSE-42.3.99.9.tar.bz2
New:
----
skelcd-control-openSUSE-42.3.99.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-openSUSE-promo.spec ++++++
--- /var/tmp/diff_new_pack.ufCFkn/_old 2018-01-17 21:44:18.010552642 +0100
+++ /var/tmp/diff_new_pack.ufCFkn/_new 2018-01-17 21:44:18.010552642 +0100
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-openSUSE-promo
#
-# 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
@@ -27,7 +27,7 @@
#
######################################################################
Name: skelcd-control-openSUSE-promo
-Version: 42.3.99.9
+Version: 42.3.99.18
Release: 0
Summary: The openSUSE Installation Control file
License: MIT
@@ -41,7 +41,7 @@
# xsltproc
BuildRequires: libxslt-tools
# RNG schema
-BuildRequires: yast2-installation-control >= 3.1.7
+BuildRequires: yast2-installation-control >= 4.0.0
######################################################################
#
# Here is the list of Yast packages which are needed in the
@@ -90,6 +90,10 @@
Requires: yast2-vm
%endif
+%if 0%{?suse_version} >= 1500 && !0%{?skelcd_compat}
+%define skelcdpath /usr/lib/skelcd
+%endif
+
%description
This package contains the control file used for openSUSE installation.
@@ -107,15 +111,14 @@
#
# Add control file
#
-mkdir -p %{buildroot}/CD1
-
%if "%{name}" == "skelcd-control-openSUSE-promo"
CONTROL_FILE=control.openSUSE-promo.xml
%else
CONTROL_FILE=control.openSUSE.xml
%endif
-install -m 644 control/$CONTROL_FILE %{buildroot}/CD1/control.xml
+mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
+install -m 644 control/${CONTROL_FILE}
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
%ifarch aarch64 %arm ppc ppc64 ppc64le
%ifarch ppc ppc64 ppc64le
@@ -123,20 +126,23 @@
%else
ports_arch="%{_arch}"
%endif
- sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
#we parse out non existing non-oss repo for ports
- xsltproc -o %{buildroot}/CD1/control_ports.xml control/nonoss.xsl
%{buildroot}/CD1/control.xml
- mv %{buildroot}/CD1/control{_ports,}.xml
- xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng
%{buildroot}/CD1/control.xml
+ xsltproc -o %{buildroot}%{?skelcdpath}/CD1/control.xml control/nonoss.xsl
%{buildroot}%{?skelcdpath}/CD1/control.xml/
+ mv %{buildroot}%{?skelcdpath}/CD1/control{_ports,}.xml
+ xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng
%{buildroot}%{?skelcdpath}/CD1/control.xml
%endif
%files
%defattr(644,root,root,755)
-%dir /CD1
-/CD1/control.xml
+%if %{defined skelcdpath}
+%dir %{skelcdpath}
+%endif
+%dir %{?skelcdpath}/CD1
+%{?skelcdpath}/CD1/control.xml
%changelog
++++++ skelcd-control-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.ufCFkn/_old 2018-01-17 21:44:18.046550957 +0100
+++ /var/tmp/diff_new_pack.ufCFkn/_new 2018-01-17 21:44:18.050550770 +0100
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-openSUSE
#
-# 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
@@ -27,7 +27,7 @@
#
######################################################################
Name: skelcd-control-openSUSE
-Version: 42.3.99.9
+Version: 42.3.99.18
Release: 0
Summary: The openSUSE Installation Control file
License: MIT
@@ -41,7 +41,7 @@
# xsltproc
BuildRequires: libxslt-tools
# RNG schema
-BuildRequires: yast2-installation-control >= 3.1.7
+BuildRequires: yast2-installation-control >= 4.0.0
######################################################################
#
# Here is the list of Yast packages which are needed in the
@@ -90,6 +90,10 @@
Requires: yast2-vm
%endif
+%if 0%{?suse_version} >= 1500 && !0%{?skelcd_compat}
+%define skelcdpath /usr/lib/skelcd
+%endif
+
%description
This package contains the control file used for openSUSE installation.
@@ -107,15 +111,14 @@
#
# Add control file
#
-mkdir -p %{buildroot}/CD1
-
%if "%{name}" == "skelcd-control-openSUSE-promo"
CONTROL_FILE=control.openSUSE-promo.xml
%else
CONTROL_FILE=control.openSUSE.xml
%endif
-install -m 644 control/$CONTROL_FILE %{buildroot}/CD1/control.xml
+mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
+install -m 644 control/${CONTROL_FILE}
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
%ifarch aarch64 %arm ppc ppc64 ppc64le
%ifarch ppc ppc64 ppc64le
@@ -123,20 +126,23 @@
%else
ports_arch="%{_arch}"
%endif
- sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
#we parse out non existing non-oss repo for ports
- xsltproc -o %{buildroot}/CD1/control_ports.xml control/nonoss.xsl
%{buildroot}/CD1/control.xml
- mv %{buildroot}/CD1/control{_ports,}.xml
- xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng
%{buildroot}/CD1/control.xml
+ xsltproc -o %{buildroot}%{?skelcdpath}/CD1/control.xml control/nonoss.xsl
%{buildroot}%{?skelcdpath}/CD1/control.xml/
+ mv %{buildroot}%{?skelcdpath}/CD1/control{_ports,}.xml
+ xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng
%{buildroot}%{?skelcdpath}/CD1/control.xml
%endif
%files
%defattr(644,root,root,755)
-%dir /CD1
-/CD1/control.xml
+%if %{defined skelcdpath}
+%dir %{skelcdpath}
+%endif
+%dir %{?skelcdpath}/CD1
+%{?skelcdpath}/CD1/control.xml
%changelog
++++++ skelcd-control-openSUSE-42.3.99.9.tar.bz2 ->
skelcd-control-openSUSE-42.3.99.18.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-42.3.99.9/control/add-on-installation.glade
new/skelcd-control-openSUSE-42.3.99.18/control/add-on-installation.glade
--- old/skelcd-control-openSUSE-42.3.99.9/control/add-on-installation.glade
2018-01-17 21:44:18.206543469 +0100
+++ new/skelcd-control-openSUSE-42.3.99.18/control/add-on-installation.glade
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to add-on-installation.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-42.3.99.9/control/add-on-installation.xml
new/skelcd-control-openSUSE-42.3.99.18/control/add-on-installation.xml
--- old/skelcd-control-openSUSE-42.3.99.9/control/add-on-installation.xml
2017-06-29 16:24:53.447017347 +0200
+++ new/skelcd-control-openSUSE-42.3.99.18/control/add-on-installation.xml
1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<productDefines xmlns="http://www.suse.com/1.0/yast2ns";
- xmlns:config="http://www.suse.com/1.0/configns";>
-
- <textdomain>add-on</textdomain>
-
- <workflows config:type="list">
- <workflow>
- <label>Add-On Product Installation</label>
-
- <defaults>
- <archs>all</archs>
- </defaults>
-
- <mode>installation</mode>
- <stage>normal</stage>
-
- <modules config:type="list">
- <module>
- <label>Language Installation</label>
- <name>inst_language_add-on</name>
- <enable_back>no</enable_back>
- <enable_next>yes</enable_next>
- </module>
- </modules>
-
- </workflow>
- </workflows>
-</productDefines>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-42.3.99.9/control/control.openSUSE.glade
new/skelcd-control-openSUSE-42.3.99.18/control/control.openSUSE.glade
--- old/skelcd-control-openSUSE-42.3.99.9/control/control.openSUSE.glade
2018-01-17 21:44:18.214543094 +0100
+++ new/skelcd-control-openSUSE-42.3.99.18/control/control.openSUSE.glade
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-symbolic link to control.openSUSE.xml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-42.3.99.9/control/control.openSUSE.xml
new/skelcd-control-openSUSE-42.3.99.18/control/control.openSUSE.xml
--- old/skelcd-control-openSUSE-42.3.99.9/control/control.openSUSE.xml
2017-06-29 16:24:53.447017347 +0200
+++ new/skelcd-control-openSUSE-42.3.99.18/control/control.openSUSE.xml
2018-01-17 13:42:00.000000000 +0100
@@ -68,7 +68,7 @@
<!-- FATE: #303893, #305588: Default to enabled kdump -->
<enable_kdump config:type="boolean">true</enable_kdump>
-
+
<!-- to debug deploying, set to 'true' -->
<debug_deploying config:type="boolean">false</debug_deploying>
</globals>
@@ -94,7 +94,7 @@
<online_repos_preselected
config:type="boolean">false</online_repos_preselected>
<!-- FATE #300898, List of external sources accesible during the
installation time -->
-
<external_sources_link>http://download.opensuse.org/YaST/Repos/openSUSE_Factory_Servers.xml</external_sources_link>
+
<external_sources_link>https://download.opensuse.org/YaST/Repos/openSUSE_Factory_Servers.xml</external_sources_link>
<dropped_packages/>
<extra_urls config:type="list">
@@ -285,104 +285,117 @@
https://github.com/yast/yast-storage/blob/master/doc/config.xml.description
-->
<partitioning>
- <try_separate_home config:type="boolean">true</try_separate_home>
- <limit_try_home>7GB</limit_try_home>
- <root_space_percent>40</root_space_percent>
- <root_base_size>5GB</root_base_size>
- <root_max_size>20GB</root_max_size>
- <proposal_lvm config:type="boolean">false</proposal_lvm>
- <vm_desired_size>15GB</vm_desired_size>
- <vm_home_max_size>25GB</vm_home_max_size>
- <btrfs_increase_percentage
config:type="integer">100</btrfs_increase_percentage>
- <btrfs_default_subvolume>@</btrfs_default_subvolume>
-
- <!-- Subvolumes to be created for a Btrfs root file system -->
- <!-- copy_on_write is true by default -->
- <!-- The XML parser is very simplistic, thus not using attributes, but
sub-elements -->
- <subvolumes config:type="list">
- <subvolume>
- <path>home</path>
- </subvolume>
- <subvolume>
- <path>opt</path>
- </subvolume>
- <subvolume>
- <path>srv</path>
- </subvolume>
- <subvolume>
- <path>tmp</path>
- </subvolume>
- <subvolume>
- <path>usr/local</path>
- </subvolume>
- <subvolume>
- <path>var/cache</path>
- </subvolume>
- <subvolume>
- <path>var/crash</path>
- </subvolume>
- <subvolume>
- <path>var/lib/libvirt/images</path>
- <copy_on_write config:type="boolean">false</copy_on_write>
- </subvolume>
- <subvolume>
- <path>var/lib/machines</path>
- </subvolume>
- <subvolume>
- <path>var/lib/mailman</path>
- </subvolume>
- <subvolume>
- <path>var/lib/mariadb</path>
- <copy_on_write config:type="boolean">false</copy_on_write>
- </subvolume>
- <subvolume>
- <path>var/lib/mysql</path>
- <copy_on_write config:type="boolean">false</copy_on_write>
- </subvolume>
- <subvolume>
- <path>var/lib/named</path>
- </subvolume>
- <subvolume>
- <path>var/lib/pgsql</path>
- <copy_on_write config:type="boolean">false</copy_on_write>
- </subvolume>
- <subvolume>
- <path>var/log</path>
- </subvolume>
- <subvolume>
- <path>var/opt</path>
- </subvolume>
- <subvolume>
- <path>var/spool</path>
- </subvolume>
- <subvolume>
- <path>var/tmp</path>
- </subvolume>
-
- <!-- architecture specific subvolumes -->
-
- <subvolume>
- <path>boot/grub2/i386-pc</path>
- <archs>i386,x86_64</archs>
- </subvolume>
- <subvolume>
- <path>boot/grub2/x86_64-efi</path>
- <archs>x86_64</archs>
- </subvolume>
- <subvolume>
- <path>boot/grub2/powerpc-ieee1275</path>
- <archs>ppc,!board_powernv</archs>
- </subvolume>
- <subvolume>
- <path>boot/grub2/x86_64-efi</path>
- <archs>x86_64</archs>
- </subvolume>
- <subvolume>
- <path>boot/grub2/s390x-emu</path>
- <archs>s390</archs>
- </subvolume>
- </subvolumes>
+ <expert_partitioner_warning
config:type="boolean">false</expert_partitioner_warning>
+
+ <proposal>
+ <lvm config:type="boolean">false</lvm>
+ <proposal_settings_editable
config:type="boolean">true</proposal_settings_editable>
+ <root_subvolume_read_only
config:type="boolean">false</root_subvolume_read_only>
+ </proposal>
+ <volumes config:type="list">
+ <!-- / volume: 5 GiB - 20 GiB, *2 if snapshots are used -->
+ <volume>
+ <mount_point>/</mount_point>
+ <fs_type>btrfs</fs_type>
+
+ <desired_size config:type="disksize">10 GiB</desired_size>
+ <min_size config:type="disksize">5 GiB</min_size>
+ <max_size config:type="disksize">20 GiB</max_size>
+ <weight config:type="integer">60</weight>
+
+ <snapshots config:type="boolean">true</snapshots>
+ <snapshots_configurable
config:type="boolean">true</snapshots_configurable>
+ <snapshots_percentage
config:type="integer">100</snapshots_percentage>
+
+ <!-- the default subvolume "@" was requested by product
management -->
+ <btrfs_default_subvolume>@</btrfs_default_subvolume>
+
+ <!-- subvolumes to be created for a Btrfs root file system -->
+ <!-- copy_on_write is true by default -->
+ <subvolumes config:type="list">
+ <subvolume>
+ <path>home</path>
+ </subvolume>
+ <subvolume>
+ <path>opt</path>
+ </subvolume>
+ <subvolume>
+ <path>srv</path>
+ </subvolume>
+ <subvolume>
+ <path>tmp</path>
+ </subvolume>
+ <subvolume>
+ <path>usr/local</path>
+ </subvolume>
+ <!-- unified var subvolume -
https://lists.opensuse.org/opensuse-packaging/2017-11/msg00017.html -->
+ <subvolume>
+ <path>var</path>
+ <copy_on_write
config:type="boolean">false</copy_on_write>
+ </subvolume>
+
+ <!-- architecture specific subvolumes -->
+
+ <subvolume>
+ <path>boot/grub2/i386-pc</path>
+ <archs>i386,x86_64</archs>
+ </subvolume>
+ <subvolume>
+ <path>boot/grub2/x86_64-efi</path>
+ <archs>x86_64</archs>
+ </subvolume>
+ <subvolume>
+ <path>boot/grub2/powerpc-ieee1275</path>
+ <archs>ppc,!board_powernv</archs>
+ </subvolume>
+ <subvolume>
+ <path>boot/grub2/s390x-emu</path>
+ <archs>s390</archs>
+ </subvolume>
+ </subvolumes>
+ </volume>
+
+ <!-- separate /home: 7 GiB - unlimited -->
+ <volume>
+ <mount_point>/home</mount_point>
+ <fs_type>xfs</fs_type>
+
+ <proposed_configurable
config:type="boolean">true</proposed_configurable>
+
+ <desired_size config:type="disksize">10 GiB</desired_size>
+ <min_size config:type="disksize">7 GiB</min_size>
+ <max_size config:type="disksize">unlimited</max_size>
+ <max_size_lvm config:type="disksize">25 GiB</max_size_lvm>
+ <weight config:type="integer">40</weight>
+
+ <disable_order config:type="integer">1</disable_order>
+
+ <!-- if this volume is disabled we want "/" to increase -->
+ <fallback_for_desired_size>/</fallback_for_desired_size>
+ <fallback_for_max_size>/</fallback_for_max_size>
+ <fallback_for_max_size_lvm>/</fallback_for_max_size_lvm>
+ <fallback_for_weight>/</fallback_for_weight>
+ </volume>
+
+ <!-- swap: 1 GiB - 2 GiB, but at least RAM size -->
+ <volume>
+ <mount_point>swap</mount_point>
+ <fs_type>swap</fs_type>
+
+ <proposed_configurable
config:type="boolean">true</proposed_configurable>
+
+ <desired_size config:type="disksize">2 GiB</desired_size>
+ <min_size config:type="disksize">1 GiB</min_size>
+ <max_size config:type="disksize">2 GiB</max_size>
+ <weight config:type="integer">10</weight>
+ <adjust_by_ram config:type="boolean">true</adjust_by_ram>
+ <adjust_by_ram_configurable
config:type="boolean">true</adjust_by_ram_configurable>
+
+ <disable_order config:type="integer">2</disable_order>
+ </volume>
+
+ </volumes>
</partitioning>
<network>
@@ -399,6 +412,7 @@
<software>
<default_desktop>kde</default_desktop>
</software>
+ <order config:type="integer">100</order>
<no_default config:type="boolean">true</no_default>
</system_role>
@@ -407,6 +421,7 @@
<software>
<default_desktop>gnome</default_desktop>
</software>
+ <order config:type="integer">200</order>
</system_role>
<system_role>
@@ -414,6 +429,7 @@
<software>
<default_desktop>server</default_desktop>
</software>
+ <order config:type="integer">300</order>
</system_role>
<system_role>
@@ -424,6 +440,7 @@
<default_patterns>base enhanced_base</default_patterns>
<default_desktop></default_desktop>
</software>
+ <order config:type="integer">400</order>
</system_role>
</system_roles>
@@ -807,6 +824,11 @@
<label>Installer Update</label>
<name>update_installer</name>
</module>
+ <!-- We need to initialize libzypp in order to read product's
license -->
+ <module>
+ <label>Repositories Initialization</label>
+ <name>repositories_initialization</name>
+ </module>
<module>
<label>Welcome</label>
<name>complex_welcome</name>
@@ -968,6 +990,11 @@
<label>Installer Update</label>
<name>update_installer</name>
</module>
+ <!-- We need to initialize libzypp in order to read product's
license -->
+ <module>
+ <label>Repositories Initialization</label>
+ <name>repositories_initialization</name>
+ </module>
<module>
<name>complex_welcome</name>
<label>Welcome</label>
@@ -1072,6 +1099,18 @@
<enable_back>no</enable_back>
<enable_next>yes</enable_next>
</module>
+ <!-- bsc#1047060: Module used only to display a beta warning
in case README.BETA
+ file exists. Other than that, the module is completely skipped
in auto mode -->
+ <module>
+ <name>complex_welcome</name>
+ <label>Welcome</label>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
+ <arguments>
+ <first_run>yes</first_run>
+ </arguments>
+ <retranslate config:type="boolean">true</retranslate>
+ </module>
<module>
<label>AutoYaST Settings</label>
<name>autoinit</name>
@@ -1146,6 +1185,18 @@
<enable_back>no</enable_back>
<enable_next>yes</enable_next>
</module>
+ <!-- bsc#1047060: Module used only to display a beta warning
in case README.BETA
+ file exists. Other than that, the module is completely skipped
in auto mode -->
+ <module>
+ <name>complex_welcome</name>
+ <label>Welcome</label>
+ <enable_back>no</enable_back>
+ <enable_next>yes</enable_next>
+ <arguments>
+ <first_run>yes</first_run>
+ </arguments>
+ <retranslate config:type="boolean">true</retranslate>
+ </module>
<module>
<label>System Analysis</label>
<name>system_analysis</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-42.3.99.9/package/skelcd-control-openSUSE.changes
new/skelcd-control-openSUSE-42.3.99.18/package/skelcd-control-openSUSE.changes
---
old/skelcd-control-openSUSE-42.3.99.9/package/skelcd-control-openSUSE.changes
2017-06-29 16:24:53.467017347 +0200
+++
new/skelcd-control-openSUSE-42.3.99.18/package/skelcd-control-openSUSE.changes
2018-01-17 13:42:00.000000000 +0100
@@ -1,4 +1,65 @@
-------------------------------------------------------------------
+Wed Jan 17 13:33:36 CET 2018 - [email protected]
+
+- rewrite partitioning section to use new storage-ng setting
+- 42.3.99.18
+
+-------------------------------------------------------------------
+Tue Dec 12 17:11:12 UTC 2017 - [email protected]
+
+- adjust subvolume list to have NoCOW /var instead of many
+ subvolumes (boo#1075369)
+- 42.3.99.17
+
+-------------------------------------------------------------------
+Fri Dec 1 12:21:48 UTC 2017 - [email protected]
+
+- In case prjconf defines skelcd_compat, do not yet move skelcdpath
+ to /usr/lib. This allows TW to move suse_version ahead of
+ SLE15, without being forced to switch to the new product builder
+ (boo#1071232).
+- 42.3.99.16
+
+-------------------------------------------------------------------
+Fri Oct 6 09:56:49 UTC 2017 - [email protected]
+
+- use /usr/lib/skelcd conditionally
+- 42.3.99.15
+
+-------------------------------------------------------------------
+Thu Sep 21 07:09:27 UTC 2017 - [email protected]
+
+- Adapt to changes in roles (needed for fixing bsc#1049297)
+- 42.3.99.14
+
+-------------------------------------------------------------------
+Wed Sep 6 07:46:57 UTC 2017 - [email protected]
+
+- Initialize libzypp in advance in order to read the product's
+ license (fate#322276)
+- 42.3.99.13
+
+-------------------------------------------------------------------
+Wed Aug 30 15:09:35 UTC 2017 - [email protected]
+
+- Added complex welcome module to autoinstallation in order to
+ display README.BETA in case it exists. (bsc#1047060)
+- 42.3.99.12
+
+-------------------------------------------------------------------
+Thu Aug 17 10:36:53 UTC 2017 - [email protected]
+
+- Use HTTPS protocol for downloading the community repositories
+ (bsc#1054198)
+- 42.3.99.11
+
+-------------------------------------------------------------------
+Thu Aug 3 06:31:13 UTC 2017 - [email protected]
+
+- place skelcd to /usr/lib/skelcd (bsc#1031335)
+- 42.3.99.10
+
+-------------------------------------------------------------------
Wed Jun 28 18:06:31 UTC 2017 - [email protected]
- Reword role selection dialog (boo#1045180)
@@ -163,7 +224,7 @@
- Removed not longer necessary items from copy_to_system section
- Added SSH keys import section to the proposal
-- Fate#319624
+- Fate#319624
- 13.2.28
-------------------------------------------------------------------
@@ -197,7 +258,7 @@
- The e17 pattern was renamed to enlightenment a while back, adapt
the Display manager dialog to this change
- by Simon Lees <[email protected]>
+ by Simon Lees <[email protected]>
- 13.2.23
-------------------------------------------------------------------
@@ -224,7 +285,7 @@
-------------------------------------------------------------------
Thu Mar 05 12:23:19 UTC 2015 - [email protected]
-- Change repositories for Tumbleweed for PowerPC as well
+- Change repositories for Tumbleweed for PowerPC as well
- Change repos on ppc64le as well
- 13.2.20
@@ -313,7 +374,7 @@
Thu Feb 27 07:24:10 UTC 2014 - [email protected]
- added reference to linuxrc network configuration client
-- 13.2.7
+- 13.2.7
-------------------------------------------------------------------
Fri Jan 31 13:39:41 UTC 2014 - [email protected]
@@ -369,7 +430,7 @@
- updated control.xml (removed second stage) to validate against
the latest control.rng
-- use http://download.opensuse.org/ports/ppc/ instead of
+- use http://download.opensuse.org/ports/ppc/ instead of
http://powerpc.opensuse.org in online repositories (PPC only)
-------------------------------------------------------------------
@@ -392,12 +453,12 @@
-------------------------------------------------------------------
Fri Sep 27 13:51:41 CEST 2013 - [email protected]
-- yast2-mouse dropped
+- yast2-mouse dropped
-------------------------------------------------------------------
Mon Sep 2 15:17:48 CEST 2013 - [email protected]
-- do not install xorg-x11 (bnc#837450)
+- do not install xorg-x11 (bnc#837450)
-------------------------------------------------------------------
Mon Jun 24 08:52:17 CEST 2013 - [email protected]
@@ -476,7 +537,7 @@
-------------------------------------------------------------------
Mon Sep 26 14:28:50 CEST 2011 - [email protected]
-- also ensure lightdm package is installed
+- also ensure lightdm package is installed
-------------------------------------------------------------------
Mon Sep 26 10:30:45 CEST 2011 - [email protected]
@@ -578,7 +639,7 @@
Tue Nov 24 16:58:22 CET 2009 - [email protected]
- New variable in globals: run_init_scripts_in_parallel, to set
- /etc/sysconfig/boot:RUN_PARALLEL (FaTE#307555)
+ /etc/sysconfig/boot:RUN_PARALLEL (FaTE#307555)
-------------------------------------------------------------------
Fri Nov 6 11:20:46 UTC 2009 - [email protected]
@@ -594,24 +655,24 @@
-------------------------------------------------------------------
Mon Sep 7 15:00:38 CEST 2009 - [email protected]
-- New texts for DE selection dialog (FaTE #306967)
+- New texts for DE selection dialog (FaTE #306967)
-------------------------------------------------------------------
Fri Sep 4 19:00:27 CEST 2009 - [email protected]
-- Introducing unique IDs to unambiguously identify AC steps and
+- Introducing unique IDs to unambiguously identify AC steps and
sub-proposals
-- xfce login manager is back to xdm (bnc#481468)
+- xfce login manager is back to xdm (bnc#481468)
-------------------------------------------------------------------
Wed Aug 26 17:44:50 CEST 2009 - [email protected]
-- KDE is now the default desktop environment (FaTE #306967)
+- KDE is now the default desktop environment (FaTE #306967)
-------------------------------------------------------------------
Fri Aug 14 18:26:49 CEST 2009 - [email protected]
-- Simple network (firewall) configuration in 1st stage (FaTE #303859)
+- Simple network (firewall) configuration in 1st stage (FaTE #303859)
-------------------------------------------------------------------
Mon Aug 10 15:41:20 CEST 2009 - [email protected]
@@ -1429,7 +1490,7 @@
-------------------------------------------------------------------
Tue Jan 25 07:25:26 CET 2005 - [email protected]
-- Fixed arguments of workflow clients. use plain yes/no instead of
+- Fixed arguments of workflow clients. use plain yes/no instead of
false/true
-------------------------------------------------------------------
@@ -1452,12 +1513,12 @@
Wed Sep 15 09:06:18 CEST 2004 - [email protected]
- Added enable_firewall and enable_ssh values
-- Set enable_ssh to false
+- Set enable_ssh to false
-------------------------------------------------------------------
Mon Sep 13 18:24:44 CEST 2004 - [email protected]
-- adjust fam on professional if running GNOME
+- adjust fam on professional if running GNOME
-------------------------------------------------------------------
Mon Sep 13 15:25:14 CEST 2004 - [email protected]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-openSUSE-42.3.99.9/package/skelcd-control-openSUSE.spec
new/skelcd-control-openSUSE-42.3.99.18/package/skelcd-control-openSUSE.spec
--- old/skelcd-control-openSUSE-42.3.99.9/package/skelcd-control-openSUSE.spec
2017-06-29 16:24:53.467017347 +0200
+++ new/skelcd-control-openSUSE-42.3.99.18/package/skelcd-control-openSUSE.spec
2018-01-17 13:42:00.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package skelcd-control-openSUSE
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -27,7 +27,7 @@
#
######################################################################
Name: skelcd-control-openSUSE
-Version: 42.3.99.9
+Version: 42.3.99.18
Release: 0
Summary: The openSUSE Installation Control file
License: MIT
@@ -41,7 +41,7 @@
# xsltproc
BuildRequires: libxslt-tools
# RNG schema
-BuildRequires: yast2-installation-control >= 3.1.7
+BuildRequires: yast2-installation-control >= 4.0.0
######################################################################
#
# Here is the list of Yast packages which are needed in the
@@ -90,6 +90,10 @@
Requires: yast2-vm
%endif
+%if 0%{?suse_version} >= 1500 && !0%{?skelcd_compat}
+%define skelcdpath /usr/lib/skelcd
+%endif
+
%description
This package contains the control file used for openSUSE installation.
@@ -107,15 +111,14 @@
#
# Add control file
#
-mkdir -p %{buildroot}/CD1
-
%if "%{name}" == "skelcd-control-openSUSE-promo"
CONTROL_FILE=control.openSUSE-promo.xml
%else
CONTROL_FILE=control.openSUSE.xml
%endif
-install -m 644 control/$CONTROL_FILE %{buildroot}/CD1/control.xml
+mkdir -p $RPM_BUILD_ROOT%{?skelcdpath}/CD1
+install -m 644 control/${CONTROL_FILE}
$RPM_BUILD_ROOT%{?skelcdpath}/CD1/control.xml
%ifarch aarch64 %arm ppc ppc64 ppc64le
%ifarch ppc ppc64 ppc64le
@@ -123,20 +126,23 @@
%else
ports_arch="%{_arch}"
%endif
- sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
%{buildroot}/CD1/control.xml
- sed -i -e
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
%{buildroot}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/distribution/,http://download.opensuse.org/ports/$ports_arch/distribution/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/tumbleweed/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/debug/,http://download.opensuse.org/ports/$ports_arch/debug/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/source/,http://download.opensuse.org/ports/$ports_arch/source/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
+ sed -i -e
"s,http://download.opensuse.org/update/tumbleweed/,http://download.opensuse.org/ports/$ports_arch/update/tumbleweed/,";
%{buildroot}%{?skelcdpath}/CD1/control.xml
#we parse out non existing non-oss repo for ports
- xsltproc -o %{buildroot}/CD1/control_ports.xml control/nonoss.xsl
%{buildroot}/CD1/control.xml
- mv %{buildroot}/CD1/control{_ports,}.xml
- xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng
%{buildroot}/CD1/control.xml
+ xsltproc -o %{buildroot}%{?skelcdpath}/CD1/control.xml control/nonoss.xsl
%{buildroot}%{?skelcdpath}/CD1/control.xml/
+ mv %{buildroot}%{?skelcdpath}/CD1/control{_ports,}.xml
+ xmllint --noout --relaxng %{_datadir}/YaST2/control/control.rng
%{buildroot}%{?skelcdpath}/CD1/control.xml
%endif
%files
%defattr(644,root,root,755)
-%dir /CD1
-/CD1/control.xml
+%if %{defined skelcdpath}
+%dir %{skelcdpath}
+%endif
+%dir %{?skelcdpath}/CD1
+%{?skelcdpath}/CD1/control.xml
%changelog
