Hello community,

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

Package is "installation-images"

Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes  
2017-01-15 10:57:02.605159687 +0100
+++ 
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 
    2017-01-24 10:30:18.544706976 +0100
@@ -1,0 +2,20 @@
+Thu Jan 19 11:28:37 UTC 2017 - snw...@suse.com
+
+- remove xf86-video-vmware (bsc#1020649)
+- drop glibc-32bit dependencies
+- 14.296
+
+-------------------------------------------------------------------
+Mon Jan 16 16:15:44 UTC 2017 - snw...@suse.com
+
+- rename remaining bits from CASP to CAASP
+- 14.295
+
+-------------------------------------------------------------------
+Mon Jan 16 16:05:46 UTC 2017 - snw...@suse.com
+
+- use TEST_ARCH also in mlist2 script
+- sanitize s390x module config
+- 14.294
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.9cApbH/_old  2017-01-24 10:30:19.276603183 +0100
+++ /var/tmp/diff_new_pack.9cApbH/_new  2017-01-24 10:30:19.280602616 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package installation-images
 #
-# Copyright (c) 2017 SUSE LINUX Products 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
@@ -29,22 +29,31 @@
 # ===  sort out branding  ===
 %if 0%{?is_opensuse}
 %define theme openSUSE
-%define branding openSUSE
-%define branding2 openSUSE
+%define branding_skelcd   openSUSE
+%define branding_systemd  openSUSE
+%define branding_plymouth openSUSE
+%define branding_grub2    openSUSE
+%define branding_gfxboot  openSUSE
 BuildRequires:  openSUSE-release
 BuildRequires:  xf86-input-libinput
 %else
-%if 0%{?is_susecasp}
-%define theme CASP
-%define branding SLE
-%define branding2 CASP
+%if 0%{?is_susecaasp}
+%define theme CAASP
+%define branding_skelcd   CASP
+%define branding_systemd  CAASP
+%define branding_plymouth SLE
+%define branding_grub2    SLE
+%define branding_gfxboot  SLE
 %define config_bootmenu_no_upgrade 1
 BuildRequires:  caasp-release
 BuildRequires:  caasp-release-DVD
 %else
 %define theme SLES
-%define branding SLE
-%define branding2 SLES
+%define branding_skelcd   SLES
+%define branding_systemd  SLE
+%define branding_plymouth SLE
+%define branding_grub2    SLE
+%define branding_gfxboot  SLE
 BuildRequires:  sle12-desktop-migration
 BuildRequires:  sles-release
 %ifarch x86_64 ppc64le
@@ -53,16 +62,16 @@
 %endif
 %endif
 
-BuildRequires:  skelcd-control-%branding2
-BuildRequires:  systemd-presets-branding-%branding
+BuildRequires:  skelcd-control-%branding_skelcd
+BuildRequires:  systemd-presets-branding-%branding_systemd
 %if %with_plymouth
-BuildRequires:  plymouth-branding-%branding
+BuildRequires:  plymouth-branding-%branding_plymouth
 %endif
 %ifarch %ix86 x86_64
-BuildRequires:  gfxboot-branding-%branding
+BuildRequires:  gfxboot-branding-%branding_gfxboot
 %endif
 %ifarch %ix86 x86_64 aarch64
-BuildRequires:  grub2-branding-%branding
+BuildRequires:  grub2-branding-%branding_grub2
 %endif
 # ===  branding end  ===
 
@@ -367,7 +376,7 @@
 BuildRequires:  shim
 %endif
 BuildRequires:  efibootmgr
-BuildRequires:  glibc-32bit
+#!BuildIgnore:  glibc-32bit
 %endif
 %ifarch ia64
 BuildRequires:  acpica
@@ -378,7 +387,6 @@
 BuildRequires:  ia32el
 %endif
 %ifarch s390x
-BuildRequires:  glibc-32bit
 BuildRequires:  s390-tools-hmcdrvfs
 %endif
 %ifarch %ix86 x86_64
@@ -407,7 +415,7 @@
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0+
 Group:          Metapackages
-Version:        14.293
+Version:        14.296
 Release:        0
 Provides:       installation-images-%theme = %version-%release
 Source:         %{name}-%{version}.tar.xz

++++++ installation-images-14.293.tar.xz -> installation-images-14.296.tar.xz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.293/VERSION 
new/installation-images-14.296/VERSION
--- old/installation-images-14.293/VERSION      2017-01-13 16:00:11.000000000 
+0100
+++ new/installation-images-14.296/VERSION      2017-01-19 12:16:46.000000000 
+0100
@@ -1 +1 @@
-14.293
+14.296
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.293/bin/mlist2 
new/installation-images-14.296/bin/mlist2
--- old/installation-images-14.293/bin/mlist2   2017-01-13 16:00:11.000000000 
+0100
+++ new/installation-images-14.296/bin/mlist2   2017-01-19 12:16:46.000000000 
+0100
@@ -38,6 +38,7 @@
 $debug = exists($ENV{'debug'}) ?  $ENV{'debug'} : "";
 
 $arch = `uname -m`; chomp $arch; $arch = "i386" if $arch =~ /^i\d86$/;
+$arch = $ENV{TEST_ARCH} if exists $ENV{TEST_ARCH};
 
 $err = 0;
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.293/changelog 
new/installation-images-14.296/changelog
--- old/installation-images-14.293/changelog    2017-01-13 16:00:11.000000000 
+0100
+++ new/installation-images-14.296/changelog    2017-01-19 12:16:46.000000000 
+0100
@@ -1,3 +1,14 @@
+2017-01-19:    14.296
+       - remove xf86-video-vmware (bsc #1020649)
+       - drop glibc-32bit dependencies
+
+2017-01-16:    14.295
+       - rename remaining bits from CASP to CAASP
+
+2017-01-16:    14.294
+       - use TEST_ARCH also in mlist2 script
+       - sanitize s390x module config
+
 2017-01-13:    14.293
        - follow casp -> caasp renaming in driver update directory
        - adjust module config for kernel 4.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/installation-images-14.293/data/initrd/initrd.file_list 
new/installation-images-14.296/data/initrd/initrd.file_list
--- old/installation-images-14.293/data/initrd/initrd.file_list 2017-01-13 
16:00:11.000000000 +0100
+++ new/installation-images-14.296/data/initrd/initrd.file_list 2017-01-19 
12:16:46.000000000 +0100
@@ -116,12 +116,12 @@
 # add zypp config to initrd to ensure it's writable
 libzypp: nodeps
   /etc
-  if theme eq 'CASP'
+  if theme eq 'CAASP'
     # patch /etc/zypp/zypp.conf (fate #321764); sets
     # solver.onlyRequires = true, rpm.install.excludedocs = yes, multiversion =
-    R s/^[#[:space:]]*(solver.onlyRequires)\s+=.*/# minimal CASP\n$1 = true/ 
etc/zypp/zypp.conf
-    R s/^[#[:space:]]*(rpm.install.excludedocs)\s+=.*/# minimal CASP\n$1 = 
yes/ etc/zypp/zypp.conf
-    R s/^[#[:space:]]*(multiversion)\s+=.*/# minimal CASP\n$1 =/ 
etc/zypp/zypp.conf
+    R s/^[#[:space:]]*(solver.onlyRequires)\s+=.*/# minimal CAASP\n$1 = true/ 
etc/zypp/zypp.conf
+    R s/^[#[:space:]]*(rpm.install.excludedocs)\s+=.*/# minimal CAASP\n$1 = 
yes/ etc/zypp/zypp.conf
+    R s/^[#[:space:]]*(multiversion)\s+=.*/# minimal CAASP\n$1 =/ 
etc/zypp/zypp.conf
   endif
 
 sharutils:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.293/data/root/gdb.file_list 
new/installation-images-14.296/data/root/gdb.file_list
--- old/installation-images-14.293/data/root/gdb.file_list      2017-01-13 
16:00:11.000000000 +0100
+++ new/installation-images-14.296/data/root/gdb.file_list      2017-01-19 
12:16:46.000000000 +0100
@@ -2,7 +2,7 @@
   /
 
 gdb:
-?valgrind:
+?valgrind: nodeps
 yast2-buildtools: ignore
 
 AUTODEPS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.293/data/root/root.file_list 
new/installation-images-14.296/data/root/root.file_list
--- old/installation-images-14.293/data/root/root.file_list     2017-01-13 
16:00:11.000000000 +0100
+++ new/installation-images-14.296/data/root/root.file_list     2017-01-19 
12:16:46.000000000 +0100
@@ -444,7 +444,6 @@
   xf86-video-r128:
   xf86-video-sis:
   ?xf86-video-vesa:
-  ?xf86-video-vmware: nodeps
 
   ?xf86-video-intel: nodeps
     /usr/<lib>/xorg
@@ -503,16 +502,6 @@
   /usr/share
   /var/lib
 
-if arch eq 's390x'
-  # these libs are needed for 32-Bit vnc
-
-  glibc-32bit:
-    /lib/ld*.so
-    /lib/libc.so.6
-    /lib/libdl.so.2
-    /lib/libm.so.6
-endif
-
 if exists(xorg-x11-Xvnc)
   xorg-x11-Xvnc:
     /
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.293/etc/config 
new/installation-images-14.296/etc/config
--- old/installation-images-14.293/etc/config   2017-01-13 16:00:11.000000000 
+0100
+++ new/installation-images-14.296/etc/config   2017-01-19 12:16:46.000000000 
+0100
@@ -112,7 +112,7 @@
 systemd     = SLE
 
 
-[Theme CASP]
+[Theme CAASP]
 image      = 600
 release     = caasp
 skelcd      = casp
@@ -121,7 +121,7 @@
 gfxboot     = SLE
 grub2       = SLE
 plymouth    = SLE
-systemd     = SLE
+systemd     = CAASP
 
 
 [Theme Zen]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.293/etc/module.config 
new/installation-images-14.296/etc/module.config
--- old/installation-images-14.293/etc/module.config    2017-01-13 
16:00:11.000000000 +0100
+++ new/installation-images-14.296/etc/module.config    2017-01-19 
12:16:46.000000000 +0100
@@ -579,54 +579,9 @@
 
 
 [s390]
-cmm
-des_z990
-des_check_key
-sha1_z990
-appldata_os
-appldata_mem
-appldata_net_sum
-ccwgroup
-qdio
-ctcm
-fsm
-smsgiucv
-cu3088
-lcs
-netiucv
-qeth
-qeth_l2
-qeth_l3
-iucv
-tape
-tape_class
-sclp_cpi
-tape_34xx
-zfcp
-dasd_cmb
-dasd_mod
-xpram
-dasd_fba_mod
-dasd_diag_mod
-dcssblk
-dasd_eckd_mod
-z90crypt
-crypt_z990_query
-oprofile
-fs3270
-raw3270
-tty3270
-vmcp
-claw
-monwriter
 af_iucv
-scm_block
-sclp_async
-vmur
-chsc_sch
-eadm_sch
-smsgiucv_app
-hmcdrv
+kernel/drivers/s390/.*
+kernel/arch/s390/.*
 
 
 ; modules we do _not_ need
@@ -650,7 +605,6 @@
 ipwireless
 iscsi_trgt
 joydev
-monreader
 msdos
 parport_ax88796
 parport_cs
@@ -668,10 +622,8 @@
 scr24x_cs
 serial_cs
 slip
-tape_3590
 tun
 veth
-vmlogrdr
 vmwatchdog
 vrf
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.293/install.i386 
new/installation-images-14.296/install.i386
--- old/installation-images-14.293/install.i386 2017-01-13 16:00:11.000000000 
+0100
+++ new/installation-images-14.296/install.i386 2017-01-19 12:16:46.000000000 
+0100
@@ -75,7 +75,7 @@
   t=openSUSE
   [ -d $DESTDIR/branding/SLES ] && t=SLES
   [ -d $DESTDIR/branding/SLED ] && t=SLED
-  [ -d $DESTDIR/branding/CASP ] && t=CASP
+  [ -d $DESTDIR/branding/CAASP ] && t=CAASP
   dst=$DESTDIR/usr/share/rescue-server/boot/x86_64
   mkdir -p $dst
   cp images/rescue-server $dst
@@ -88,7 +88,7 @@
   t=openSUSE
   [ -d $DESTDIR/branding/SLES ] && t=SLES
   [ -d $DESTDIR/branding/SLED ] && t=SLED
-  [ -d $DESTDIR/branding/CASP ] && t=CASP
+  [ -d $DESTDIR/branding/CAASP ] && t=CAASP
   dst=$DESTDIR/branding/Zen/CD1/boot/x86_64
   mkdir -p $dst
   cp images/zenroot $dst/root


Reply via email to