Hello community,

here is the log from the commit of package installation-images for 
openSUSE:Factory checked in at 2019-12-17 13:28:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
 and      /work/SRC/openSUSE:Factory/.installation-images.new.4691 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "installation-images"

Tue Dec 17 13:28:49 2019 rev:83 rq:755254 version:14.450

Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes  
2019-11-20 10:26:55.478558545 +0100
+++ 
/work/SRC/openSUSE:Factory/.installation-images.new.4691/installation-images.changes
        2019-12-17 13:28:50.163437250 +0100
@@ -1,0 +2,22 @@
+Mon Dec 9 14:00:08 UTC 2019 - [email protected]
+
+- merge gh#openSUSE/installation-images#347
+- prepare for syslinux 6.x setup (jsc#SLE-2969)
+- use gfxboot script from repo, not the installed one
+- 14.450
+
+--------------------------------------------------------------------
+Thu Nov 28 12:01:34 UTC 2019 - [email protected]
+
+- merge gh#openSUSE/installation-images#346
+- etc: module.config, fix build on i586 with 5.4 kernel
+- 14.449
+
+--------------------------------------------------------------------
+Thu Nov 28 10:02:20 UTC 2019 - [email protected]
+
+- merge gh#openSUSE/installation-images#345
+- etc: update module.config to match 5.4-final
+- 14.448
+
+--------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.V1eO96/_old  2019-12-17 13:28:50.959436970 +0100
+++ /var/tmp/diff_new_pack.V1eO96/_new  2019-12-17 13:28:50.963436969 +0100
@@ -606,7 +606,7 @@
 Summary:        Installation Image Files for %theme
 License:        GPL-2.0+
 Group:          Metapackages
-Version:        14.447
+Version:        14.450
 Release:        0
 Provides:       installation-images = %version-%release
 Conflicts:      otherproviders(installation-images)

++++++ installation-images-14.447.tar.xz -> installation-images-14.450.tar.xz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.447/VERSION 
new/installation-images-14.450/VERSION
--- old/installation-images-14.447/VERSION      2019-11-15 13:33:06.000000000 
+0100
+++ new/installation-images-14.450/VERSION      2019-12-09 15:00:08.000000000 
+0100
@@ -1 +1 @@
-14.447
+14.450
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.447/changelog 
new/installation-images-14.450/changelog
--- old/installation-images-14.447/changelog    2019-11-15 13:33:06.000000000 
+0100
+++ new/installation-images-14.450/changelog    2019-12-09 15:00:08.000000000 
+0100
@@ -1,3 +1,16 @@
+2019-12-09:    14.450
+       - merge gh#openSUSE/installation-images#347
+       - prepare for syslinux 6.x setup (jsc#SLE-2969)
+       - use gfxboot script from repo, not the installed one
+
+2019-11-28:    14.449
+       - merge gh#openSUSE/installation-images#346
+       - etc: module.config, fix build on i586 with 5.4 kernel
+
+2019-11-28:    14.448
+       - merge gh#openSUSE/installation-images#345
+       - etc: update module.config to match 5.4-final
+
 2019-11-15:    14.447
        - merge gh#openSUSE/installation-images#343
        - Revert "Include KacstOne font for Persian (boo#1092920)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.447/data/boot/boot.file_list 
new/installation-images-14.450/data/boot/boot.file_list
--- old/installation-images-14.447/data/boot/boot.file_list     2019-11-15 
13:33:06.000000000 +0100
+++ new/installation-images-14.450/data/boot/boot.file_list     2019-12-09 
15:00:08.000000000 +0100
@@ -13,10 +13,19 @@
   memtest86+:
     m /boot/memtest.bin /loader/memtest
 
-  syslinux:
-    m /usr/share/syslinux/isolinux.bin /loader
-    m /usr/share/syslinux/gfxboot.c32 /loader
-    e isolinux-config --base=/boot/<arch>/loader loader/isolinux.bin
+  if exists(syslinux6)
+    syslinux6:
+      m /usr/share/syslinux/isolinux.bin /loader
+      m /usr/share/syslinux/gfxboot.c32 /loader
+      m /usr/share/syslinux/ldlinux.c32 /loader
+      m /usr/share/syslinux/libcom32.c32 /loader
+      e isolinux-config --base=/boot/<arch>/loader loader/isolinux.bin
+  else
+    syslinux:
+      m /usr/share/syslinux/isolinux.bin /loader
+      m /usr/share/syslinux/gfxboot.c32 /loader
+      e isolinux-config --base=/boot/<arch>/loader loader/isolinux.bin
+  endif
 
 elsif arch eq 'aarch64'
   <kernel_rpm>:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.447/data/boot/theme.file_list 
new/installation-images-14.450/data/boot/theme.file_list
--- old/installation-images-14.447/data/boot/theme.file_list    2019-11-15 
13:33:06.000000000 +0100
+++ new/installation-images-14.450/data/boot/theme.file_list    2019-12-09 
15:00:08.000000000 +0100
@@ -4,10 +4,15 @@
 
   gfxboot-branding-<gfxboot_theme>:
     /
-    e cp -a etc/bootsplash/themes/<gfxboot_theme>/cdrom/* loader
-    # e gfxboot --config-file=loader/gfxboot.cfg --change-config 
install::dud.url=http://download.opensuse.org/update/openSUSE/driverupdate
-    e gfxboot --config-file=loader/gfxboot.cfg --change-config 
product="<product_name>"
-    e gfxboot --config-file=loader/gfxboot.cfg --change-config 
mainmenu.title="<product_name>"
+    if exists(syslinux6)
+      e gfxboot -a etc/bootsplash/themes/<gfxboot_theme>/cdrom --pack-archive 
loader/bootlogo
+      e gfxboot -a loader/bootlogo --change-config product="<product_name>"
+      e gfxboot -a loader/bootlogo --change-config 
mainmenu.title="<product_name>"
+    else
+      e cp -a etc/bootsplash/themes/<gfxboot_theme>/cdrom/* loader
+      e gfxboot --config-file=loader/gfxboot.cfg --change-config 
product="<product_name>"
+      e gfxboot --config-file=loader/gfxboot.cfg --change-config 
mainmenu.title="<product_name>"
+    endif
 
   r etc var
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.447/etc/module.config 
new/installation-images-14.450/etc/module.config
--- old/installation-images-14.447/etc/module.config    2019-11-15 
13:33:06.000000000 +0100
+++ new/installation-images-14.450/etc/module.config    2019-12-09 
15:00:08.000000000 +0100
@@ -166,7 +166,7 @@
 xen-scsiback
 
 virtio_blk
-virtio_fs
+virtiofs
 virtio_net
 net_failover
 virtio_scsi
@@ -195,7 +195,7 @@
 kernel/drivers/platform/.*
 kernel/drivers/regulator/.*
 kernel/drivers/staging/hv/.*
-kernel/drivers/usb/common/usb-conn-gpio.ko.xz
+kernel/drivers/usb/common/usb-conn-gpio.ko
 kernel/drivers/usb/core/ledtrig-usbport.ko
 kernel/drivers/video/.*
 kernel/drivers/virtio/.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/installation-images-14.447/install.i386 
new/installation-images-14.450/install.i386
--- old/installation-images-14.447/install.i386 2019-11-15 13:33:06.000000000 
+0100
+++ new/installation-images-14.450/install.i386 2019-12-09 15:00:08.000000000 
+0100
@@ -47,8 +47,13 @@
   mkdir -p $DESTDIR/branding/$theme/CD1/boot/$ARCH/loader
 
   # initrd goes to 'loader' dir
-  if [ -e $DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd ] ; then
-    mv $DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd 
$DESTDIR/branding/$theme/CD1/boot/$ARCH/loader/initrd
+  dir=$DESTDIR/branding/$theme/CD1/boot/$ARCH
+  if [ -e $dir/initrd ] ; then
+    mv $dir/initrd $dir/loader/initrd
+    # check for syslinux 6.x setup
+    if [ ! -e $dir/loader/gfxboot.cfg ] ; then
+      tmp/base/usr/sbin/gfxboot -a $dir/loader/bootlogo --change-config 
install::initrd.size=$(stat -c "%s" $dir/loader/initrd)
+    fi
   fi
 
   # cp etc/README $DESTDIR/branding/$theme/CD1/boot/$ARCH


Reply via email to