Hello community,

here is the log from the commit of package installation-images for 
openSUSE:Factory checked in at 2018-01-10 23:29:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
 and      /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "installation-images"

Wed Jan 10 23:29:24 2018 rev:32 rq:563294 version:14.352

Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes  
2017-12-15 14:02:20.589428103 +0100
+++ 
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 
    2018-01-10 23:29:25.888175913 +0100
@@ -1,0 +2,32 @@
+Tue Jan 9 13:42:51 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#226
+- simplify definitions for libstoragemgmt image
+- 14.352
+
+-------------------------------------------------------------------
+Tue Jan  9 14:42:09 CET 2018 - [email protected]
+
+- avoid explicit dependency on python-libstoragemgmt
+
+--------------------------------------------------------------------
+Mon Jan 8 16:56:16 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#224
+- switch to using unified-installer-release
+- fix typo: must be sles, not sle
+- 14.351
+
+-------------------------------------------------------------------
+Mon Jan  8 17:52:49 CET 2018 - [email protected]
+
+- clean up spec file and remove support for pre-sle15 distros
+
+--------------------------------------------------------------------
+Mon Jan 8 10:20:41 UTC 2018 - [email protected]
+
+- merge gh#openSUSE/installation-images#223
+- create user/group entries for chrony (fate#323432)
+- 14.350
+
+--------------------------------------------------------------------

Old:
----
  installation-images-14.349.tar.xz

New:
----
  installation-images-14.352.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.WzinxS/_old  2018-01-10 23:29:26.664139492 +0100
+++ /var/tmp/diff_new_pack.WzinxS/_new  2018-01-10 23:29:26.668139305 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package installation-images
 #
-# 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
@@ -28,7 +28,6 @@
 %define with_plymouth 1
 %define with_shim 1
 %define with_storage_ng 1
-%define with_libinput 1
 %bcond_without sbl
 %bcond_without vnc
 %bcond_with xen
@@ -92,10 +91,6 @@
 %define branding_grub2    openSUSE
 %define branding_gfxboot  openSUSE
 BuildRequires:  openSUSE-release
-# only for Leap-42.3 on x86_64 (bsc#1043146):
-%if "%{?sle_version}" == "120300" && "%{_target_cpu}" == "x86_64"
-BuildRequires:  drm-kmp-default
-%endif
 %endif
 
 %if "%theme" == "Kubic"
@@ -114,13 +109,7 @@
 %define branding_plymouth SLE
 %define branding_grub2    SLE
 %define branding_gfxboot  SLE
-BuildRequires:  sled-release
-%if 0%{?sle_version} != 0150000
-%define with_storage_ng 0
-%define with_libinput 0
-BuildRequires:  sled-release-DVD
-BuildRequires:  sle12-desktop-migration
-%endif
+BuildRequires:  unified-installer-release
 %endif
 
 %if "%theme" == "SLES"
@@ -129,16 +118,7 @@
 %define branding_plymouth SLE
 %define branding_grub2    SLE
 %define branding_gfxboot  SLE
-BuildRequires:  sles-release
-%if 0%{?sle_version} != 0150000
-%define with_storage_ng 0
-%define with_libinput 0
-BuildRequires:  sles-release-DVD
-BuildRequires:  sle12-desktop-migration
-%ifarch x86_64 ppc64le
-BuildRequires:  sap-installation-wizard
-%endif
-%endif
+BuildRequires:  unified-installer-release
 %endif
 
 %if "%theme" == "SLES_SAP"
@@ -147,14 +127,7 @@
 %define branding_plymouth SLE
 %define branding_grub2    SLE
 %define branding_gfxboot  SLE
-BuildRequires:  SLES_SAP-installation-release
-%if 0%{?sle_version} != 0150000
-%define with_storage_ng 0
-%define with_libinput 0
-BuildRequires:  sles-release-DVD
-BuildRequires:  sle12-desktop-migration
-BuildRequires:  sap-installation-wizard
-%endif
+BuildRequires:  unified-installer-release
 %endif
 
 %if "%theme" == "CAASP"
@@ -165,11 +138,6 @@
 %define branding_gfxboot  SLE
 %define config_bootmenu_no_upgrade 1
 BuildRequires:  caasp-release
-%if 0%{?sle_version} != 0150000
-%define with_storage_ng 0
-%define with_libinput 0
-BuildRequires:  caasp-release-DVD
-%endif
 %endif
 
 # ===  set product string (based on required packages)  ===
@@ -197,11 +165,9 @@
 ExcludeArch:    %ix86
 %endif
 
-%if 0%{?with_libinput}
 %ifnarch s390x
 BuildRequires:  xf86-input-libinput
 %endif
-%endif
 BuildRequires:  google-roboto-fonts
 BuildRequires:  noto-sans-fonts
 %ifarch ia64 %ix86 x86_64
@@ -398,6 +364,7 @@
 %ifnarch s390 s390x
 BuildRequires:  wpa_supplicant
 %endif
+BuildRequires:  chrony
 BuildRequires:  xauth
 BuildRequires:  xdm
 BuildRequires:  xdpyinfo
@@ -407,7 +374,6 @@
 BuildRequires:  xkbcomp
 BuildRequires:  xkeyboard-config
 BuildRequires:  xmodmap
-BuildRequires:  chrony
 BuildRequires:  xorg-x11-fonts
 BuildRequires:  xorg-x11-server
 BuildRequires:  xrandr
@@ -452,10 +418,10 @@
 %endif
 BuildRequires:  kbd
 %ifarch %ix86 x86_64
+BuildRequires:  xf86-video-amdgpu
 BuildRequires:  xf86-video-intel
-BuildRequires:  xf86-video-vesa
 BuildRequires:  xf86-video-qxl
-BuildRequires:  xf86-video-amdgpu
+BuildRequires:  xf86-video-vesa
 %endif
 BuildRequires:  xf86-input-wacom
 BuildRequires:  xf86-video-fbdev
@@ -521,7 +487,6 @@
 # inst-sys module for libstoragemgmt
 BuildRequires:  libstoragemgmt-netapp-plugin
 BuildRequires:  libstoragemgmt-smis-plugin
-BuildRequires:  python-libstoragemgmt
 # our images are not reproducible and it's taking time
 #!BuildIgnore:  build-compare
 
@@ -537,7 +502,7 @@
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0+
 Group:          Metapackages
-Version:        14.349
+Version:        14.352
 Release:        0
 Provides:       installation-images = %version-%release
 Conflicts:      otherproviders(installation-images)

++++++ installation-images-14.349.tar.xz -> installation-images-14.352.tar.xz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.349/VERSION 
new/installation-images-14.352/VERSION
--- old/installation-images-14.349/VERSION      2017-12-14 15:38:53.000000000 
+0100
+++ new/installation-images-14.352/VERSION      2018-01-09 14:42:51.000000000 
+0100
@@ -1 +1 @@
-14.349
+14.352
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.349/changelog 
new/installation-images-14.352/changelog
--- old/installation-images-14.349/changelog    2017-12-14 15:38:53.000000000 
+0100
+++ new/installation-images-14.352/changelog    2018-01-09 14:42:51.000000000 
+0100
@@ -1,3 +1,13 @@
+2018-01-09:    14.352
+       - simplify definitions for libstoragemgmt image
+
+2018-01-08:    14.351
+       - fix typo: must be sles, not sle
+       - switch to using unified-installer-release
+
+2018-01-08:    14.350
+       - create user/group entries for chrony (fate #323432)
+
 2017-12-14:    14.349
        - allow dangling machine-id symlink (bsc #1027200)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/installation-images-14.349/data/initrd/initrd.file_list 
new/installation-images-14.352/data/initrd/initrd.file_list
--- old/installation-images-14.349/data/initrd/initrd.file_list 2017-12-14 
15:38:53.000000000 +0100
+++ new/installation-images-14.352/data/initrd/initrd.file_list 2018-01-09 
14:42:51.000000000 +0100
@@ -461,6 +461,10 @@
 openslp-server:
   E prein
 
+# we just want the user & group entries
+chrony: nodeps
+  E prein
+
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 #
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/installation-images-14.349/data/root/libstoragemgmt.file_list 
new/installation-images-14.352/data/root/libstoragemgmt.file_list
--- old/installation-images-14.349/data/root/libstoragemgmt.file_list   
2017-12-14 15:38:53.000000000 +0100
+++ new/installation-images-14.352/data/root/libstoragemgmt.file_list   
2018-01-09 14:42:51.000000000 +0100
@@ -2,11 +2,8 @@
   /
 
 libstoragemgmt:
-python-libstoragemgmt:
-libstoragemgmt1:
 libstoragemgmt-netapp-plugin:
 libstoragemgmt-smis-plugin:
-?python-argparse:
 
 AUTODEPS:
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.349/etc/config 
new/installation-images-14.352/etc/config
--- old/installation-images-14.349/etc/config   2017-12-14 15:38:53.000000000 
+0100
+++ new/installation-images-14.352/etc/config   2018-01-09 14:42:51.000000000 
+0100
@@ -90,7 +90,7 @@
 
 [Theme SLES]
 image      = 600
-release     = sles
+release     = unified-installer
 skelcd      = sles
 skelcd_ctrl = leanos
 yast        = SLE
@@ -101,7 +101,7 @@
 
 [Theme SLES_SAP]
 image       = 600
-release     = SLES_SAP-installation
+release     = unified-installer
 skelcd      = sles
 skelcd_ctrl = leanos
 yast        = SLE
@@ -112,7 +112,7 @@
 
 [Theme SLED]
 image      = 600
-release     = sled
+release     = unified-installer
 skelcd      = sled
 skelcd_ctrl = leanos
 yast        = SLE
@@ -146,7 +146,7 @@
 
 [Theme Zen]
 image       = 600
-release     = sles
+release     = unified-installer
 skelcd      = sles
 skelcd_ctrl = leanos
 yast        = SLE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.349/etc/os_sample.txt 
new/installation-images-14.352/etc/os_sample.txt
--- old/installation-images-14.349/etc/os_sample.txt    2017-12-14 
15:38:53.000000000 +0100
+++ new/installation-images-14.352/etc/os_sample.txt    2018-01-09 
14:42:51.000000000 +0100
@@ -123,6 +123,17 @@
 ANSI_COLOR="0;32"
 CPE_NAME="cpe:/o:suse:sles_sap:12:sp1"
 
+== sle15 (unified installer) ==
+
+NAME="SLE"
+VERSION="15"
+VERSION_ID="15"
+PRETTY_NAME="SUSE Linux Enterprise 15"
+ID="sle"
+ID_LIKE="suse"
+ANSI_COLOR="0;32"
+CPE_NAME="cpe:/o:suse:sle:15"
+
 == casp10 [obsolete] ==
 
 NAME="CASP"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.349/lib/ReadConfig.pm 
new/installation-images-14.352/lib/ReadConfig.pm
--- old/installation-images-14.349/lib/ReadConfig.pm    2017-12-14 
15:38:53.000000000 +0100
+++ new/installation-images-14.352/lib/ReadConfig.pm    2018-01-09 
14:42:51.000000000 +0100
@@ -893,6 +893,11 @@
   $dist =~ s/^opensuse[\-\s]*//;
   # special enterprise products may have extra text beside SLES or SLED
   $dist = $1 if $dist =~ /(sles|sled)/;
+
+  # unified installer uses "sle" but we map everything to "sles" as this is
+  # what people are used to
+  $dist = "sles" if $dist eq "sle";
+
   # don't accept other names than these
 
   die "*** unsupported product: $dist ***" if $dist !~ 
/^(casp|caasp|kubic|leap|sles|sled|tumbleweed( kubic)?)$/;
@@ -906,8 +911,8 @@
   $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";
+  $dist = "sles12" if $dist eq "caasp2.0";
+  $dist = "sles15" if $dist eq "caasp3.0";
 
   # print "dist=\"$dist\"\n";
 


Reply via email to