Hello community,

here is the log from the commit of package livecd-openSUSE for openSUSE:Factory 
checked in at 2019-08-23 11:10:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/livecd-openSUSE (Old)
 and      /work/SRC/openSUSE:Factory/.livecd-openSUSE.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "livecd-openSUSE"

Fri Aug 23 11:10:28 2019 rev:55 rq:725488 version:unknown

Changes:
--------
--- /work/SRC/openSUSE:Factory/livecd-openSUSE/livecd-openSUSE.changes  
2019-07-26 17:34:48.216076342 +0200
+++ 
/work/SRC/openSUSE:Factory/.livecd-openSUSE.new.7948/livecd-openSUSE.changes    
    2019-08-23 11:10:44.226451015 +0200
@@ -1,0 +2,11 @@
+Fri Aug 16 06:58:23 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Use "openSUSE" bootsplash for leap
+
+-------------------------------------------------------------------
+Thu Aug 15 09:22:47 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Use %OS_VERSION_ID% for Leap version and add the
+  kiwi_metainfo_helper OBS service
+
+-------------------------------------------------------------------

New:
----
  _service

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

Other differences:
------------------
++++++ livecd-leap-gnome.kiwi ++++++
--- /var/tmp/diff_new_pack.UylxXb/_old  2019-08-23 11:10:44.830450940 +0200
+++ /var/tmp/diff_new_pack.UylxXb/_new  2019-08-23 11:10:44.834450939 +0200
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-15.1-GNOME-Live" 
displayname="openSUSE Leap 15.1 GNOME Live">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-GNOME-Live" 
displayname="openSUSE Leap %OS_VERSION_ID% GNOME Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>[email protected]</contact>
@@ -13,20 +13,20 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" 
volid="openSUSE_Leap_15.1_GNOME_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" 
volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="bios" 
volid="openSUSE_Leap_15.1_GNOME_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="bios" 
volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>

++++++ livecd-leap-kde.kiwi ++++++
--- /var/tmp/diff_new_pack.UylxXb/_old  2019-08-23 11:10:44.846450938 +0200
+++ /var/tmp/diff_new_pack.UylxXb/_new  2019-08-23 11:10:44.846450938 +0200
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-15.1-KDE-Live" 
displayname="openSUSE Leap 15.1 KDE Live">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-KDE-Live" 
displayname="openSUSE Leap %OS_VERSION_ID% KDE Live">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>[email protected]</contact>
@@ -13,20 +13,20 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" 
volid="openSUSE_Leap_15.1_KDE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" 
volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="bios" 
volid="openSUSE_Leap_15.1_KDE_Live" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="bios" 
volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>

++++++ livecd-leap-x11.kiwi ++++++
--- /var/tmp/diff_new_pack.UylxXb/_old  2019-08-23 11:10:44.858450936 +0200
+++ /var/tmp/diff_new_pack.UylxXb/_new  2019-08-23 11:10:44.858450936 +0200
@@ -2,7 +2,7 @@
 
 <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
 
-<image schemaversion="6.5" name="openSUSE-Leap-15.1-Rescue-CD" 
displayname="openSUSE Leap 15.1 Rescue CD">
+<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-Rescue-CD" 
displayname="openSUSE Leap %OS_VERSION_ID% Rescue CD">
   <description type="system">
     <author>openSUSE Project</author>
     <contact>[email protected]</contact>
@@ -13,20 +13,20 @@
     <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
   </profiles>
   <preferences profiles="EFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" 
volid="openSUSE_Leap_15.1_Rescue_CD" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" 
volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
     <rpm-excludedocs>true</rpm-excludedocs>
   </preferences>
   <preferences profiles="noEFI">
-    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="bios" 
volid="openSUSE_Leap_15.1_Rescue_CD" mediacheck="true"/>
+    <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="bios" 
volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>

livecd-tumbleweed-gnome.kiwi: same change
livecd-tumbleweed-kde.kiwi: same change
livecd-tumbleweed-x11.kiwi: same change
livecd-tumbleweed-xfce.kiwi: same change
++++++ _service ++++++
<services>
        <service mode="buildtime" name="kiwi_metainfo_helper"/>
</services>
++++++ livecd.kiwi.in ++++++
--- /var/tmp/diff_new_pack.UylxXb/_old  2019-08-23 11:10:44.998450920 +0200
+++ /var/tmp/diff_new_pack.UylxXb/_new  2019-08-23 11:10:44.998450920 +0200
@@ -16,7 +16,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="@VOLID@" 
mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>@BOOTSPLASH@</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
@@ -26,7 +26,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent 
quiet" flags="overlay" hybrid="true" hybridpersistent="true" 
hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="@VOLID@" 
mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>@BOOTSPLASH@</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>

++++++ pre-checkin.sh ++++++
--- /var/tmp/diff_new_pack.UylxXb/_old  2019-08-23 11:10:45.014450917 +0200
+++ /var/tmp/diff_new_pack.UylxXb/_new  2019-08-23 11:10:45.014450917 +0200
@@ -32,8 +32,10 @@
 
 for distro in leap tumbleweed; do
        distroname="openSUSE Tumbleweed"
+       bootsplash="bgrt"
        if [ "${distro}" = "leap" ]; then
-               distroname="openSUSE Leap 15.1"
+               distroname="openSUSE Leap %OS_VERSION_ID%"
+               bootsplash="openSUSE"
        fi
 
        for flavor in gnome kde xfce x11; do
@@ -55,6 +57,7 @@
                     s#@NAME@#${name// /-}#g;\
                     s#@DISPLAYNAME@#${name}#g;\
                     s#@VOLID@#${name// /_}#g;\
+                    s#@BOOTSPLASH@#${bootsplash}#g;\
                     s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > 
livecd-${distro}-${flavor}.kiwi      
        done
 done


Reply via email to