Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2017-10-10 11:37:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Tue Oct 10 11:37:05 2017 rev:23 rq:531788 version:14.336
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2017-10-05 11:53:49.182518473 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2017-10-10 11:37:11.170746946 +0200
@@ -0,0 +1,7 @@
+--------------------------------------------------------------------
+Thu Oct 5 14:43:26 UTC 2017 - [email protected]
+
+- merge gh#openSUSE/installation-images#206
+- use the same driver updates for caasp as the dist it is based on
+- 14.336
+
Old:
----
installation-images-14.335.tar.xz
New:
----
installation-images-14.336.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.QKiEmS/_old 2017-10-10 11:37:11.794719561 +0200
+++ /var/tmp/diff_new_pack.QKiEmS/_new 2017-10-10 11:37:11.794719561 +0200
@@ -537,7 +537,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.335
+Version: 14.336
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-14.335.tar.xz -> installation-images-14.336.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.335/VERSION
new/installation-images-14.336/VERSION
--- old/installation-images-14.335/VERSION 2017-09-27 14:00:21.000000000
+0200
+++ new/installation-images-14.336/VERSION 2017-10-05 16:43:26.000000000
+0200
@@ -1 +1 @@
-14.335
+14.336
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.335/changelog
new/installation-images-14.336/changelog
--- old/installation-images-14.335/changelog 2017-09-27 14:00:21.000000000
+0200
+++ new/installation-images-14.336/changelog 2017-10-05 16:43:26.000000000
+0200
@@ -1,3 +1,6 @@
+2017-10-05: 14.336
+ - use the same driver updates for caasp as the dist it is based on
+
2017-09-27: 14.335
- control.xml is now optional
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.335/etc/os_sample.txt
new/installation-images-14.336/etc/os_sample.txt
--- old/installation-images-14.335/etc/os_sample.txt 2017-09-27
14:00:21.000000000 +0200
+++ new/installation-images-14.336/etc/os_sample.txt 2017-10-05
16:43:26.000000000 +0200
@@ -143,3 +143,23 @@
ANSI_COLOR="0;32"
CPE_NAME="cpe:/o:suse:caasp:1.0"
+== caasp20 ==
+
+NAME="CAASP"
+VERSION="2.0"
+VERSION_ID="2.0"
+PRETTY_NAME="SUSE Container as a Service Platform 2.0"
+ID="caasp"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:suse:caasp:2.0"
+
+== caasp30 ==
+
+NAME="CAASP"
+VERSION="3.0"
+VERSION_ID="3.0"
+PRETTY_NAME="SUSE CaaS Platform 3.0"
+ID="caasp"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:suse:caasp:3.0"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.335/lib/ReadConfig.pm
new/installation-images-14.336/lib/ReadConfig.pm
--- old/installation-images-14.335/lib/ReadConfig.pm 2017-09-27
14:00:21.000000000 +0200
+++ new/installation-images-14.336/lib/ReadConfig.pm 2017-10-05
16:43:26.000000000 +0200
@@ -899,9 +899,16 @@
my $is_tw = $dist =~ /^tumbleweed( kubic)?$/;
+ # kubic uses 'tw' as dist tag
$dist = $is_tw ? 'tw' : "$dist$config{VERSION_ID}";
+
+ # there's no separate dist tag for service packs
$dist =~ s/\..*$// if $dist =~ /^(sles|sled)/;
+ # caasp uses the dist it is based on (except for caasp1.0)
+ $dist = "sle12" if $dist eq "caasp2.0";
+ $dist = "sle15" if $dist eq "caasp3.0";
+
# print "dist=\"$dist\"\n";
$ConfigData{os}{update} = "/linux/suse/$realarch-$dist";
