Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kiwi-templates-Minimal for
openSUSE:Factory checked in at 2025-08-14 11:36:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-templates-Minimal (Old)
and /work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.1085 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-templates-Minimal"
Thu Aug 14 11:36:10 2025 rev:32 rq:1299228 version:84.87.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-templates-Minimal/kiwi-templates-Minimal.changes
2025-06-11 16:21:33.216025527 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-templates-Minimal.new.1085/kiwi-templates-Minimal.changes
2025-08-14 11:36:17.888018905 +0200
@@ -1,0 +2,14 @@
+Wed Jul 30 12:11:29 UTC 2025 - Fabian Vogt <fv...@suse.com>
+
+- Add new platforms:
+ * riscv64 support for kvm-and-xen-sdboot and -grub-bls
+ * s390x-dasd and s390x-Cloud
+ * ppc64le-4096B-qcow2
+- Set the locale to en_US by default to avoid an unnecessary
+ systemd-firstboot prompt
+- Drop net.ifnames=0 (bsc#1244667)
+- Add default network configuration to VMware (bsc#1236342)
+- Install update-bootloader explicitly, was previously pulled in
+ only through shim
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Minimal.kiwi ++++++
--- /var/tmp/diff_new_pack.dVsS7M/_old 2025-08-14 11:36:18.432041637 +0200
+++ /var/tmp/diff_new_pack.dVsS7M/_new 2025-08-14 11:36:18.436041803 +0200
@@ -9,19 +9,23 @@
<specification>openSUSE Tumbleweed Minimal</specification>
</description>
<profiles>
- <profile name="kvm-and-xen-sdboot" description="Minimal Image for KVM
and Xen with systemd-boot" arch="aarch64,x86_64"/>
- <profile name="kvm-and-xen-grub-bls" description="Minimal Image for
KVM and Xen GRUB2 and bootctl" arch="aarch64,x86_64"/>
+ <profile name="kvm-and-xen-sdboot" description="Minimal Image for KVM
and Xen with systemd-boot" arch="aarch64,riscv64,x86_64"/>
+ <profile name="kvm-and-xen-grub-bls" description="Minimal Image for
KVM and Xen GRUB2 and bootctl" arch="aarch64,riscv64,x86_64"/>
<profile name="kvm-and-xen" description="Minimal Image for KVM and
Xen" arch="aarch64,x86_64"/>
<profile name="VMware" description="Minimal Image for VMware"
arch="x86_64"/>
<profile name="MS-HyperV" description="Minimal Image for Hyper-V"
arch="aarch64,x86_64"/>
<profile name="Cloud" description="Minimal Image for Cloud"
arch="aarch64,x86_64"/>
<profile name="RaspberryPi" description="Minimal Image for the
Raspberry Pi" arch="aarch64"/>
+ <profile name="s390x-Cloud" description="Minimal Image for Cloud"
arch="s390x"/>
+ <profile name="s390x-dasd" description="Minimal Image for DASD on z
Systems" arch="s390x"/>
+ <profile name="ppc64le-4096B-qcow2" description="Minimal Image for
ppc64le (qcow2, 4096B sectors)" arch="ppc64le"/>
</profiles>
<preferences profiles="kvm-and-xen" arch="x86_64">
<version>1.0.0</version>
<packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
<type
image="oem"
filesystem="btrfs"
@@ -54,6 +58,7 @@
<version>1.0.0</version>
<packagemanager>zypper</packagemanager>
<rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
<type
image="oem"
filesystem="btrfs"
@@ -89,6 +94,7 @@
<version>1.0.0</version>
<packagemanager>zypper</packagemanager>
<rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
<type
image="oem"
filesystem="btrfs"
@@ -125,6 +131,7 @@
<packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
<type
image="oem"
filesystem="btrfs"
@@ -157,6 +164,7 @@
<packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
<type
image="oem"
filesystem="btrfs"
@@ -184,6 +192,7 @@
<size unit="G">24</size>
<machine memory="1024" HWversion="10" guestOS="sles-64">
<vmdisk id="0" controller="lsilogic"/>
+ <vmnic interface="0" driver="vmxnet3" mode="nat"/>
</machine>
</type>
</preferences>
@@ -193,6 +202,7 @@
<packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
<type
image="oem"
filesystem="xfs"
@@ -214,6 +224,7 @@
<packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
<type
image="oem"
filesystem="btrfs"
@@ -247,6 +258,7 @@
<packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
<type
image="oem"
filesystem="btrfs"
@@ -280,6 +292,7 @@
<packagemanager>zypper</packagemanager>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
<type
image="oem"
initrd_system="dracut"
@@ -312,6 +325,90 @@
</type>
</preferences>
+ <preferences profiles="s390x-dasd">
+ <version>16.0.0</version>
+ <packagemanager>zypper</packagemanager>
+ <bootloader-theme>openSUSE</bootloader-theme>
+ <rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
+ <type
+ image="oem"
+ filesystem="btrfs"
+ bootpartition="true"
+ bootpartsize="300"
+ bootfilesystem="ext4"
+ devicepersistency="by-uuid"
+ target_blocksize="4096"
+ btrfs_root_is_snapshot="true"
+ btrfs_quota_groups="true"
+ bundle_format="%N-Image.%A-%M.%m.%p-%I"
+ >
+ <bootloader name="grub2_s390x_emu" timeout="3" targettype="CDL"/>
+ <systemdisk>
+ <volume name="home"/>
+ <volume name="root"/>
+ <volume name="opt"/>
+ <volume name="srv"/>
+ <volume name="boot/grub2/s390x-emu"
mountpoint="boot/grub2/s390x-emu"/>
+ <volume name="usr/local"/>
+ <volume name="var" copy_on_write="false"/>
+ </systemdisk>
+ <size unit="G">2</size>
+ </type>
+ </preferences>
+
+ <preferences profiles="s390x-Cloud">
+ <version>16.0.0</version>
+ <packagemanager>zypper</packagemanager>
+ <bootloader-theme>openSUSE</bootloader-theme>
+ <rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
+ <type
+ image="oem"
+ filesystem="xfs"
+ format="qcow2"
+ bootpartition="true"
+ bootpartsize="300"
+ bootfilesystem="ext4"
+ devicepersistency="by-uuid"
+ bundle_format="%N-VM.%A-%M.%m.%p-%I"
+ >
+ <bootloader name="grub2_s390x_emu" timeout="3"/>
+ <size unit="G">2</size>
+ </type>
+ </preferences>
+
+ <preferences profiles="ppc64le-4096B-qcow2">
+ <version>16.0.0</version>
+ <packagemanager>zypper</packagemanager>
+ <bootloader-theme>openSUSE</bootloader-theme>
+ <rpm-excludedocs>true</rpm-excludedocs>
+ <locale>en_US</locale>
+ <type
+ image="oem"
+ format="qcow2"
+ filesystem="btrfs"
+ firmware="ofw"
+ devicepersistency="by-uuid"
+ btrfs_quota_groups="true"
+ btrfs_root_is_snapshot="true"
+ target_blocksize="4096"
+ bundle_format="%N-VM.%A-%M.%m.%p-%I"
+ >
+ <systemdisk>
+ <volume name="root"/>
+ <volume name="home"/>
+ <volume name="tmp"/>
+ <volume name="opt"/>
+ <volume name="srv"/>
+ <volume name="boot/grub2/powerpc-ieee1275"/>
+ <volume name="usr/local"/>
+ <volume name="var" copy_on_write="false"/>
+ </systemdisk>
+ <size unit="G">24</size>
+ </type>
+ </preferences>
+
<repository type="rpm-md" >
<source path='obsrepositories:/'/>
</repository>
@@ -350,18 +447,23 @@
<package name="combustion >= 1.2"/> <!-- 1.2+ has improved
firstboot detection -->
<package name="NetworkManager"/>
<package name="dracut-kiwi-oem-repart"/>
+ <package name="update-bootloader"/>
</packages>
<!-- GRUB everywhere except for -grub-bls and -sdboot flavors -->
- <packages type="image"
profiles="kvm-and-xen,VMware,MS-HyperV,Cloud,RaspberryPi">
+ <packages type="image"
profiles="kvm-and-xen,VMware,MS-HyperV,Cloud,RaspberryPi,s390x-dasd,s390x-Cloud,ppc64le-4096B-qcow2">
<package name="grub2"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
- <package name="grub2-branding-openSUSE" bootinclude="true"/>
+ <!-- Not available on s390x -->
+ <package name="grub2-branding-openSUSE"
arch="aarch64,ppc64le,riscv64,x86_64"/>
+ <package name="grub2-riscv64-efi" arch="riscv64"/>
+ <package name="grub2-s390x-emu" arch="s390x"/>
+ <package name="grub2-powerpc-ieee1275" arch="ppc64le"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
</packages>
<!-- Not needed in Cloud as it uses XFS and cloud-init -->
- <packages type="image"
profiles="kvm-and-xen,kvm-and-xen-sdboot,kvm-and-xen-grub-bls,VMware,MS-HyperV,RaspberryPi">
+ <packages type="image"
profiles="kvm-and-xen,kvm-and-xen-sdboot,kvm-and-xen-grub-bls,VMware,MS-HyperV,RaspberryPi,s390x-dasd,ppc64le-4096B-qcow2">
<!-- Only for btrfs -->
<package name="btrfsprogs"/>
<package name="btrfsmaintenance"/>
@@ -376,7 +478,7 @@
<package name="firewalld"/>
</packages>
- <packages type="image" profiles="kvm-and-xen,VMware,MS-HyperV,RaspberryPi">
+ <packages type="image"
profiles="kvm-and-xen,VMware,MS-HyperV,RaspberryPi,s390x-dasd,ppc64le-4096B-qcow2">
<package name="grub2-snapper-plugin"/> <!-- snapper - grub2 -
integration, "small" -->
</packages>
@@ -386,11 +488,11 @@
</packages>
<packages type="image"
profiles="kvm-and-xen,kvm-and-xen-sdboot,kvm-and-xen-grub-bls">
- <package name="xen-tools-domU"/>
- <package name="xen-libs"/>
+ <package name="xen-tools-domU" arch="aarch64,x86_64"/>
+ <package name="xen-libs" arch="aarch64,x86_64"/>
<package name="kernel-default-base"/>
</packages>
- <packages type="image"
profiles="kvm-and-xen,kvm-and-xen-sdboot,kvm-and-xen-grub-bls,Cloud">
+ <packages type="image"
profiles="kvm-and-xen,kvm-and-xen-sdboot,kvm-and-xen-grub-bls,Cloud,s390x-Cloud,ppc64le-4096B-qcow2">
<package name="qemu-guest-agent"/>
</packages>
@@ -410,8 +512,9 @@
</packages>
<packages type="image" profiles="kvm-and-xen-grub-bls">
- <package name="grub2-x86_64-efi-bls" arch="x86_64"/>
<package name="grub2-arm64-efi-bls" arch="aarch64"/>
+ <package name="grub2-riscv64-efi-bls" arch="riscv64"/>
+ <package name="grub2-x86_64-efi-bls" arch="x86_64"/>
</packages>
<packages type="image" profiles="VMware">
@@ -420,17 +523,23 @@
<package name="open-vm-tools" arch="x86_64"/>
<package name="kernel-default-base"/>
</packages>
- <packages type="image" profiles="Cloud">
+ <packages type="image" profiles="Cloud,s390x-Cloud">
<package name="cloud-init"/>
<package name="cloud-init-config-suse"/>
<package name="jeos-firstboot"/>
<package name="xfsprogs"/>
+ </packages>
+ <packages type="image" profiles="Cloud">
<package name="kernel-default-base"/>
</packages>
<packages type="image" profiles="MS-HyperV">
<package name="hyper-v"/>
<package name="kernel-default-base"/>
</packages>
+ <!-- No kernel-default-base for ppc64le and s390x (yet). -->
+ <packages type="image"
profiles="s390x-dasd,s390x-Cloud,ppc64le-4096B-qcow2">
+ <package name="kernel-default"/>
+ </packages>
<packages type="image" profiles="RaspberryPi">
<package name="raspberrypi-eeprom" arch="aarch64"/>
<package name="raspberrypi-firmware" arch="aarch64"/>
@@ -460,7 +569,7 @@
<package name="gzip"/>
</packages>
- <packages type="bootstrap"
profiles="kvm-and-xen,kvm-and-xen-sdboot,kvm-and-xen-grub-bls">
+ <packages type="bootstrap"
profiles="kvm-and-xen,kvm-and-xen-sdboot,kvm-and-xen-grub-bls,s390x-Cloud,ppc64le-4096B-qcow2">
<package name="openSUSE-release-appliance-kvm"/>
</packages>
<packages type="bootstrap" profiles="Cloud">
@@ -472,7 +581,7 @@
<packages type="bootstrap" profiles="VMware">
<package name="openSUSE-release-appliance-vmware"/>
</packages>
- <packages type="bootstrap" profiles="RaspberryPi">
+ <packages type="bootstrap" profiles="RaspberryPi,s390x-dasd">
<package name="openSUSE-release-appliance-custom"/>
</packages>
</image>
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.dVsS7M/_old 2025-08-14 11:36:18.512044979 +0200
+++ /var/tmp/diff_new_pack.dVsS7M/_new 2025-08-14 11:36:18.516045147 +0200
@@ -6,5 +6,8 @@
<flavor>MS-HyperV</flavor>
<flavor>Cloud</flavor>
<flavor>RaspberryPi</flavor>
+ <flavor>s390x-Cloud</flavor>
+ <flavor>s390x-dasd</flavor>
+ <flavor>ppc64le-4096B-qcow2</flavor>
</multibuild>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.dVsS7M/_old 2025-08-14 11:36:18.532045815 +0200
+++ /var/tmp/diff_new_pack.dVsS7M/_new 2025-08-14 11:36:18.536045982 +0200
@@ -68,12 +68,19 @@
systemctl enable cloud-final
fi
-# Enable jeos-firstboot
-mkdir -p /var/lib/YaST2
-touch /var/lib/YaST2/reconfig_system
-
-systemctl mask systemd-firstboot.service
-systemctl enable jeos-firstboot.service
+# Enable jeos-firstboot if installed, disabled by combustion/ignition.
+# However, on s390x without KVM the console is not capable of running
+# jeos-firstboot, use systemd-firstboot as minimal alternative.
+if [[ "$kiwi_profiles" =~ s390x-(dasd|fba|fcp) ]]; then
+ systemctl enable systemd-firstboot
+ # Enable prompting for the root password
+ echo 'root:!unprovisioned' | chpasswd -e
+elif rpm -q --whatprovides jeos-firstboot >/dev/null; then
+ mkdir -p /var/lib/YaST2
+ touch /var/lib/YaST2/reconfig_system
+ systemctl mask systemd-firstboot
+ systemctl enable jeos-firstboot.service
+fi
# Enable firewalld if installed except on VMware
if [ -x /usr/sbin/firewalld ] && [ "$kiwi_profiles" != "VMware" ]; then
@@ -120,12 +127,14 @@
#======================================
# Add default kernel boot options
#--------------------------------------
-cmdline=('rw' 'quiet' 'systemd.show_status=1' 'console=ttyS0,115200'
'console=tty0')
+consoles='console=ttyS0,115200 console=tty0'
+[[ "$kiwi_profiles" == *"ppc64"* ]] && consoles='console=hvc0,115200
console=tty0'
+[[ "$kiwi_profiles" == *"s390x-Cloud"* ]] && consoles='' # autodetect
+[[ "$kiwi_profiles" == *"s390x-dasd"* ]] && consoles='hvc_iucv=8'
+
+cmdline=('rw' 'quiet' 'systemd.show_status=1' ${consoles})
-case "${kiwi_profiles}" in
- *Cloud*) cmdline+=('net.ifnames=0') ;;
- *HyperV*) cmdline+=('earlyprintk=ttyS0,115200' 'rootdelay=300') ;;
-esac
+[[ "$kiwi_profiles" == *"HyperV"* ]] && cmdline+=('rootdelay=300')
# Configure SELinux if installed
# Note: Because of https://github.com/OSInside/kiwi/issues/2709, the root
filesystem
++++++ disk.sh ++++++
--- /var/tmp/diff_new_pack.dVsS7M/_old 2025-08-14 11:36:18.552046650 +0200
+++ /var/tmp/diff_new_pack.dVsS7M/_new 2025-08-14 11:36:18.556046818 +0200
@@ -7,6 +7,7 @@
arch="$(uname -m)"
case "$arch" in
aarch64) arch=aa64 ;;
+ riscv64) arch=riscv64 ;;
x86_64) arch=x64 ;;
*) echo "Unknown arch $arch"; exit 1 ;;
esac
