File project.diff of Package JeOS

--- E20-arndale.kiwi.orig
+++ E20-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-chromebook.kiwi.orig
+++ E20-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-cuboxi.kiwi.orig
+++ E20-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-efi.aarch64.kiwi.orig
+++ E20-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-efi.riscv64.kiwi.orig
+++ E20-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-hifiveunmatched.kiwi.orig
+++ E20-hifiveunmatched.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-paz00.kiwi.orig
+++ E20-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-pinephone.kiwi.orig
+++ E20-pinephone.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-E20-pinephone" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-E20-pinephone">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,26 +13,35 @@
     <author>Adrian Campos Garrido</author>
     <contact>adriancampos@teachelp.com</contact>
     <specification>
-   openSUSE Leap-15.3 E20 image for ARM (pinephone) boards
+   openSUSE Leap-15.6 E20 image for ARM (pinephone) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=4 console=ttyS0,115200n8 console=tty0 root=LABEL=ROOT rw rootwait quiet bootsplash.bootfile=bootsplash-themes/opensuse/bootsplash" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="btrfs" btrfs_root_is_snapshot="true" btrfs_quota_groups="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttyS0,115200n8 console=tty0" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>false</oem-swap>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
+      <systemdisk>
+        <volume name="home"/>
+        <volume name="root"/>
+        <volume name="tmp"/>
+        <volume name="opt"/>
+        <volume name="srv"/>
+        <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
+        <volume name="usr/local"/>
+        <volume name="var" copy_on_write="false"/>
+      </systemdisk>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -42,9 +51,21 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-pinephone" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-pinephone-extra" bootinclude="true"/>
+    <package name="kernel-pinephone-optional" bootinclude="true"/>
     <package name="u-boot-pinephone" bootinclude="true"/>
     <package name="dtb-allwinner-pinephone" bootinclude="true"/>
+    <package name="kernel-firmware-ov5640"/>
+    <package name="kernel-firmware-anx7688"/>
+    <package name="kernel-firmware-rtl8723cs"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -53,34 +74,32 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
+    <package name="btrfsprogs"/>
+    <package name="btrfsmaintenance"/>
+    <package name="snapper-zypp-plugin"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
     <package name="gptfdisk" bootinclude="true"/>
     <package name="grub2" bootinclude="true"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="grub2-snapper-plugin"/>
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -88,19 +107,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -116,15 +129,15 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
+    <package name="snapper"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -133,7 +146,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -141,17 +154,16 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
+    <package name="audit"/>
+    <package name="bluez"/>
+    <package name="command-not-found"/>
+    <package name="udisks2"/>
+    <!-- boo#1185739 -->
     <!-- X11+: Common packages for GNOME, KDE, E20, LXQT, X11 and XFCE -->
     <!-- X11+: Patterns list -->
     <package name="patterns-base-x11"/>
     <package name="patterns-base-enhanced_base"/>
+    <package name="patterns-base-transactional_base"/>
     <package name="patterns-base-x11"/>
     <package name="patterns-base-x11_enhanced"/>
     <package name="patterns-desktop-imaging"/>
@@ -163,33 +175,23 @@
     <!-- X11+: Additional software -->
     <package name="ImageMagick"/>
     <package name="Mesa"/>
+    <package name="Mesa-gallium"/>
     <package name="MozillaFirefox"/>
     <package name="MozillaFirefox-branding-openSUSE"/>
     <package name="PackageKit-gstreamer-plugin"/>
-    <package name="a2ps"/>
     <!--<package name="acpica"/>
 <package name="acpid"/> -->
     <package name="alsa-oss"/>
     <package name="alsa-plugins"/>
     <package name="alsa-utils"/>
-    <package name="appres"/>
     <package name="attr"/>
-    <package name="autofs"/>
     <package name="avahi"/>
     <package name="avahi-lang"/>
-    <package name="bdftopcf"/>
-    <package name="beforelight"/>
     <package name="bind-utils"/>
-    <package name="bitmap"/>
     <package name="cantarell-fonts"/>
-    <package name="cdrdao"/>
-    <package name="cdrecord"/>
-    <package name="chromium"/>
     <package name="cifs-utils"/>
     <package name="coreutils"/>
     <package name="cpio"/>
-    <package name="cron"/>
-    <package name="cronie"/>
     <package name="cryptsetup"/>
     <package name="cups"/>
     <package name="cups-client"/>
@@ -214,23 +216,16 @@
     <package name="dmz-icon-theme-cursors"/>
     <package name="dnsmasq"/>
     <package name="dosfstools"/>
-    <package name="droid-fonts"/>
     <package name="dvd+rw-tools"/>
-    <package name="editres"/>
-    <package name="eject"/>
     <package name="ethtool"/>
-    <package name="fifth-leg-font"/>
     <package name="file"/>
-    <package name="fillup"/>
     <package name="findutils"/>
     <package name="firewall-config"/>
     <package name="fonttosfnt"/>
     <package name="foomatic-filters"/>
     <!--<package name="freeglut"/> -->
-    <package name="freerdp"/>
-    <package name="fslsfonts"/>
     <package name="fstobdf"/>
-    <package name="gawk" bootinclude="true"/>
+    <package name="gawk"/>
     <package name="gdb"/>
     <package name="geoclue2"/>
     <!--<package name="gfxboot"/> -->
@@ -260,8 +255,6 @@
     <package name="hdparm"/>
     <package name="hicolor-icon-theme"/>
     <!-- <package name="hplip"/> -->
-    <package name="iceauth"/>
-    <package name="ico"/>
     <package name="ifnteuro"/>
     <package name="info"/>
     <package name="iptables"/>
@@ -269,25 +262,17 @@
     <package name="iso-codes-lang"/>
     <package name="keyutils"/>
     <package name="kpartx"/>
-    <package name="libatm1"/>
-    <package name="libbz2-1"/>
     <package name="liberation-fonts"/>
     <package name="libfam0-gamin"/>
     <package name="libgarcon-branding-openSUSE"/>
     <package name="libgarcon-data"/>
-    <package name="libglib-2_0-0"/>
     <package name="libnotify-tools"/>
     <package name="libnice"/>
-    <package name="libxml2-2"/>
-    <package name="libXaw7"/>
-    <package name="libyui-qt-pkg14"/>
-    <package name="listres"/>
+    <package name="libyui-qt-pkg"/>
     <package name="lockdev"/>
     <package name="logrotate"/>
-    <package name="lsb-release"/>
     <package name="lsof"/>
     <package name="lsscsi"/>
-    <package name="luit"/>
     <package name="lukemftp"/>
     <package name="mailx"/>
     <package name="man"/>
@@ -305,8 +290,6 @@
     <package name="nss-mdns"/>
     <package name="numlockx"/>
     <package name="oclock"/>
-    <package name="openldap2-client"/>
-    <package name="openslp"/>
     <package name="openssl-1_1"/>
     <package name="org.freedesktop.ModemManager"/>
     <package name="parted"/>
@@ -319,27 +302,20 @@
     <package name="pinentry"/>
     <package name="package-update-indicator"/>
     <package name="pkgconfig"/>
-    <package name="postfix"/>
-    <package name="ppp"/>
-    <package name="pptp"/>
     <package name="psmisc"/>
+    <!-- Include pulseaudio - boo#1182176 -->
+    <package name="pulseaudio"/>
+    <package name="pulseaudio-utils"/>
     <package name="python3"/>
-    <package name="python3-base"/>
     <package name="release-notes-openSUSE"/>
-    <package name="rendercheck"/>
-    <package name="rgb"/>
-    <package name="rhino"/>
-    <package name="rstart"/>
     <package name="samba"/>
     <package name="scout"/>
     <package name="sed"/>
-    <package name="sessreg"/>
     <package name="setxkbmap"/>
     <package name="shared-mime-info"/>
     <package name="showfont"/>
     <package name="smp_utils"/>
     <package name="smproxy"/>
-    <package name="smtp_daemon"/>
     <package name="sound-theme-freedesktop"/>
     <package name="sox"/>
     <package name="strace"/>
@@ -349,10 +325,6 @@
     <package name="tar"/>
     <package name="translation-update"/>
     <package name="nscd"/>
-    <package name="update-alternatives"/>
-    <package name="utempter"/>
-    <package name="viewres"/>
-    <package name="vorbis-tools"/>
     <package name="w3m"/>
     <package name="wallpaper-branding"/>
     <package name="wallpaper-branding-openSUSE"/>
@@ -411,7 +383,6 @@
     <package name="xstdcmap"/>
     <package name="xterm"/>
     <package name="xtermset"/>
-    <package name="xvidtune"/>
     <package name="xvinfo"/>
     <package name="xwd"/>
     <package name="xwininfo"/>
@@ -445,46 +416,19 @@
     <package name="xeyes"/>
     <package name="xf86-input-evdev"/>
     <package name="xf86-input-joystick"/>
-    <package name="xf86-input-keyboard"/>
+    <package name="xf86-input-libinput"/>
     <package name="xf86-input-mouse"/>
     <package name="xf86-input-synaptics"/>
-    <!--<package name="xf86-input-vmmouse"/> -->
-    <package name="xf86-input-void"/>
     <package name="xf86-input-wacom"/>
-    <package name="xf86-video-ati"/>
-    <package name="xf86-video-chips"/>
     <package name="xf86-video-cirrus"/>
-    <package name="xf86-video-dummy"/>
-    <package name="xf86-video-glint"/>
-    <package name="xf86-video-i128"/>
     <package name="xf86-video-fbdev"/>
-    <package name="xf86-video-mach64"/>
-    <package name="xf86-video-nv"/>
-    <package name="xf86-video-r128"/>
-    <package name="xf86-video-tdfx"/>
-    <package name="xf86-video-tga"/>
     <package name="xf86-video-vesa"/>
     <!--<package name="xf86-video-vmware"/> -->
-    <package name="xf86-video-voodoo"/>
-    <package name="xf86dga"/>
     <package name="yast2"/>
     <package name="yast2-qt-branding-openSUSE"/>
     <package name="yast2-control-center"/>
     <package name="yast2-scanner"/>
-    <package name="yast2-sound"/>
-    <package name="yp-tools"/>
-    <package name="ypbind"/>
     <package name="zip"/>
-    <package name="zisofs-tools"/>
-    <!-- X11+: multiple choices -->
-    <package name="NetworkManager-branding-openSUSE"/>
-    <package name="input-utils"/>
-    <!-- Choice between input-utils (old) or linuxconsoletools (new) -->
-    <package name="libgfortran4"/>
-    <package name="libwbclient0"/>
-    <!-- Choice between libwbclient0 from samba pkg (old) or sssd-wbclient (new) -->
-    <package name="libharfbuzz0"/>
-    <!-- choice between libharfbuzz0 and libharfbuzz0-bootstrap -->
     <!-- E20: patterns -->
     <package name="patterns-enlightenment-enlightenment"/>
     <!-- E20: usefull recommends -->
@@ -493,7 +437,6 @@
     <!-- E20: Additional packages -->
     <package name="efreet"/>
     <!-- E20: lightdm is required by pattern -->
-    <package name="lightdm-greeter"/>
     <package name="lightdm-gtk-greeter"/>
     <package name="lightdm-gtk-greeter-branding-openSUSE"/>
     <package name="lightdm-lang"/>
@@ -504,10 +447,10 @@
     <package name="NetworkManager-applet"/>
     <package name="NetworkManager-applet-lang"/>
     <package name="NetworkManager-client"/>
+    <package name="NetworkManager-connection-editor"/>
     <package name="NetworkManager-lang"/>
-    <!-- E20: multiple choices -->
-    <package name="enlightenment-branding-openSUSE"/>
-    <package name="enlightenment-theme-openSUSE"/>
+    <!-- provide contrib repo information inside the rootfs -->
+    <archive name="contrib-repo-pinephone.tgz" bootinclude="true"/>
   </packages>
   <packages type="delete">
     <!-- not needed at runtime, but removing would happen too early
--- E20-raspberrypi.aarch64.kiwi.orig
+++ E20-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-raspberrypi2.kiwi.orig
+++ E20-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-rootfs.aarch64.kiwi.orig
+++ E20-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-rootfs.kiwi.orig
+++ E20-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-rootfs.riscv64.kiwi.orig
+++ E20-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-sabrelite.kiwi.orig
+++ E20-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-sinovoipbpim2plus.kiwi.orig
+++ E20-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- E20-sinovoipbpim2zero.kiwi.orig
+++ E20-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-arndale.kiwi.orig
+++ GNOME-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-chromebook.kiwi.orig
+++ GNOME-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-cuboxi.kiwi.orig
+++ GNOME-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-efi.aarch64.kiwi.orig
+++ GNOME-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-efi.riscv64.kiwi.orig
+++ GNOME-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-hifiveunmatched.kiwi.orig
+++ GNOME-hifiveunmatched.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-paz00.kiwi.orig
+++ GNOME-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-pinephone.kiwi.orig
+++ GNOME-pinephone.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-GNOME-pinephone" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-GNOME-pinephone">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,26 +13,35 @@
     <author>Adrian Campos Garrido</author>
     <contact>adriancampos@teachelp.com</contact>
     <specification>
-   openSUSE Leap-15.3 GNOME image for ARM (pinephone) boards
+   openSUSE Leap-15.6 GNOME image for ARM (pinephone) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0 console=ttyS0,115200n8" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="btrfs" btrfs_root_is_snapshot="true" btrfs_quota_groups="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttyS0,115200n8" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>false</oem-swap>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
+      <systemdisk>
+        <volume name="home"/>
+        <volume name="root"/>
+        <volume name="tmp"/>
+        <volume name="opt"/>
+        <volume name="srv"/>
+        <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
+        <volume name="usr/local"/>
+        <volume name="var" copy_on_write="false"/>
+      </systemdisk>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -42,9 +51,21 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-pinephone" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-pinephone-extra" bootinclude="true"/>
+    <package name="kernel-pinephone-optional" bootinclude="true"/>
     <package name="u-boot-pinephone" bootinclude="true"/>
     <package name="dtb-allwinner-pinephone" bootinclude="true"/>
+    <package name="kernel-firmware-ov5640"/>
+    <package name="kernel-firmware-anx7688"/>
+    <package name="kernel-firmware-rtl8723cs"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -53,34 +74,32 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
+    <package name="btrfsprogs"/>
+    <package name="btrfsmaintenance"/>
+    <package name="snapper-zypp-plugin"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
     <package name="gptfdisk" bootinclude="true"/>
     <package name="grub2" bootinclude="true"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="grub2-snapper-plugin"/>
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -88,19 +107,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -116,15 +129,15 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
+    <package name="snapper"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -133,7 +146,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -141,17 +154,16 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
+    <package name="audit"/>
+    <package name="bluez"/>
+    <package name="command-not-found"/>
+    <package name="udisks2"/>
+    <!-- boo#1185739 -->
     <!-- X11+: Common packages for GNOME, KDE, E20, LXQT, X11 and XFCE -->
     <!-- X11+: Patterns list -->
     <package name="patterns-base-x11"/>
     <package name="patterns-base-enhanced_base"/>
+    <package name="patterns-base-transactional_base"/>
     <package name="patterns-base-x11"/>
     <package name="patterns-base-x11_enhanced"/>
     <package name="patterns-desktop-imaging"/>
@@ -162,33 +174,23 @@
     <!-- X11+: Additional software -->
     <package name="ImageMagick"/>
     <package name="Mesa"/>
+    <package name="Mesa-gallium"/>
     <package name="MozillaFirefox"/>
     <package name="MozillaFirefox-branding-openSUSE"/>
     <package name="PackageKit-gstreamer-plugin"/>
-    <package name="a2ps"/>
     <!--<package name="acpica"/>
 <package name="acpid"/> -->
     <package name="alsa-oss"/>
     <package name="alsa-plugins"/>
     <package name="alsa-utils"/>
-    <package name="appres"/>
     <package name="attr"/>
-    <package name="autofs"/>
     <package name="avahi"/>
     <package name="avahi-lang"/>
-    <package name="bdftopcf"/>
-    <package name="beforelight"/>
     <package name="bind-utils"/>
-    <package name="bitmap"/>
     <package name="cantarell-fonts"/>
-    <package name="cdrdao"/>
-    <package name="cdrecord"/>
-    <package name="chromium"/>
     <package name="cifs-utils"/>
     <package name="coreutils"/>
     <package name="cpio"/>
-    <package name="cron"/>
-    <package name="cronie"/>
     <package name="cryptsetup"/>
     <package name="cups"/>
     <package name="cups-client"/>
@@ -213,23 +215,16 @@
     <package name="dmz-icon-theme-cursors"/>
     <package name="dnsmasq"/>
     <package name="dosfstools"/>
-    <package name="droid-fonts"/>
     <package name="dvd+rw-tools"/>
-    <package name="editres"/>
-    <package name="eject"/>
     <package name="ethtool"/>
-    <package name="fifth-leg-font"/>
     <package name="file"/>
-    <package name="fillup"/>
     <package name="findutils"/>
     <package name="firewall-config"/>
     <package name="fonttosfnt"/>
     <package name="foomatic-filters"/>
     <!--<package name="freeglut"/> -->
-    <package name="freerdp"/>
-    <package name="fslsfonts"/>
     <package name="fstobdf"/>
-    <package name="gawk" bootinclude="true"/>
+    <package name="gawk"/>
     <package name="gdb"/>
     <package name="geoclue2"/>
     <!--<package name="gfxboot"/> -->
@@ -259,8 +254,6 @@
     <package name="hdparm"/>
     <package name="hicolor-icon-theme"/>
     <!-- <package name="hplip"/> -->
-    <package name="iceauth"/>
-    <package name="ico"/>
     <package name="ifnteuro"/>
     <package name="info"/>
     <package name="iptables"/>
@@ -268,25 +261,17 @@
     <package name="iso-codes-lang"/>
     <package name="keyutils"/>
     <package name="kpartx"/>
-    <package name="libatm1"/>
-    <package name="libbz2-1"/>
     <package name="liberation-fonts"/>
     <package name="libfam0-gamin"/>
     <package name="libgarcon-branding-openSUSE"/>
     <package name="libgarcon-data"/>
-    <package name="libglib-2_0-0"/>
     <package name="libnotify-tools"/>
     <package name="libnice"/>
-    <package name="libxml2-2"/>
-    <package name="libXaw7"/>
-    <package name="libyui-qt-pkg14"/>
-    <package name="listres"/>
+    <package name="libyui-qt-pkg"/>
     <package name="lockdev"/>
     <package name="logrotate"/>
-    <package name="lsb-release"/>
     <package name="lsof"/>
     <package name="lsscsi"/>
-    <package name="luit"/>
     <package name="lukemftp"/>
     <package name="mailx"/>
     <package name="man"/>
@@ -304,8 +289,6 @@
     <package name="nss-mdns"/>
     <package name="numlockx"/>
     <package name="oclock"/>
-    <package name="openldap2-client"/>
-    <package name="openslp"/>
     <package name="openssl-1_1"/>
     <package name="org.freedesktop.ModemManager"/>
     <package name="parted"/>
@@ -318,27 +301,20 @@
     <package name="pinentry"/>
     <package name="package-update-indicator"/>
     <package name="pkgconfig"/>
-    <package name="postfix"/>
-    <package name="ppp"/>
-    <package name="pptp"/>
     <package name="psmisc"/>
+    <!-- Include pulseaudio - boo#1182176 -->
+    <package name="pulseaudio"/>
+    <package name="pulseaudio-utils"/>
     <package name="python3"/>
-    <package name="python3-base"/>
     <package name="release-notes-openSUSE"/>
-    <package name="rendercheck"/>
-    <package name="rgb"/>
-    <package name="rhino"/>
-    <package name="rstart"/>
     <package name="samba"/>
     <package name="scout"/>
     <package name="sed"/>
-    <package name="sessreg"/>
     <package name="setxkbmap"/>
     <package name="shared-mime-info"/>
     <package name="showfont"/>
     <package name="smp_utils"/>
     <package name="smproxy"/>
-    <package name="smtp_daemon"/>
     <package name="sound-theme-freedesktop"/>
     <package name="sox"/>
     <package name="strace"/>
@@ -348,10 +324,6 @@
     <package name="tar"/>
     <package name="translation-update"/>
     <package name="nscd"/>
-    <package name="update-alternatives"/>
-    <package name="utempter"/>
-    <package name="viewres"/>
-    <package name="vorbis-tools"/>
     <package name="w3m"/>
     <package name="wallpaper-branding"/>
     <package name="wallpaper-branding-openSUSE"/>
@@ -410,7 +382,6 @@
     <package name="xstdcmap"/>
     <package name="xterm"/>
     <package name="xtermset"/>
-    <package name="xvidtune"/>
     <package name="xvinfo"/>
     <package name="xwd"/>
     <package name="xwininfo"/>
@@ -444,46 +415,19 @@
     <package name="xeyes"/>
     <package name="xf86-input-evdev"/>
     <package name="xf86-input-joystick"/>
-    <package name="xf86-input-keyboard"/>
+    <package name="xf86-input-libinput"/>
     <package name="xf86-input-mouse"/>
     <package name="xf86-input-synaptics"/>
-    <!--<package name="xf86-input-vmmouse"/> -->
-    <package name="xf86-input-void"/>
     <package name="xf86-input-wacom"/>
-    <package name="xf86-video-ati"/>
-    <package name="xf86-video-chips"/>
     <package name="xf86-video-cirrus"/>
-    <package name="xf86-video-dummy"/>
-    <package name="xf86-video-glint"/>
-    <package name="xf86-video-i128"/>
     <package name="xf86-video-fbdev"/>
-    <package name="xf86-video-mach64"/>
-    <package name="xf86-video-nv"/>
-    <package name="xf86-video-r128"/>
-    <package name="xf86-video-tdfx"/>
-    <package name="xf86-video-tga"/>
     <package name="xf86-video-vesa"/>
     <!--<package name="xf86-video-vmware"/> -->
-    <package name="xf86-video-voodoo"/>
-    <package name="xf86dga"/>
     <package name="yast2"/>
     <package name="yast2-qt-branding-openSUSE"/>
     <package name="yast2-control-center"/>
     <package name="yast2-scanner"/>
-    <package name="yast2-sound"/>
-    <package name="yp-tools"/>
-    <package name="ypbind"/>
     <package name="zip"/>
-    <package name="zisofs-tools"/>
-    <!-- X11+: multiple choices -->
-    <package name="NetworkManager-branding-openSUSE"/>
-    <package name="input-utils"/>
-    <!-- Choice between input-utils (old) or linuxconsoletools (new) -->
-    <package name="libgfortran4"/>
-    <package name="libwbclient0"/>
-    <!-- Choice between libwbclient0 from samba pkg (old) or sssd-wbclient (new) -->
-    <package name="libharfbuzz0"/>
-    <!-- choice between libharfbuzz0 and libharfbuzz0-bootstrap -->
     <!-- GNOME: patterns -->
     <package name="patterns-gnome-gnome"/>
     <package name="patterns-gnome-gnome_basic"/>
@@ -494,9 +438,22 @@
     <!-- GNOME: Use gdm display manager -->
     <package name="gdm"/>
     <package name="gdm-branding-openSUSE"/>
+    <!-- GNOME: Add some missing recommended packages -->
+    <package name="libgnomesu"/>
+    <package name="nautilus"/>
+    <package name="nautilus-sendto"/>
+    <package name="nautilus-sendto-lang"/>
+    <package name="NetworkManager"/>
+    <package name="NetworkManager-applet"/>
+    <package name="NetworkManager-applet-lang"/>
+    <package name="NetworkManager-client"/>
+    <package name="NetworkManager-connection-editor"/>
+    <package name="NetworkManager-lang"/>
     <!-- GNOME: Additional useful packages -->
     <package name="gnome-shell-search-provider-gnome-terminal"/>
     <package name="gnome-terminal"/>
+    <!-- provide contrib repo information inside the rootfs -->
+    <archive name="contrib-repo-pinephone.tgz" bootinclude="true"/>
   </packages>
   <packages type="delete">
     <!-- not needed at runtime, but removing would happen too early
--- GNOME-raspberrypi.aarch64.kiwi.orig
+++ GNOME-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-raspberrypi2.kiwi.orig
+++ GNOME-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-rootfs.aarch64.kiwi.orig
+++ GNOME-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-rootfs.kiwi.orig
+++ GNOME-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-rootfs.riscv64.kiwi.orig
+++ GNOME-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-sabrelite.kiwi.orig
+++ GNOME-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-sinovoipbpim2plus.kiwi.orig
+++ GNOME-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- GNOME-sinovoipbpim2zero.kiwi.orig
+++ GNOME-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- Images.kiwi.in.orig
+++ Images.kiwi.in
@@ -550,7 +550,7 @@
 #  define KERNEL_CMDLINE_GFX "KERNEL_CMDLINE_DEFAULT console=ttyS0,115200n8 console=tty"
 #  define EXTRA_PACKAGES PKG_BOOT_TAG(dtb-starfive)
 #  define USE_EFI 1
-#elif IS_FLAVOR_efi
+#elif IS_FLAVOR_efi || IS_FLAVOR_n1sdp
 #ifdef USE_VMX
 #  define BOOTKERNEL default-base
 #else
--- JeOS-a13olinuxino.kiwi.orig
+++ JeOS-a13olinuxino.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-a20olinuxinolime.kiwi.orig
+++ JeOS-a20olinuxinolime.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-a20olinuxinomicro.kiwi.orig
+++ JeOS-a20olinuxinomicro.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-arndale.kiwi.orig
+++ JeOS-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-bananapi.kiwi.orig
+++ JeOS-bananapi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-bananapiR2.kiwi.orig
+++ JeOS-bananapiR2.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-beagle.kiwi.orig
+++ JeOS-beagle.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-beaglebone.kiwi.orig
+++ JeOS-beaglebone.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-chromebook.kiwi.orig
+++ JeOS-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-clearfog.kiwi.orig
+++ JeOS-clearfog.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-cubieboard.kiwi.orig
+++ JeOS-cubieboard.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-cubieboard2.kiwi.orig
+++ JeOS-cubieboard2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-cubietruck.kiwi.orig
+++ JeOS-cubietruck.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-cubox.kiwi.orig
+++ JeOS-cubox.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-cuboxi.kiwi.orig
+++ JeOS-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-efi-devel.aarch64.kiwi.orig
+++ JeOS-efi-devel.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-efi-devel.riscv64.kiwi.orig
+++ JeOS-efi-devel.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-efi-pxe.aarch64.kiwi.orig
+++ JeOS-efi-pxe.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-efi-pxe.kiwi.orig
+++ JeOS-efi-pxe.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-efi-pxe.riscv64.kiwi.orig
+++ JeOS-efi-pxe.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-efi-vmx.aarch64.kiwi.orig
+++ JeOS-efi-vmx.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-efi.aarch64.kiwi.orig
+++ JeOS-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-efi.riscv64.kiwi.orig
+++ JeOS-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-hifiveunleashed.kiwi.orig
+++ JeOS-hifiveunleashed.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-hifiveunmatched.kiwi.orig
+++ JeOS-hifiveunmatched.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-hikey960.kiwi.orig
+++ JeOS-hikey960.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-loco.kiwi.orig
+++ JeOS-loco.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-m400-pxe.kiwi.orig
+++ JeOS-m400-pxe.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-JeOS-m400" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-JeOS-m400">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,27 +13,26 @@
     <author>Marcus Sch\U000000e4fer</author>
     <contact>ms@suse.com</contact>
     <specification>
-   openSUSE Leap-15.3 JeOS image for ARM (m400) boards
+   openSUSE Leap-15.6 JeOS image for ARM (m400) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-m400-setup" editbootinstall="uboot-image-m400-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0 console=ttyS0,9600n8r" installpxe="true" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-m400-setup" editbootinstall="uboot-image-m400-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttyS0,9600n8r" installpxe="true" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>true</oem-swap>
         <oem-swapsize>500</oem-swapsize>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -43,8 +42,17 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-default" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-default-extra" bootinclude="true"/>
+    <package name="kernel-default-optional" bootinclude="true"/>
     <package name="dtb-m400" bootinclude="true"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -53,24 +61,19 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
@@ -80,7 +83,6 @@
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -88,19 +90,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -116,15 +112,14 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -133,7 +128,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -141,13 +136,6 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
     <!--Do not install both wicked and Network Manager - boo#1141433-->
     <package name="wicked"/>
     <package name="wicked-service"/>
--- JeOS-midway-pxe.kiwi.orig
+++ JeOS-midway-pxe.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-nanopik2.kiwi.orig
+++ JeOS-nanopik2.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-JeOS-nanopik2" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-JeOS-nanopik2">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,27 +13,26 @@
     <author>Marcus Sch\U000000e4fer</author>
     <contact>ms@suse.com</contact>
     <specification>
-   openSUSE Leap-15.3 JeOS image for ARM (nanopik2) boards
+   openSUSE Leap-15.6 JeOS image for ARM (nanopik2) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-nanopik2-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-nanopik2-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>true</oem-swap>
         <oem-swapsize>500</oem-swapsize>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -43,9 +42,18 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-default" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-default-extra" bootinclude="true"/>
+    <package name="kernel-default-optional" bootinclude="true"/>
     <package name="dtb-amlogic" bootinclude="true"/>
     <package name="bcm43xx-firmware"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -54,24 +62,19 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
@@ -81,7 +84,6 @@
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -89,19 +91,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -117,15 +113,14 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -134,7 +129,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -142,13 +137,6 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
     <!--Do not install both wicked and Network Manager - boo#1141433-->
     <package name="wicked"/>
     <package name="wicked-service"/>
--- JeOS-nanopineo.kiwi.orig
+++ JeOS-nanopineo.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-nanopineoair.kiwi.orig
+++ JeOS-nanopineoair.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-JeOS-nanopineoair" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-JeOS-nanopineoair">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,27 +13,26 @@
     <author>Marcus Sch\U000000e4fer</author>
     <contact>ms@suse.com</contact>
     <specification>
-   openSUSE Leap-15.3 JeOS image for ARM (nanopineoair) boards
+   openSUSE Leap-15.6 JeOS image for ARM (nanopineoair) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-nanopineoair-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-nanopineoair-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>true</oem-swap>
         <oem-swapsize>500</oem-swapsize>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -43,9 +42,18 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-lpae" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-lpae-extra" bootinclude="true"/>
+    <package name="kernel-lpae-optional" bootinclude="true"/>
     <package name="u-boot-nanopineoair" bootinclude="true"/>
     <package name="dtb-sun8i" bootinclude="true"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -54,24 +62,19 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
@@ -81,7 +84,6 @@
     <package name="grub2-arm-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -89,19 +91,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -117,15 +113,14 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -134,7 +129,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -142,13 +137,6 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
     <!--Do not install both wicked and Network Manager - boo#1141433-->
     <package name="wicked"/>
     <package name="wicked-service"/>
--- JeOS-odroid.kiwi.orig
+++ JeOS-odroid.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-JeOS-odroid" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-JeOS-odroid">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,27 +13,26 @@
     <author>Marcus Sch\U000000e4fer</author>
     <contact>ms@suse.com</contact>
     <specification>
-   openSUSE Leap-15.3 JeOS image for ARM (odroid) boards
+   openSUSE Leap-15.6 JeOS image for ARM (odroid) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-odroid-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0 console=ttySAC1,115200n8 console=tty" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-odroid-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttySAC1,115200n8 console=tty" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>true</oem-swap>
         <oem-swapsize>500</oem-swapsize>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -43,10 +42,19 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-default" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-default-extra" bootinclude="true"/>
+    <package name="kernel-default-optional" bootinclude="true"/>
     <package name="u-boot-odroid" bootinclude="true"/>
     <package name="dtb-exynos4" bootinclude="true"/>
     <package name="odroid-firmware" bootinclude="true"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -55,24 +63,19 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
@@ -82,7 +85,6 @@
     <package name="grub2-arm-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -90,19 +92,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -118,15 +114,14 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -135,7 +130,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -143,13 +138,6 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
     <!--Do not install both wicked and Network Manager - boo#1141433-->
     <package name="wicked"/>
     <package name="wicked-service"/>
--- JeOS-odroidc2.kiwi.orig
+++ JeOS-odroidc2.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-JeOS-odroidc2" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-JeOS-odroidc2">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,27 +13,26 @@
     <author>Marcus Sch\U000000e4fer</author>
     <contact>ms@suse.com</contact>
     <specification>
-   openSUSE Leap-15.3 JeOS image for ARM (odroidc2) boards
+   openSUSE Leap-15.6 JeOS image for ARM (odroidc2) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-odroidc2-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-odroidc2-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>true</oem-swap>
         <oem-swapsize>500</oem-swapsize>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -43,9 +42,18 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-default" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-default-extra" bootinclude="true"/>
+    <package name="kernel-default-optional" bootinclude="true"/>
     <package name="odroidc2-firmware" bootinclude="true"/>
     <package name="dtb-amlogic" bootinclude="true"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -54,24 +62,19 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
@@ -81,7 +84,6 @@
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -89,19 +91,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -117,15 +113,14 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -134,7 +129,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -142,13 +137,6 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
     <!--Do not install both wicked and Network Manager - boo#1141433-->
     <package name="wicked"/>
     <package name="wicked-service"/>
--- JeOS-odroidxu3.kiwi.orig
+++ JeOS-odroidxu3.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-JeOS-odroidxu3" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-JeOS-odroidxu3">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,27 +13,26 @@
     <author>Marcus Sch\U000000e4fer</author>
     <contact>ms@suse.com</contact>
     <specification>
-   openSUSE Leap-15.3 JeOS image for ARM (odroidxu3) boards
+   openSUSE Leap-15.6 JeOS image for ARM (odroidxu3) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-odroidxu3-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0 console=ttySAC2,115200n8 console=tty" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-odroidxu3-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttySAC2,115200n8 console=tty" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>true</oem-swap>
         <oem-swapsize>500</oem-swapsize>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -43,10 +42,19 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-lpae" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-lpae-extra" bootinclude="true"/>
+    <package name="kernel-lpae-optional" bootinclude="true"/>
     <package name="u-boot-odroid-xu3" bootinclude="true"/>
     <package name="dtb-exynos5" bootinclude="true"/>
     <package name="odroidxu3-firmware" bootinclude="true"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -55,24 +63,19 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
@@ -82,7 +85,6 @@
     <package name="grub2-arm-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -90,19 +92,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -118,15 +114,14 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -135,7 +130,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -143,13 +138,6 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
     <!--Do not install both wicked and Network Manager - boo#1141433-->
     <package name="wicked"/>
     <package name="wicked-service"/>
--- JeOS-olinuxinolime.kiwi.orig
+++ JeOS-olinuxinolime.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-olinuxinolime2.kiwi.orig
+++ JeOS-olinuxinolime2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-panda.kiwi.orig
+++ JeOS-panda.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-paz00.kiwi.orig
+++ JeOS-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-pinephone.kiwi.orig
+++ JeOS-pinephone.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-JeOS-pinephone" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-JeOS-pinephone">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,26 +13,35 @@
     <author>Adrian Campos Garrido</author>
     <contact>adriancampos@teachelp.com</contact>
     <specification>
-   openSUSE Leap-15.3 JeOS image for ARM (pinephone) boards
+   openSUSE Leap-15.6 JeOS image for ARM (pinephone) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0 console=ttyS0,115200n8" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="btrfs" btrfs_root_is_snapshot="true" btrfs_quota_groups="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttyS0,115200n8" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>false</oem-swap>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
+      <systemdisk>
+        <volume name="home"/>
+        <volume name="root"/>
+        <volume name="tmp"/>
+        <volume name="opt"/>
+        <volume name="srv"/>
+        <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
+        <volume name="usr/local"/>
+        <volume name="var" copy_on_write="false"/>
+      </systemdisk>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -42,9 +51,21 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-pinephone" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-pinephone-extra" bootinclude="true"/>
+    <package name="kernel-pinephone-optional" bootinclude="true"/>
     <package name="u-boot-pinephone" bootinclude="true"/>
     <package name="dtb-allwinner-pinephone" bootinclude="true"/>
+    <package name="kernel-firmware-ov5640"/>
+    <package name="kernel-firmware-anx7688"/>
+    <package name="kernel-firmware-rtl8723cs"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -53,34 +74,32 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
+    <package name="btrfsprogs"/>
+    <package name="btrfsmaintenance"/>
+    <package name="snapper-zypp-plugin"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
     <package name="gptfdisk" bootinclude="true"/>
     <package name="grub2" bootinclude="true"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="grub2-snapper-plugin"/>
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -88,19 +107,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -116,15 +129,15 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
+    <package name="snapper"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -133,7 +146,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -141,16 +154,11 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
     <!--Do not install both wicked and Network Manager - boo#1141433-->
     <package name="wicked"/>
     <package name="wicked-service"/>
+    <!-- provide contrib repo information inside the rootfs -->
+    <archive name="contrib-repo-pinephone.tgz" bootinclude="true"/>
   </packages>
   <packages type="delete">
     <!-- not needed at runtime, but removing would happen too early
--- JeOS-radxazero.kiwi.orig
+++ JeOS-radxazero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-raspberrypi.aarch64.kiwi.orig
+++ JeOS-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-raspberrypi2.kiwi.orig
+++ JeOS-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-sabrelite.kiwi.orig
+++ JeOS-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-sinovoipbpim2plus.kiwi.orig
+++ JeOS-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-sinovoipbpim2zero.kiwi.orig
+++ JeOS-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-socfpgade0nanosoc.kiwi.orig
+++ JeOS-socfpgade0nanosoc.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-udooneo.kiwi.orig
+++ JeOS-udooneo.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-ultra96.kiwi.orig
+++ JeOS-ultra96.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-JeOS-ultra96" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-JeOS-ultra96">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,18 +13,18 @@
     <author>Marcus Sch\U000000e4fer</author>
     <contact>ms@suse.com</contact>
     <specification>
-   openSUSE Leap-15.3 JeOS image for ARM (ultra96) boards
+   openSUSE Leap-15.6 JeOS image for ARM (ultra96) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="btrfs" fsmountoptions="compress=lzo" btrfs_root_is_snapshot="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-ultra96-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0 " disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="btrfs" fsmountoptions="compress=lzo" btrfs_root_is_snapshot="true" btrfs_quota_groups="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="16" editbootinstall="uboot-image-ultra96-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 " disk_start_sector="8192">
       <oemconfig>
         <oem-swap>true</oem-swap>
         <oem-swapsize>500</oem-swapsize>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
-      <systemdisk name="openSUSE Leap 15.3">
+      <systemdisk>
         <volume name="home"/>
         <volume name="root"/>
         <volume name="tmp"/>
@@ -35,15 +35,14 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -53,8 +52,17 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-default" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-default-extra" bootinclude="true"/>
+    <package name="kernel-default-optional" bootinclude="true"/>
     <package name="zynqmp-bootbin" bootinclude="true"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -63,37 +71,32 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
     <package name="btrfsprogs"/>
     <package name="btrfsmaintenance"/>
+    <package name="snapper-zypp-plugin"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
     <package name="gptfdisk" bootinclude="true"/>
     <package name="grub2" bootinclude="true"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
-    <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="grub2-snapper-plugin"/>
+    <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -101,19 +104,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -129,7 +126,8 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
     <package name="snapper"/>
     <package name="sudo"/>
@@ -137,8 +135,6 @@
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -147,7 +143,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -155,13 +151,6 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
     <!--Do not install both wicked and Network Manager - boo#1141433-->
     <package name="wicked"/>
     <package name="wicked-service"/>
--- JeOS-wega.kiwi.orig
+++ JeOS-wega.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-zturn.kiwi.orig
+++ JeOS-zturn.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS-zynqmp.kiwi.orig
+++ JeOS-zynqmp.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-JeOS-zynqmp" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-JeOS-zynqmp">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,18 +13,18 @@
     <author>Marcus Sch\U000000e4fer</author>
     <contact>ms@suse.com</contact>
     <specification>
-   openSUSE Leap-15.3 JeOS image for ARM (zynqmp) boards
+   openSUSE Leap-15.6 JeOS image for ARM (zynqmp) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="btrfs" fsmountoptions="compress=lzo" btrfs_root_is_snapshot="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="42" editbootinstall="uboot-image-zynqmp-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="btrfs" fsmountoptions="compress=lzo" btrfs_root_is_snapshot="true" btrfs_quota_groups="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="42" editbootinstall="uboot-image-zynqmp-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>true</oem-swap>
         <oem-swapsize>500</oem-swapsize>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
-      <systemdisk name="openSUSE Leap 15.3">
+      <systemdisk>
         <volume name="home"/>
         <volume name="root"/>
         <volume name="tmp"/>
@@ -35,15 +35,14 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -53,8 +52,17 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-default" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-default-extra" bootinclude="true"/>
+    <package name="kernel-default-optional" bootinclude="true"/>
     <package name="zynqmp-bootbin" bootinclude="true"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -63,37 +71,32 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
     <package name="btrfsprogs"/>
     <package name="btrfsmaintenance"/>
+    <package name="snapper-zypp-plugin"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
     <package name="gptfdisk" bootinclude="true"/>
     <package name="grub2" bootinclude="true"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
-    <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="grub2-snapper-plugin"/>
+    <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -101,19 +104,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -129,7 +126,8 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
     <package name="snapper"/>
     <package name="sudo"/>
@@ -137,8 +135,6 @@
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -147,7 +143,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -155,13 +151,6 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
     <!--Do not install both wicked and Network Manager - boo#1141433-->
     <package name="wicked"/>
     <package name="wicked-service"/>
--- JeOS.aarch64.kiwi.orig
+++ JeOS.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS.changes.orig
+++ JeOS.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Wed Jun  4 13:22:18 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Diff for N1SDP contrib
+
+-------------------------------------------------------------------
 Fri Mar  7 12:55:33 UTC 2025 - Fabian Vogt <fvogt@suse.com>
 
 - Switch from thunar-plugin-foo to new thunar-foo-plugin names
--- JeOS.kiwi.orig
+++ JeOS.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- JeOS.riscv64.kiwi.orig
+++ JeOS.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-arndale.kiwi.orig
+++ KDE-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-chromebook.kiwi.orig
+++ KDE-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-cuboxi.kiwi.orig
+++ KDE-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-efi.aarch64.kiwi.orig
+++ KDE-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-efi.riscv64.kiwi.orig
+++ KDE-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-hifiveunmatched.kiwi.orig
+++ KDE-hifiveunmatched.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-paz00.kiwi.orig
+++ KDE-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-pinephone.kiwi.orig
+++ KDE-pinephone.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-KDE-pinephone" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-KDE-pinephone">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,26 +13,35 @@
     <author>Adrian Campos Garrido</author>
     <contact>adriancampos@teachelp.com</contact>
     <specification>
-   openSUSE Leap-15.3 KDE image for ARM (pinephone) boards
+   openSUSE Leap-15.6 KDE image for ARM (pinephone) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent plymouth.enable=0 console=ttyS0,115200n8" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="btrfs" btrfs_root_is_snapshot="true" btrfs_quota_groups="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttyS0,115200n8" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>false</oem-swap>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
+      <systemdisk>
+        <volume name="home"/>
+        <volume name="root"/>
+        <volume name="tmp"/>
+        <volume name="opt"/>
+        <volume name="srv"/>
+        <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
+        <volume name="usr/local"/>
+        <volume name="var" copy_on_write="false"/>
+      </systemdisk>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -42,9 +51,21 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-pinephone" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-pinephone-extra" bootinclude="true"/>
+    <package name="kernel-pinephone-optional" bootinclude="true"/>
     <package name="u-boot-pinephone" bootinclude="true"/>
     <package name="dtb-allwinner-pinephone" bootinclude="true"/>
+    <package name="kernel-firmware-ov5640"/>
+    <package name="kernel-firmware-anx7688"/>
+    <package name="kernel-firmware-rtl8723cs"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -53,34 +74,32 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
+    <package name="btrfsprogs"/>
+    <package name="btrfsmaintenance"/>
+    <package name="snapper-zypp-plugin"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
     <package name="gptfdisk" bootinclude="true"/>
     <package name="grub2" bootinclude="true"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="grub2-snapper-plugin"/>
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -88,19 +107,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -116,15 +129,15 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
+    <package name="snapper"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -133,7 +146,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -141,17 +154,16 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
+    <package name="audit"/>
+    <package name="bluez"/>
+    <package name="command-not-found"/>
+    <package name="udisks2"/>
+    <!-- boo#1185739 -->
     <!-- X11+: Common packages for GNOME, KDE, E20, LXQT, X11 and XFCE -->
     <!-- X11+: Patterns list -->
     <package name="patterns-base-x11"/>
     <package name="patterns-base-enhanced_base"/>
+    <package name="patterns-base-transactional_base"/>
     <package name="patterns-base-x11"/>
     <package name="patterns-base-x11_enhanced"/>
     <package name="patterns-desktop-imaging"/>
@@ -163,33 +175,23 @@
     <!-- X11+: Additional software -->
     <package name="ImageMagick"/>
     <package name="Mesa"/>
+    <package name="Mesa-gallium"/>
     <package name="MozillaFirefox"/>
     <package name="MozillaFirefox-branding-openSUSE"/>
     <package name="PackageKit-gstreamer-plugin"/>
-    <package name="a2ps"/>
     <!--<package name="acpica"/>
 <package name="acpid"/> -->
     <package name="alsa-oss"/>
     <package name="alsa-plugins"/>
     <package name="alsa-utils"/>
-    <package name="appres"/>
     <package name="attr"/>
-    <package name="autofs"/>
     <package name="avahi"/>
     <package name="avahi-lang"/>
-    <package name="bdftopcf"/>
-    <package name="beforelight"/>
     <package name="bind-utils"/>
-    <package name="bitmap"/>
     <package name="cantarell-fonts"/>
-    <package name="cdrdao"/>
-    <package name="cdrecord"/>
-    <package name="chromium"/>
     <package name="cifs-utils"/>
     <package name="coreutils"/>
     <package name="cpio"/>
-    <package name="cron"/>
-    <package name="cronie"/>
     <package name="cryptsetup"/>
     <package name="cups"/>
     <package name="cups-client"/>
@@ -214,23 +216,16 @@
     <package name="dmz-icon-theme-cursors"/>
     <package name="dnsmasq"/>
     <package name="dosfstools"/>
-    <package name="droid-fonts"/>
     <package name="dvd+rw-tools"/>
-    <package name="editres"/>
-    <package name="eject"/>
     <package name="ethtool"/>
-    <package name="fifth-leg-font"/>
     <package name="file"/>
-    <package name="fillup"/>
     <package name="findutils"/>
     <package name="firewall-config"/>
     <package name="fonttosfnt"/>
     <package name="foomatic-filters"/>
     <!--<package name="freeglut"/> -->
-    <package name="freerdp"/>
-    <package name="fslsfonts"/>
     <package name="fstobdf"/>
-    <package name="gawk" bootinclude="true"/>
+    <package name="gawk"/>
     <package name="gdb"/>
     <package name="geoclue2"/>
     <!--<package name="gfxboot"/> -->
@@ -260,8 +255,6 @@
     <package name="hdparm"/>
     <package name="hicolor-icon-theme"/>
     <!-- <package name="hplip"/> -->
-    <package name="iceauth"/>
-    <package name="ico"/>
     <package name="ifnteuro"/>
     <package name="info"/>
     <package name="iptables"/>
@@ -269,25 +262,17 @@
     <package name="iso-codes-lang"/>
     <package name="keyutils"/>
     <package name="kpartx"/>
-    <package name="libatm1"/>
-    <package name="libbz2-1"/>
     <package name="liberation-fonts"/>
     <package name="libfam0-gamin"/>
     <package name="libgarcon-branding-openSUSE"/>
     <package name="libgarcon-data"/>
-    <package name="libglib-2_0-0"/>
     <package name="libnotify-tools"/>
     <package name="libnice"/>
-    <package name="libxml2-2"/>
-    <package name="libXaw7"/>
-    <package name="libyui-qt-pkg14"/>
-    <package name="listres"/>
+    <package name="libyui-qt-pkg"/>
     <package name="lockdev"/>
     <package name="logrotate"/>
-    <package name="lsb-release"/>
     <package name="lsof"/>
     <package name="lsscsi"/>
-    <package name="luit"/>
     <package name="lukemftp"/>
     <package name="mailx"/>
     <package name="man"/>
@@ -305,8 +290,6 @@
     <package name="nss-mdns"/>
     <package name="numlockx"/>
     <package name="oclock"/>
-    <package name="openldap2-client"/>
-    <package name="openslp"/>
     <package name="openssl-1_1"/>
     <package name="org.freedesktop.ModemManager"/>
     <package name="parted"/>
@@ -319,27 +302,20 @@
     <package name="pinentry"/>
     <package name="package-update-indicator"/>
     <package name="pkgconfig"/>
-    <package name="postfix"/>
-    <package name="ppp"/>
-    <package name="pptp"/>
     <package name="psmisc"/>
+    <!-- Include pulseaudio - boo#1182176 -->
+    <package name="pulseaudio"/>
+    <package name="pulseaudio-utils"/>
     <package name="python3"/>
-    <package name="python3-base"/>
     <package name="release-notes-openSUSE"/>
-    <package name="rendercheck"/>
-    <package name="rgb"/>
-    <package name="rhino"/>
-    <package name="rstart"/>
     <package name="samba"/>
     <package name="scout"/>
     <package name="sed"/>
-    <package name="sessreg"/>
     <package name="setxkbmap"/>
     <package name="shared-mime-info"/>
     <package name="showfont"/>
     <package name="smp_utils"/>
     <package name="smproxy"/>
-    <package name="smtp_daemon"/>
     <package name="sound-theme-freedesktop"/>
     <package name="sox"/>
     <package name="strace"/>
@@ -349,10 +325,6 @@
     <package name="tar"/>
     <package name="translation-update"/>
     <package name="nscd"/>
-    <package name="update-alternatives"/>
-    <package name="utempter"/>
-    <package name="viewres"/>
-    <package name="vorbis-tools"/>
     <package name="w3m"/>
     <package name="wallpaper-branding"/>
     <package name="wallpaper-branding-openSUSE"/>
@@ -411,7 +383,6 @@
     <package name="xstdcmap"/>
     <package name="xterm"/>
     <package name="xtermset"/>
-    <package name="xvidtune"/>
     <package name="xvinfo"/>
     <package name="xwd"/>
     <package name="xwininfo"/>
@@ -445,46 +416,19 @@
     <package name="xeyes"/>
     <package name="xf86-input-evdev"/>
     <package name="xf86-input-joystick"/>
-    <package name="xf86-input-keyboard"/>
+    <package name="xf86-input-libinput"/>
     <package name="xf86-input-mouse"/>
     <package name="xf86-input-synaptics"/>
-    <!--<package name="xf86-input-vmmouse"/> -->
-    <package name="xf86-input-void"/>
     <package name="xf86-input-wacom"/>
-    <package name="xf86-video-ati"/>
-    <package name="xf86-video-chips"/>
     <package name="xf86-video-cirrus"/>
-    <package name="xf86-video-dummy"/>
-    <package name="xf86-video-glint"/>
-    <package name="xf86-video-i128"/>
     <package name="xf86-video-fbdev"/>
-    <package name="xf86-video-mach64"/>
-    <package name="xf86-video-nv"/>
-    <package name="xf86-video-r128"/>
-    <package name="xf86-video-tdfx"/>
-    <package name="xf86-video-tga"/>
     <package name="xf86-video-vesa"/>
     <!--<package name="xf86-video-vmware"/> -->
-    <package name="xf86-video-voodoo"/>
-    <package name="xf86dga"/>
     <package name="yast2"/>
     <package name="yast2-qt-branding-openSUSE"/>
     <package name="yast2-control-center"/>
     <package name="yast2-scanner"/>
-    <package name="yast2-sound"/>
-    <package name="yp-tools"/>
-    <package name="ypbind"/>
     <package name="zip"/>
-    <package name="zisofs-tools"/>
-    <!-- X11+: multiple choices -->
-    <package name="NetworkManager-branding-openSUSE"/>
-    <package name="input-utils"/>
-    <!-- Choice between input-utils (old) or linuxconsoletools (new) -->
-    <package name="libgfortran4"/>
-    <package name="libwbclient0"/>
-    <!-- Choice between libwbclient0 from samba pkg (old) or sssd-wbclient (new) -->
-    <package name="libharfbuzz0"/>
-    <!-- choice between libharfbuzz0 and libharfbuzz0-bootstrap -->
     <!-- KDE: patterns -->
     <package name="patterns-kde-kde_plasma"/>
     <package name="patterns-openSUSE-kde_utilities"/>
@@ -495,8 +439,6 @@
     <package name="sddm"/>
     <package name="sddm-branding-openSUSE"/>
     <package name="sddm-theme-openSUSE"/>
-    <!-- KDE: Add libQt5Sql5-sqlite to avoid crash on plasma load -->
-    <package name="libQt5Sql5-sqlite"/>
     <!-- KDE: Add openSUSE theme -->
     <package name="plasma5-defaults-openSUSE"/>
     <package name="plasma5-theme-openSUSE"/>
@@ -504,8 +446,12 @@
     <!-- KDE: Additional useful packages -->
     <package name="konsole"/>
     <package name="plasma5-addons"/>
+    <package name="plasma-nm5"/>
+    <!--applet to connect to network - boo#1187580 -->
     <package name="plasma5-pa"/>
     <package name="plasma5-pk-updates"/>
+    <!-- provide contrib repo information inside the rootfs -->
+    <archive name="contrib-repo-pinephone.tgz" bootinclude="true"/>
   </packages>
   <packages type="delete">
     <!-- not needed at runtime, but removing would happen too early
--- KDE-raspberrypi.aarch64.kiwi.orig
+++ KDE-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-raspberrypi2.kiwi.orig
+++ KDE-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-rootfs.aarch64.kiwi.orig
+++ KDE-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-rootfs.kiwi.orig
+++ KDE-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-rootfs.riscv64.kiwi.orig
+++ KDE-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-sabrelite.kiwi.orig
+++ KDE-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-sinovoipbpim2plus.kiwi.orig
+++ KDE-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- KDE-sinovoipbpim2zero.kiwi.orig
+++ KDE-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-arndale.kiwi.orig
+++ LXQT-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-chromebook.kiwi.orig
+++ LXQT-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-cuboxi.kiwi.orig
+++ LXQT-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-efi.aarch64.kiwi.orig
+++ LXQT-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-efi.riscv64.kiwi.orig
+++ LXQT-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-hifiveunmatched.kiwi.orig
+++ LXQT-hifiveunmatched.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-paz00.kiwi.orig
+++ LXQT-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-pinephone.kiwi.orig
+++ LXQT-pinephone.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-LXQT-pinephone" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-LXQT-pinephone">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,26 +13,35 @@
     <author>Adrian Campos Garrido</author>
     <contact>adriancampos@teachelp.com</contact>
     <specification>
-   openSUSE Leap-15.3 LXQT image for ARM (pinephone) boards
+   openSUSE Leap-15.6 LXQT image for ARM (pinephone) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=4 console=ttyS0,115200n8 console=tty0 root=LABEL=ROOT rw rootwait quiet bootsplash.bootfile=bootsplash-themes/opensuse/bootsplash" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="btrfs" btrfs_root_is_snapshot="true" btrfs_quota_groups="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttyS0,115200n8 console=tty0" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>false</oem-swap>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
+      <systemdisk>
+        <volume name="home"/>
+        <volume name="root"/>
+        <volume name="tmp"/>
+        <volume name="opt"/>
+        <volume name="srv"/>
+        <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
+        <volume name="usr/local"/>
+        <volume name="var" copy_on_write="false"/>
+      </systemdisk>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -42,9 +51,21 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-pinephone" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-pinephone-extra" bootinclude="true"/>
+    <package name="kernel-pinephone-optional" bootinclude="true"/>
     <package name="u-boot-pinephone" bootinclude="true"/>
     <package name="dtb-allwinner-pinephone" bootinclude="true"/>
+    <package name="kernel-firmware-ov5640"/>
+    <package name="kernel-firmware-anx7688"/>
+    <package name="kernel-firmware-rtl8723cs"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -53,34 +74,32 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
+    <package name="btrfsprogs"/>
+    <package name="btrfsmaintenance"/>
+    <package name="snapper-zypp-plugin"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
     <package name="gptfdisk" bootinclude="true"/>
     <package name="grub2" bootinclude="true"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="grub2-snapper-plugin"/>
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -88,19 +107,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -116,15 +129,15 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
+    <package name="snapper"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -133,7 +146,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -141,17 +154,16 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
+    <package name="audit"/>
+    <package name="bluez"/>
+    <package name="command-not-found"/>
+    <package name="udisks2"/>
+    <!-- boo#1185739 -->
     <!-- X11+: Common packages for GNOME, KDE, E20, LXQT, X11 and XFCE -->
     <!-- X11+: Patterns list -->
     <package name="patterns-base-x11"/>
     <package name="patterns-base-enhanced_base"/>
+    <package name="patterns-base-transactional_base"/>
     <package name="patterns-base-x11"/>
     <package name="patterns-base-x11_enhanced"/>
     <package name="patterns-desktop-imaging"/>
@@ -163,33 +175,23 @@
     <!-- X11+: Additional software -->
     <package name="ImageMagick"/>
     <package name="Mesa"/>
+    <package name="Mesa-gallium"/>
     <package name="MozillaFirefox"/>
     <package name="MozillaFirefox-branding-openSUSE"/>
     <package name="PackageKit-gstreamer-plugin"/>
-    <package name="a2ps"/>
     <!--<package name="acpica"/>
 <package name="acpid"/> -->
     <package name="alsa-oss"/>
     <package name="alsa-plugins"/>
     <package name="alsa-utils"/>
-    <package name="appres"/>
     <package name="attr"/>
-    <package name="autofs"/>
     <package name="avahi"/>
     <package name="avahi-lang"/>
-    <package name="bdftopcf"/>
-    <package name="beforelight"/>
     <package name="bind-utils"/>
-    <package name="bitmap"/>
     <package name="cantarell-fonts"/>
-    <package name="cdrdao"/>
-    <package name="cdrecord"/>
-    <package name="chromium"/>
     <package name="cifs-utils"/>
     <package name="coreutils"/>
     <package name="cpio"/>
-    <package name="cron"/>
-    <package name="cronie"/>
     <package name="cryptsetup"/>
     <package name="cups"/>
     <package name="cups-client"/>
@@ -214,23 +216,16 @@
     <package name="dmz-icon-theme-cursors"/>
     <package name="dnsmasq"/>
     <package name="dosfstools"/>
-    <package name="droid-fonts"/>
     <package name="dvd+rw-tools"/>
-    <package name="editres"/>
-    <package name="eject"/>
     <package name="ethtool"/>
-    <package name="fifth-leg-font"/>
     <package name="file"/>
-    <package name="fillup"/>
     <package name="findutils"/>
     <package name="firewall-config"/>
     <package name="fonttosfnt"/>
     <package name="foomatic-filters"/>
     <!--<package name="freeglut"/> -->
-    <package name="freerdp"/>
-    <package name="fslsfonts"/>
     <package name="fstobdf"/>
-    <package name="gawk" bootinclude="true"/>
+    <package name="gawk"/>
     <package name="gdb"/>
     <package name="geoclue2"/>
     <!--<package name="gfxboot"/> -->
@@ -260,8 +255,6 @@
     <package name="hdparm"/>
     <package name="hicolor-icon-theme"/>
     <!-- <package name="hplip"/> -->
-    <package name="iceauth"/>
-    <package name="ico"/>
     <package name="ifnteuro"/>
     <package name="info"/>
     <package name="iptables"/>
@@ -269,25 +262,17 @@
     <package name="iso-codes-lang"/>
     <package name="keyutils"/>
     <package name="kpartx"/>
-    <package name="libatm1"/>
-    <package name="libbz2-1"/>
     <package name="liberation-fonts"/>
     <package name="libfam0-gamin"/>
     <package name="libgarcon-branding-openSUSE"/>
     <package name="libgarcon-data"/>
-    <package name="libglib-2_0-0"/>
     <package name="libnotify-tools"/>
     <package name="libnice"/>
-    <package name="libxml2-2"/>
-    <package name="libXaw7"/>
-    <package name="libyui-qt-pkg14"/>
-    <package name="listres"/>
+    <package name="libyui-qt-pkg"/>
     <package name="lockdev"/>
     <package name="logrotate"/>
-    <package name="lsb-release"/>
     <package name="lsof"/>
     <package name="lsscsi"/>
-    <package name="luit"/>
     <package name="lukemftp"/>
     <package name="mailx"/>
     <package name="man"/>
@@ -305,8 +290,6 @@
     <package name="nss-mdns"/>
     <package name="numlockx"/>
     <package name="oclock"/>
-    <package name="openldap2-client"/>
-    <package name="openslp"/>
     <package name="openssl-1_1"/>
     <package name="org.freedesktop.ModemManager"/>
     <package name="parted"/>
@@ -319,27 +302,20 @@
     <package name="pinentry"/>
     <package name="package-update-indicator"/>
     <package name="pkgconfig"/>
-    <package name="postfix"/>
-    <package name="ppp"/>
-    <package name="pptp"/>
     <package name="psmisc"/>
+    <!-- Include pulseaudio - boo#1182176 -->
+    <package name="pulseaudio"/>
+    <package name="pulseaudio-utils"/>
     <package name="python3"/>
-    <package name="python3-base"/>
     <package name="release-notes-openSUSE"/>
-    <package name="rendercheck"/>
-    <package name="rgb"/>
-    <package name="rhino"/>
-    <package name="rstart"/>
     <package name="samba"/>
     <package name="scout"/>
     <package name="sed"/>
-    <package name="sessreg"/>
     <package name="setxkbmap"/>
     <package name="shared-mime-info"/>
     <package name="showfont"/>
     <package name="smp_utils"/>
     <package name="smproxy"/>
-    <package name="smtp_daemon"/>
     <package name="sound-theme-freedesktop"/>
     <package name="sox"/>
     <package name="strace"/>
@@ -349,10 +325,6 @@
     <package name="tar"/>
     <package name="translation-update"/>
     <package name="nscd"/>
-    <package name="update-alternatives"/>
-    <package name="utempter"/>
-    <package name="viewres"/>
-    <package name="vorbis-tools"/>
     <package name="w3m"/>
     <package name="wallpaper-branding"/>
     <package name="wallpaper-branding-openSUSE"/>
@@ -411,7 +383,6 @@
     <package name="xstdcmap"/>
     <package name="xterm"/>
     <package name="xtermset"/>
-    <package name="xvidtune"/>
     <package name="xvinfo"/>
     <package name="xwd"/>
     <package name="xwininfo"/>
@@ -445,46 +416,19 @@
     <package name="xeyes"/>
     <package name="xf86-input-evdev"/>
     <package name="xf86-input-joystick"/>
-    <package name="xf86-input-keyboard"/>
+    <package name="xf86-input-libinput"/>
     <package name="xf86-input-mouse"/>
     <package name="xf86-input-synaptics"/>
-    <!--<package name="xf86-input-vmmouse"/> -->
-    <package name="xf86-input-void"/>
     <package name="xf86-input-wacom"/>
-    <package name="xf86-video-ati"/>
-    <package name="xf86-video-chips"/>
     <package name="xf86-video-cirrus"/>
-    <package name="xf86-video-dummy"/>
-    <package name="xf86-video-glint"/>
-    <package name="xf86-video-i128"/>
     <package name="xf86-video-fbdev"/>
-    <package name="xf86-video-mach64"/>
-    <package name="xf86-video-nv"/>
-    <package name="xf86-video-r128"/>
-    <package name="xf86-video-tdfx"/>
-    <package name="xf86-video-tga"/>
     <package name="xf86-video-vesa"/>
     <!--<package name="xf86-video-vmware"/> -->
-    <package name="xf86-video-voodoo"/>
-    <package name="xf86dga"/>
     <package name="yast2"/>
     <package name="yast2-qt-branding-openSUSE"/>
     <package name="yast2-control-center"/>
     <package name="yast2-scanner"/>
-    <package name="yast2-sound"/>
-    <package name="yp-tools"/>
-    <package name="ypbind"/>
     <package name="zip"/>
-    <package name="zisofs-tools"/>
-    <!-- X11+: multiple choices -->
-    <package name="NetworkManager-branding-openSUSE"/>
-    <package name="input-utils"/>
-    <!-- Choice between input-utils (old) or linuxconsoletools (new) -->
-    <package name="libgfortran4"/>
-    <package name="libwbclient0"/>
-    <!-- Choice between libwbclient0 from samba pkg (old) or sssd-wbclient (new) -->
-    <package name="libharfbuzz0"/>
-    <!-- choice between libharfbuzz0 and libharfbuzz0-bootstrap -->
     <!-- LXQT: patterns -->
     <package name="patterns-lxqt-lxqt"/>
     <!-- LXQT: Add some missing recommended packages -->
@@ -504,8 +448,12 @@
     <package name="system-config-printer-applet"/>
     <!-- LXQT: Additional useful packages (not included in pattern) -->
     <package name="lxqt-theme-openSUSE-default"/>
-    <!-- <package name="lxqt-lightdm-greeter" /> -->
     <package name="lightdm"/>
+    <package name="lightdm-gtk-greeter"/>
+    <package name="lightdm-gtk-greeter-branding-openSUSE"/>
+    <package name="lightdm-lang"/>
+    <!-- provide contrib repo information inside the rootfs -->
+    <archive name="contrib-repo-pinephone.tgz" bootinclude="true"/>
   </packages>
   <packages type="delete">
     <!-- not needed at runtime, but removing would happen too early
--- LXQT-raspberrypi.aarch64.kiwi.orig
+++ LXQT-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-raspberrypi2.kiwi.orig
+++ LXQT-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-rootfs.aarch64.kiwi.orig
+++ LXQT-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-rootfs.kiwi.orig
+++ LXQT-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-rootfs.riscv64.kiwi.orig
+++ LXQT-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-sabrelite.kiwi.orig
+++ LXQT-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-sinovoipbpim2plus.kiwi.orig
+++ LXQT-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- LXQT-sinovoipbpim2zero.kiwi.orig
+++ LXQT-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- PHOSH-pinephone.kiwi.orig
+++ PHOSH-pinephone.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-PHOSH-pinephone" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-PHOSH-pinephone">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,26 +13,35 @@
     <author>Adrian Campos Garrido</author>
     <contact>adriancampos@teachelp.com</contact>
     <specification>
-   openSUSE Leap-15.3 PHOSH image for ARM (pinephone) boards
+   openSUSE Leap-15.6 PHOSH image for ARM (pinephone) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=4 console=ttyS0,115200n8 console=tty0 root=LABEL=ROOT rw rootwait quiet bootsplash.bootfile=bootsplash-themes/opensuse/bootsplash" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="btrfs" btrfs_root_is_snapshot="true" btrfs_quota_groups="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttyS0,115200n8 console=tty0" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>false</oem-swap>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
+      <systemdisk>
+        <volume name="home"/>
+        <volume name="root"/>
+        <volume name="tmp"/>
+        <volume name="opt"/>
+        <volume name="srv"/>
+        <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
+        <volume name="usr/local"/>
+        <volume name="var" copy_on_write="false"/>
+      </systemdisk>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -42,9 +51,21 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-pinephone" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-pinephone-extra" bootinclude="true"/>
+    <package name="kernel-pinephone-optional" bootinclude="true"/>
     <package name="u-boot-pinephone" bootinclude="true"/>
     <package name="dtb-allwinner-pinephone" bootinclude="true"/>
+    <package name="kernel-firmware-ov5640"/>
+    <package name="kernel-firmware-anx7688"/>
+    <package name="kernel-firmware-rtl8723cs"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -53,34 +74,32 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
+    <package name="btrfsprogs"/>
+    <package name="btrfsmaintenance"/>
+    <package name="snapper-zypp-plugin"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
     <package name="gptfdisk" bootinclude="true"/>
     <package name="grub2" bootinclude="true"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="grub2-snapper-plugin"/>
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -88,19 +107,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -116,15 +129,15 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
+    <package name="snapper"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -133,7 +146,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -141,67 +154,23 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
+    <package name="audit"/>
+    <package name="bluez"/>
+    <package name="command-not-found"/>
+    <package name="udisks2"/>
+    <!-- boo#1185739 -->
     <package name="NetworkManager"/>
+    <package name="Mesa-gallium"/>
     <!-- PHOSH: Packages -->
-    <package name="phosh"/>
-    <package name="phoc"/>
+    <package name="patterns_phosh"/>
+    <package name="plymouth-branding-openSUSE" bootinclude="true"/>
+    <package name="phosh-helpers"/>
     <package name="pinephone-helpers"/>
-    <package name="gnome-control-center"/>
-    <package name="gnome-contacts"/>
-    <package name="gnome-clocks"/>
     <package name="gtherm"/>
-    <package name="gnome-usage-phosh"/>
-    <package name="ModemManager"/>
-    <package name="pulseaudio"/>
-    <package name="kgx"/>
-    <package name="calls"/>
-    <package name="pulseaudio-utils"/>
-    <package name="chatty"/>
-    <package name="gnome-session"/>
-    <package name="gnome-themes-extras"/>
-    <package name="gnome-icon-theme"/>
-    <package name="gnome-themes-lang"/>
-    <package name="paper-icon-theme"/>
-    <package name="gnome-icon-theme-extras"/>
-    <package name="gnome-icon-theme-symbolic"/>
-    <package name="adwaita-icon-theme"/>
-    <package name="arc-icon-theme"/>
-    <package name="moka-icon-theme"/>
-    <package name="xorg-x11-server-wayland"/>
-    <package name="rtl8723cs-firmware"/>
-    <package name="atinout"/>
-    <package name="ofono"/>
-    <package name="libnotify-tools"/>
-    <package name="gnome-keyring"/>
-    <package name="libaperture-0-0"/>
-    <package name="iio-sensor-proxy"/>
-    <package name="epiphany"/>
-    <package name="epiphany-branding-openSUSE"/>
-    <package name="libgnome-desktop-3-19"/>
-    <package name="feedbackd"/>
-    <package name="purple-mm-sms"/>
-    <package name="v4l-utils"/>
-    <package name="squeekboard"/>
-    <package name="gnome-software"/>
-    <package name="flashlight"/>
-    <package name="nautilus"/>
-    <package name="gnome-online-accounts"/>
-    <package name="patterns-fonts-fonts"/>
-    <package name="kernel-firmware-ov5640"/>
-    <package name="kernel-firmware-wifi-regulatorydb"/>
     <package name="megapixels"/>
-    <package name="arphic-ukai-fonts"/>
-    <package name="bootsplash-theme-opensuse"/>
-    <package name="gnome-initial-setup"/>
     <package name="libqmi-tools"/>
-    <package name="PackageKit"/>
+    <!-- provide contrib repo information inside the rootfs -->
+    <archive name="contrib-repo-pinephone.tgz" bootinclude="true"/>
   </packages>
   <packages type="delete">
     <!-- not needed at runtime, but removing would happen too early
--- X11-arndale.kiwi.orig
+++ X11-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-chromebook.kiwi.orig
+++ X11-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-cuboxi.kiwi.orig
+++ X11-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-efi.aarch64.kiwi.orig
+++ X11-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-efi.riscv64.kiwi.orig
+++ X11-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-hifiveunmatched.kiwi.orig
+++ X11-hifiveunmatched.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-paz00.kiwi.orig
+++ X11-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-pinephone.kiwi.orig
+++ X11-pinephone.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-X11-pinephone" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-X11-pinephone">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,26 +13,35 @@
     <author>Adrian Campos Garrido</author>
     <contact>adriancampos@teachelp.com</contact>
     <specification>
-   openSUSE Leap-15.3 X11 image for ARM (pinephone) boards
+   openSUSE Leap-15.6 X11 image for ARM (pinephone) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=4 console=ttyS0,115200n8 console=tty0 root=LABEL=ROOT rw rootwait quiet bootsplash.bootfile=bootsplash-themes/opensuse/bootsplash" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="btrfs" btrfs_root_is_snapshot="true" btrfs_quota_groups="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttyS0,115200n8 console=tty0" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>false</oem-swap>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
+      <systemdisk>
+        <volume name="home"/>
+        <volume name="root"/>
+        <volume name="tmp"/>
+        <volume name="opt"/>
+        <volume name="srv"/>
+        <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
+        <volume name="usr/local"/>
+        <volume name="var" copy_on_write="false"/>
+      </systemdisk>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -42,9 +51,21 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-pinephone" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-pinephone-extra" bootinclude="true"/>
+    <package name="kernel-pinephone-optional" bootinclude="true"/>
     <package name="u-boot-pinephone" bootinclude="true"/>
     <package name="dtb-allwinner-pinephone" bootinclude="true"/>
+    <package name="kernel-firmware-ov5640"/>
+    <package name="kernel-firmware-anx7688"/>
+    <package name="kernel-firmware-rtl8723cs"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -53,34 +74,32 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
+    <package name="btrfsprogs"/>
+    <package name="btrfsmaintenance"/>
+    <package name="snapper-zypp-plugin"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
     <package name="gptfdisk" bootinclude="true"/>
     <package name="grub2" bootinclude="true"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="grub2-snapper-plugin"/>
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -88,19 +107,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -116,15 +129,15 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
+    <package name="snapper"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -133,7 +146,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -141,17 +154,16 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
+    <package name="audit"/>
+    <package name="bluez"/>
+    <package name="command-not-found"/>
+    <package name="udisks2"/>
+    <!-- boo#1185739 -->
     <!-- X11+: Common packages for GNOME, KDE, E20, LXQT, X11 and XFCE -->
     <!-- X11+: Patterns list -->
     <package name="patterns-base-x11"/>
     <package name="patterns-base-enhanced_base"/>
+    <package name="patterns-base-transactional_base"/>
     <package name="patterns-base-x11"/>
     <package name="patterns-base-x11_enhanced"/>
     <package name="patterns-desktop-imaging"/>
@@ -163,33 +175,23 @@
     <!-- X11+: Additional software -->
     <package name="ImageMagick"/>
     <package name="Mesa"/>
+    <package name="Mesa-gallium"/>
     <package name="MozillaFirefox"/>
     <package name="MozillaFirefox-branding-openSUSE"/>
     <package name="PackageKit-gstreamer-plugin"/>
-    <package name="a2ps"/>
     <!--<package name="acpica"/>
 <package name="acpid"/> -->
     <package name="alsa-oss"/>
     <package name="alsa-plugins"/>
     <package name="alsa-utils"/>
-    <package name="appres"/>
     <package name="attr"/>
-    <package name="autofs"/>
     <package name="avahi"/>
     <package name="avahi-lang"/>
-    <package name="bdftopcf"/>
-    <package name="beforelight"/>
     <package name="bind-utils"/>
-    <package name="bitmap"/>
     <package name="cantarell-fonts"/>
-    <package name="cdrdao"/>
-    <package name="cdrecord"/>
-    <package name="chromium"/>
     <package name="cifs-utils"/>
     <package name="coreutils"/>
     <package name="cpio"/>
-    <package name="cron"/>
-    <package name="cronie"/>
     <package name="cryptsetup"/>
     <package name="cups"/>
     <package name="cups-client"/>
@@ -214,23 +216,16 @@
     <package name="dmz-icon-theme-cursors"/>
     <package name="dnsmasq"/>
     <package name="dosfstools"/>
-    <package name="droid-fonts"/>
     <package name="dvd+rw-tools"/>
-    <package name="editres"/>
-    <package name="eject"/>
     <package name="ethtool"/>
-    <package name="fifth-leg-font"/>
     <package name="file"/>
-    <package name="fillup"/>
     <package name="findutils"/>
     <package name="firewall-config"/>
     <package name="fonttosfnt"/>
     <package name="foomatic-filters"/>
     <!--<package name="freeglut"/> -->
-    <package name="freerdp"/>
-    <package name="fslsfonts"/>
     <package name="fstobdf"/>
-    <package name="gawk" bootinclude="true"/>
+    <package name="gawk"/>
     <package name="gdb"/>
     <package name="geoclue2"/>
     <!--<package name="gfxboot"/> -->
@@ -260,8 +255,6 @@
     <package name="hdparm"/>
     <package name="hicolor-icon-theme"/>
     <!-- <package name="hplip"/> -->
-    <package name="iceauth"/>
-    <package name="ico"/>
     <package name="ifnteuro"/>
     <package name="info"/>
     <package name="iptables"/>
@@ -269,25 +262,17 @@
     <package name="iso-codes-lang"/>
     <package name="keyutils"/>
     <package name="kpartx"/>
-    <package name="libatm1"/>
-    <package name="libbz2-1"/>
     <package name="liberation-fonts"/>
     <package name="libfam0-gamin"/>
     <package name="libgarcon-branding-openSUSE"/>
     <package name="libgarcon-data"/>
-    <package name="libglib-2_0-0"/>
     <package name="libnotify-tools"/>
     <package name="libnice"/>
-    <package name="libxml2-2"/>
-    <package name="libXaw7"/>
-    <package name="libyui-qt-pkg14"/>
-    <package name="listres"/>
+    <package name="libyui-qt-pkg"/>
     <package name="lockdev"/>
     <package name="logrotate"/>
-    <package name="lsb-release"/>
     <package name="lsof"/>
     <package name="lsscsi"/>
-    <package name="luit"/>
     <package name="lukemftp"/>
     <package name="mailx"/>
     <package name="man"/>
@@ -305,8 +290,6 @@
     <package name="nss-mdns"/>
     <package name="numlockx"/>
     <package name="oclock"/>
-    <package name="openldap2-client"/>
-    <package name="openslp"/>
     <package name="openssl-1_1"/>
     <package name="org.freedesktop.ModemManager"/>
     <package name="parted"/>
@@ -319,27 +302,20 @@
     <package name="pinentry"/>
     <package name="package-update-indicator"/>
     <package name="pkgconfig"/>
-    <package name="postfix"/>
-    <package name="ppp"/>
-    <package name="pptp"/>
     <package name="psmisc"/>
+    <!-- Include pulseaudio - boo#1182176 -->
+    <package name="pulseaudio"/>
+    <package name="pulseaudio-utils"/>
     <package name="python3"/>
-    <package name="python3-base"/>
     <package name="release-notes-openSUSE"/>
-    <package name="rendercheck"/>
-    <package name="rgb"/>
-    <package name="rhino"/>
-    <package name="rstart"/>
     <package name="samba"/>
     <package name="scout"/>
     <package name="sed"/>
-    <package name="sessreg"/>
     <package name="setxkbmap"/>
     <package name="shared-mime-info"/>
     <package name="showfont"/>
     <package name="smp_utils"/>
     <package name="smproxy"/>
-    <package name="smtp_daemon"/>
     <package name="sound-theme-freedesktop"/>
     <package name="sox"/>
     <package name="strace"/>
@@ -349,10 +325,6 @@
     <package name="tar"/>
     <package name="translation-update"/>
     <package name="nscd"/>
-    <package name="update-alternatives"/>
-    <package name="utempter"/>
-    <package name="viewres"/>
-    <package name="vorbis-tools"/>
     <package name="w3m"/>
     <package name="wallpaper-branding"/>
     <package name="wallpaper-branding-openSUSE"/>
@@ -411,7 +383,6 @@
     <package name="xstdcmap"/>
     <package name="xterm"/>
     <package name="xtermset"/>
-    <package name="xvidtune"/>
     <package name="xvinfo"/>
     <package name="xwd"/>
     <package name="xwininfo"/>
@@ -445,52 +416,27 @@
     <package name="xeyes"/>
     <package name="xf86-input-evdev"/>
     <package name="xf86-input-joystick"/>
-    <package name="xf86-input-keyboard"/>
+    <package name="xf86-input-libinput"/>
     <package name="xf86-input-mouse"/>
     <package name="xf86-input-synaptics"/>
-    <!--<package name="xf86-input-vmmouse"/> -->
-    <package name="xf86-input-void"/>
     <package name="xf86-input-wacom"/>
-    <package name="xf86-video-ati"/>
-    <package name="xf86-video-chips"/>
     <package name="xf86-video-cirrus"/>
-    <package name="xf86-video-dummy"/>
-    <package name="xf86-video-glint"/>
-    <package name="xf86-video-i128"/>
     <package name="xf86-video-fbdev"/>
-    <package name="xf86-video-mach64"/>
-    <package name="xf86-video-nv"/>
-    <package name="xf86-video-r128"/>
-    <package name="xf86-video-tdfx"/>
-    <package name="xf86-video-tga"/>
     <package name="xf86-video-vesa"/>
     <!--<package name="xf86-video-vmware"/> -->
-    <package name="xf86-video-voodoo"/>
-    <package name="xf86dga"/>
     <package name="yast2"/>
     <package name="yast2-qt-branding-openSUSE"/>
     <package name="yast2-control-center"/>
     <package name="yast2-scanner"/>
-    <package name="yast2-sound"/>
-    <package name="yp-tools"/>
-    <package name="ypbind"/>
     <package name="zip"/>
-    <package name="zisofs-tools"/>
-    <!-- X11+: multiple choices -->
-    <package name="NetworkManager-branding-openSUSE"/>
-    <package name="input-utils"/>
-    <!-- Choice between input-utils (old) or linuxconsoletools (new) -->
-    <package name="libgfortran4"/>
-    <package name="libwbclient0"/>
-    <!-- Choice between libwbclient0 from samba pkg (old) or sssd-wbclient (new) -->
-    <package name="libharfbuzz0"/>
-    <!-- choice between libharfbuzz0 and libharfbuzz0-bootstrap -->
     <!-- X11/IceWM-specific packages -->
     <package name="icewm"/>
     <package name="icewm-lite"/>
     <package name="icewm-default"/>
     <package name="icewm-theme-branding"/>
     <package name="icewm-lang"/>
+    <!-- provide contrib repo information inside the rootfs -->
+    <archive name="contrib-repo-pinephone.tgz" bootinclude="true"/>
   </packages>
   <packages type="delete">
     <!-- not needed at runtime, but removing would happen too early
--- X11-raspberrypi.aarch64.kiwi.orig
+++ X11-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-raspberrypi2.kiwi.orig
+++ X11-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-rootfs.aarch64.kiwi.orig
+++ X11-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-rootfs.kiwi.orig
+++ X11-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-rootfs.riscv64.kiwi.orig
+++ X11-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-sabrelite.kiwi.orig
+++ X11-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-sinovoipbpim2plus.kiwi.orig
+++ X11-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- X11-sinovoipbpim2zero.kiwi.orig
+++ X11-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-arndale.kiwi.orig
+++ XFCE-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-chromebook.kiwi.orig
+++ XFCE-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-cuboxi.kiwi.orig
+++ XFCE-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-efi.aarch64.kiwi.orig
+++ XFCE-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-efi.riscv64.kiwi.orig
+++ XFCE-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-hifiveunmatched.kiwi.orig
+++ XFCE-hifiveunmatched.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-paz00.kiwi.orig
+++ XFCE-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-pinephone.kiwi.orig
+++ XFCE-pinephone.kiwi
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<image schemaversion="6.1" name="openSUSE-Leap-15.3-ARM-XFCE-pinephone" displayname="openSUSE Leap 15.3">
+<image schemaversion="6.1" name="openSUSE-Leap-15.6-ARM-XFCE-pinephone">
   <!--
  *****************************************************************************
  *****************************************************************************
@@ -13,26 +13,35 @@
     <author>Adrian Campos Garrido</author>
     <contact>adriancampos@teachelp.com</contact>
     <specification>
-   openSUSE Leap-15.3 XFCE image for ARM (pinephone) boards
+   openSUSE Leap-15.6 XFCE image for ARM (pinephone) boards
   </specification>
   </description>
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
-    <type image="oem" initrd_system="dracut" filesystem="ext4" fsmountoptions="noatime,nobarrier" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=4 console=ttyS0,115200n8 console=tty0 root=LABEL=ROOT rw rootwait quiet bootsplash.bootfile=bootsplash-themes/opensuse/bootsplash" disk_start_sector="8192">
+    <type image="oem" initrd_system="dracut" filesystem="btrfs" btrfs_root_is_snapshot="true" btrfs_quota_groups="true" bootpartition="false" bootloader="grub2" firmware="efi" efipartsize="16" editbootconfig="uboot-image-pinephone-setup" editbootinstall="uboot-image-pinephone-install" kernelcmdline="loglevel=3 splash=silent systemd.show_status=1 console=ttyS0,115200n8 console=tty0" disk_start_sector="8192">
       <oemconfig>
         <oem-swap>false</oem-swap>
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
+      <systemdisk>
+        <volume name="home"/>
+        <volume name="root"/>
+        <volume name="tmp"/>
+        <volume name="opt"/>
+        <volume name="srv"/>
+        <volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
+        <volume name="usr/local"/>
+        <volume name="var" copy_on_write="false"/>
+      </systemdisk>
     </type>
-    <version>2021.02.16</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
-    <keytable>us.map.gz</keytable>
+    <keytable>us</keytable>
     <timezone>Europe/Berlin</timezone>
-    <hwclock>utc</hwclock>
     <rpm-excludedocs>true</rpm-excludedocs>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>openSUSE</bootsplash-theme>
+    <bootsplash-theme>bgrt</bootsplash-theme>
   </preferences>
   <users group="root">
     <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root"/>
@@ -42,9 +51,21 @@
   </repository>
   <packages type="bootstrap">
     <package name="kernel-pinephone" bootinclude="true"/>
+    <!-- Since Leap 15.3, kernel is split in multiple packages -->
+    <!-- VMX uses kernel-default-base which has no -{extra,optional} -->
+    <package name="kernel-pinephone-extra" bootinclude="true"/>
+    <package name="kernel-pinephone-optional" bootinclude="true"/>
     <package name="u-boot-pinephone" bootinclude="true"/>
     <package name="dtb-allwinner-pinephone" bootinclude="true"/>
+    <package name="kernel-firmware-ov5640"/>
+    <package name="kernel-firmware-anx7688"/>
+    <package name="kernel-firmware-rtl8723cs"/>
+    <!-- Tumbleweed switched to NetworkManager only, even for JeOS -->
+    <!-- #define USE_NETWORK_MANAGER 1 -->
+    <!-- <package name="NetworkManager"/> -->
     <!-- JeOS: Base patterns -->
+    <package name="patterns-base-apparmor"/>
+    <!-- Installs tools and profiles -->
     <package name="patterns-base-base"/>
     <package name="patterns-base-basesystem"/>
     <package name="patterns-base-console"/>
@@ -53,34 +74,32 @@
     <package name="aaa_base-extras"/>
     <package name="acl"/>
     <package name="alsa"/>
-    <package name="audit"/>
-    <package name="bluez"/>
     <package name="branding-openSUSE"/>
     <package name="bzip2"/>
     <package name="dtc"/>
+    <package name="btrfsprogs"/>
+    <package name="btrfsmaintenance"/>
+    <package name="snapper-zypp-plugin"/>
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
-    <package name="command-not-found"/>
     <package name="cpupower"/>
-    <package name="cracklib-dict-full"/>
+    <package name="cracklib-dict-small"/>
+    <!-- Avoid the big 10MiB one -->
     <package name="dracut"/>
     <package name="e2fsprogs"/>
-    <package name="elfutils"/>
     <package name="filesystem"/>
     <package name="fipscheck"/>
     <package name="firewalld"/>
-    <package name="gettext-runtime"/>
-    <!-- Do not use gettext-runtime-mini-->
     <package name="gio-branding-openSUSE"/>
     <package name="glibc-locale"/>
     <package name="gpg2"/>
     <package name="gptfdisk" bootinclude="true"/>
     <package name="grub2" bootinclude="true"/>
     <package name="grub2-branding-openSUSE" bootinclude="true"/>
+    <package name="grub2-snapper-plugin"/>
     <package name="grub2-arm64-efi" bootinclude="true"/>
     <package name="irqbalance"/>
     <!--<package name="gvfs-common"/> -->
-    <package name="insserv-compat"/>
     <package name="iproute2"/>
     <package name="iputils"/>
     <package name="issue-generator"/>
@@ -88,19 +107,13 @@
     <package name="iw"/>
     <package name="jeos-firstboot"/>
     <package name="kernel-firmware-all"/>
-    <package name="kmod-compat"/>
-    <package name="krb5"/>
-    <!-- Do not use krb5-mini -->
+    <package name="kmod"/>
     <package name="less"/>
-    <package name="libudev1"/>
-    <!-- Do not use libudev-mini1 -->
-    <package name="libyui-ncurses-pkg14"/>
+    <package name="libyui-ncurses-pkg"/>
     <package name="lsof"/>
     <!-- For zypper ps (bsc#1167553) -->
-    <package name="lvm2"/>
     <package name="ncurses-utils"/>
     <package name="net-tools"/>
-    <package name="net-tools-deprecated"/>
     <package name="ntfs-3g"/>
     <package name="ntfsprogs"/>
     <!-- JeOS: we need to keep our time in sync with chrony, because there is no RTC -->
@@ -116,15 +129,15 @@
     <package name="pam_pwquality"/>
     <!-- rsync is expected on JeOS -->
     <package name="rsync"/>
-    <package name="sg3_utils"/>
+    <!-- rsyslog needed on Leap 15.4+ only - boo#1196615 -->
+    <package name="rsyslog"/>
     <package name="shadow"/>
+    <package name="snapper"/>
     <package name="sudo"/>
     <package name="sysconfig"/>
     <package name="sysconfig-netconfig"/>
     <package name="system-group-hardware" bootinclude="true"/>
     <package name="system-user-lp" bootinclude="true"/>
-    <package name="systemd"/>
-    <!-- avoid using systemd-mini -->
     <package name="systemd-presets-branding-openSUSE"/>
     <package name="systemd-sysvinit"/>
     <package name="systemd-logger"/>
@@ -133,7 +146,7 @@
     <package name="upower"/>
     <package name="usbutils"/>
     <package name="util-linux-systemd"/>
-    <package name="vim"/>
+    <package name="vim-small"/>
     <package name="wget"/>
     <package name="which"/>
     <package name="wireless-tools"/>
@@ -141,17 +154,16 @@
     <package name="yast2-firewall"/>
     <package name="yast2-users"/>
     <package name="zypper"/>
-    <package name="zypper-aptitude"/>
-    <!-- JeOS: multiple choices -->
-    <package name="libgcc_s1"/>
-    <package name="libgomp1"/>
-    <package name="libsystemd0"/>
-    <!-- avoid using libsystemd0-mini -->
-    <package name="unzip"/>
+    <package name="audit"/>
+    <package name="bluez"/>
+    <package name="command-not-found"/>
+    <package name="udisks2"/>
+    <!-- boo#1185739 -->
     <!-- X11+: Common packages for GNOME, KDE, E20, LXQT, X11 and XFCE -->
     <!-- X11+: Patterns list -->
     <package name="patterns-base-x11"/>
     <package name="patterns-base-enhanced_base"/>
+    <package name="patterns-base-transactional_base"/>
     <package name="patterns-base-x11"/>
     <package name="patterns-base-x11_enhanced"/>
     <package name="patterns-desktop-imaging"/>
@@ -163,33 +175,23 @@
     <!-- X11+: Additional software -->
     <package name="ImageMagick"/>
     <package name="Mesa"/>
+    <package name="Mesa-gallium"/>
     <package name="MozillaFirefox"/>
     <package name="MozillaFirefox-branding-openSUSE"/>
     <package name="PackageKit-gstreamer-plugin"/>
-    <package name="a2ps"/>
     <!--<package name="acpica"/>
 <package name="acpid"/> -->
     <package name="alsa-oss"/>
     <package name="alsa-plugins"/>
     <package name="alsa-utils"/>
-    <package name="appres"/>
     <package name="attr"/>
-    <package name="autofs"/>
     <package name="avahi"/>
     <package name="avahi-lang"/>
-    <package name="bdftopcf"/>
-    <package name="beforelight"/>
     <package name="bind-utils"/>
-    <package name="bitmap"/>
     <package name="cantarell-fonts"/>
-    <package name="cdrdao"/>
-    <package name="cdrecord"/>
-    <package name="chromium"/>
     <package name="cifs-utils"/>
     <package name="coreutils"/>
     <package name="cpio"/>
-    <package name="cron"/>
-    <package name="cronie"/>
     <package name="cryptsetup"/>
     <package name="cups"/>
     <package name="cups-client"/>
@@ -214,23 +216,16 @@
     <package name="dmz-icon-theme-cursors"/>
     <package name="dnsmasq"/>
     <package name="dosfstools"/>
-    <package name="droid-fonts"/>
     <package name="dvd+rw-tools"/>
-    <package name="editres"/>
-    <package name="eject"/>
     <package name="ethtool"/>
-    <package name="fifth-leg-font"/>
     <package name="file"/>
-    <package name="fillup"/>
     <package name="findutils"/>
     <package name="firewall-config"/>
     <package name="fonttosfnt"/>
     <package name="foomatic-filters"/>
     <!--<package name="freeglut"/> -->
-    <package name="freerdp"/>
-    <package name="fslsfonts"/>
     <package name="fstobdf"/>
-    <package name="gawk" bootinclude="true"/>
+    <package name="gawk"/>
     <package name="gdb"/>
     <package name="geoclue2"/>
     <!--<package name="gfxboot"/> -->
@@ -260,8 +255,6 @@
     <package name="hdparm"/>
     <package name="hicolor-icon-theme"/>
     <!-- <package name="hplip"/> -->
-    <package name="iceauth"/>
-    <package name="ico"/>
     <package name="ifnteuro"/>
     <package name="info"/>
     <package name="iptables"/>
@@ -269,25 +262,17 @@
     <package name="iso-codes-lang"/>
     <package name="keyutils"/>
     <package name="kpartx"/>
-    <package name="libatm1"/>
-    <package name="libbz2-1"/>
     <package name="liberation-fonts"/>
     <package name="libfam0-gamin"/>
     <package name="libgarcon-branding-openSUSE"/>
     <package name="libgarcon-data"/>
-    <package name="libglib-2_0-0"/>
     <package name="libnotify-tools"/>
     <package name="libnice"/>
-    <package name="libxml2-2"/>
-    <package name="libXaw7"/>
-    <package name="libyui-qt-pkg14"/>
-    <package name="listres"/>
+    <package name="libyui-qt-pkg"/>
     <package name="lockdev"/>
     <package name="logrotate"/>
-    <package name="lsb-release"/>
     <package name="lsof"/>
     <package name="lsscsi"/>
-    <package name="luit"/>
     <package name="lukemftp"/>
     <package name="mailx"/>
     <package name="man"/>
@@ -305,8 +290,6 @@
     <package name="nss-mdns"/>
     <package name="numlockx"/>
     <package name="oclock"/>
-    <package name="openldap2-client"/>
-    <package name="openslp"/>
     <package name="openssl-1_1"/>
     <package name="org.freedesktop.ModemManager"/>
     <package name="parted"/>
@@ -319,27 +302,20 @@
     <package name="pinentry"/>
     <package name="package-update-indicator"/>
     <package name="pkgconfig"/>
-    <package name="postfix"/>
-    <package name="ppp"/>
-    <package name="pptp"/>
     <package name="psmisc"/>
+    <!-- Include pulseaudio - boo#1182176 -->
+    <package name="pulseaudio"/>
+    <package name="pulseaudio-utils"/>
     <package name="python3"/>
-    <package name="python3-base"/>
     <package name="release-notes-openSUSE"/>
-    <package name="rendercheck"/>
-    <package name="rgb"/>
-    <package name="rhino"/>
-    <package name="rstart"/>
     <package name="samba"/>
     <package name="scout"/>
     <package name="sed"/>
-    <package name="sessreg"/>
     <package name="setxkbmap"/>
     <package name="shared-mime-info"/>
     <package name="showfont"/>
     <package name="smp_utils"/>
     <package name="smproxy"/>
-    <package name="smtp_daemon"/>
     <package name="sound-theme-freedesktop"/>
     <package name="sox"/>
     <package name="strace"/>
@@ -349,10 +325,6 @@
     <package name="tar"/>
     <package name="translation-update"/>
     <package name="nscd"/>
-    <package name="update-alternatives"/>
-    <package name="utempter"/>
-    <package name="viewres"/>
-    <package name="vorbis-tools"/>
     <package name="w3m"/>
     <package name="wallpaper-branding"/>
     <package name="wallpaper-branding-openSUSE"/>
@@ -411,7 +383,6 @@
     <package name="xstdcmap"/>
     <package name="xterm"/>
     <package name="xtermset"/>
-    <package name="xvidtune"/>
     <package name="xvinfo"/>
     <package name="xwd"/>
     <package name="xwininfo"/>
@@ -445,46 +416,19 @@
     <package name="xeyes"/>
     <package name="xf86-input-evdev"/>
     <package name="xf86-input-joystick"/>
-    <package name="xf86-input-keyboard"/>
+    <package name="xf86-input-libinput"/>
     <package name="xf86-input-mouse"/>
     <package name="xf86-input-synaptics"/>
-    <!--<package name="xf86-input-vmmouse"/> -->
-    <package name="xf86-input-void"/>
     <package name="xf86-input-wacom"/>
-    <package name="xf86-video-ati"/>
-    <package name="xf86-video-chips"/>
     <package name="xf86-video-cirrus"/>
-    <package name="xf86-video-dummy"/>
-    <package name="xf86-video-glint"/>
-    <package name="xf86-video-i128"/>
     <package name="xf86-video-fbdev"/>
-    <package name="xf86-video-mach64"/>
-    <package name="xf86-video-nv"/>
-    <package name="xf86-video-r128"/>
-    <package name="xf86-video-tdfx"/>
-    <package name="xf86-video-tga"/>
     <package name="xf86-video-vesa"/>
     <!--<package name="xf86-video-vmware"/> -->
-    <package name="xf86-video-voodoo"/>
-    <package name="xf86dga"/>
     <package name="yast2"/>
     <package name="yast2-qt-branding-openSUSE"/>
     <package name="yast2-control-center"/>
     <package name="yast2-scanner"/>
-    <package name="yast2-sound"/>
-    <package name="yp-tools"/>
-    <package name="ypbind"/>
     <package name="zip"/>
-    <package name="zisofs-tools"/>
-    <!-- X11+: multiple choices -->
-    <package name="NetworkManager-branding-openSUSE"/>
-    <package name="input-utils"/>
-    <!-- Choice between input-utils (old) or linuxconsoletools (new) -->
-    <package name="libgfortran4"/>
-    <package name="libwbclient0"/>
-    <!-- Choice between libwbclient0 from samba pkg (old) or sssd-wbclient (new) -->
-    <package name="libharfbuzz0"/>
-    <!-- choice between libharfbuzz0 and libharfbuzz0-bootstrap -->
     <!-- XFCE: patterns -->
     <package name="patterns-xfce-xfce"/>
     <package name="patterns-xfce-xfce_basis"/>
@@ -495,18 +439,23 @@
     <package name="NetworkManager-applet"/>
     <package name="NetworkManager-applet-lang"/>
     <package name="NetworkManager-client"/>
+    <package name="NetworkManager-connection-editor"/>
     <package name="NetworkManager-lang"/>
-    <package name="brasero"/>
-    <package name="brasero-lang"/>
     <package name="canberra-gtk-play"/>
     <package name="cheese"/>
     <package name="cheese-lang"/>
     <package name="chess_backend"/>
     <package name="cdda2wav"/>
-    <package name="empathy"/>
-    <package name="empathy-lang"/>
     <package name="evince"/>
     <package name="evince-lang"/>
+    <!-- Add evince-plugin-* to be able to read pdf and others -->
+    <package name="evince-plugin-comicsdocument"/>
+    <package name="evince-plugin-djvudocument"/>
+    <package name="evince-plugin-dvidocument"/>
+    <package name="evince-plugin-pdfdocument"/>
+    <package name="evince-plugin-psdocument"/>
+    <package name="evince-plugin-tiffdocument"/>
+    <package name="evince-plugin-xpsdocument"/>
     <package name="exo-tools"/>
     <package name="file-roller"/>
     <package name="file-roller-lang"/>
@@ -535,8 +484,6 @@
     <package name="gsettings-backend-dconf"/>
     <package name="gsettings-desktop-schemas"/>
     <package name="gsettings-desktop-schemas-lang"/>
-    <package name="gtk2-engine-clearlooks"/>
-    <package name="gtk2-engine-hcengine"/>
     <package name="gtk2-metatheme-adwaita"/>
     <package name="gtk3"/>
     <package name="gtk3-metatheme-adwaita"/>
@@ -553,7 +500,6 @@
     <package name="libxfce4ui-branding-openSUSE"/>
     <package name="libxfce4ui-tools"/>
     <package name="lightdm"/>
-    <package name="lightdm-greeter"/>
     <package name="lightdm-gtk-greeter"/>
     <package name="lightdm-gtk-greeter-branding-openSUSE"/>
     <package name="lightdm-lang"/>
@@ -563,11 +509,10 @@
     <package name="nautilus"/>
     <package name="nautilus-sendto"/>
     <package name="nautilus-sendto-lang"/>
-    <package name="openSUSE-xfce-icon-theme"/>
+    <package name="adwaita-xfce-icon-theme"/>
     <package name="pinentry-gtk2"/>
     <package name="quadrapassel"/>
     <package name="quadrapassel-lang"/>
-    <package name="readcd"/>
     <package name="rhythmbox"/>
     <package name="rhythmbox-lang"/>
     <package name="ristretto"/>
@@ -582,13 +527,12 @@
     <package name="swell-foop"/>
     <package name="swell-foop-lang"/>
     <package name="tali"/>
-    <package name="telepathy-gabble"/>
     <package name="telepathy-idle"/>
     <package name="telepathy-logger"/>
     <package name="telepathy-mission-control"/>
     <package name="thunar"/>
-    <package name="thunar-plugin-archive"/>
-    <package name="thunar-plugin-media-tags"/>
+    <package name="thunar-archive-plugin"/>
+    <package name="thunar-media-tags-plugin"/>
     <package name="thunar-volman"/>
     <package name="thunar-volman-branding-openSUSE"/>
     <package name="totem"/>
@@ -625,10 +569,10 @@
     <package name="yelp"/>
     <package name="yelp-lang"/>
     <package name="yelp-xsl"/>
-    <!-- XFCE: multiple choices -->
-    <package name="gnome-menus-branding-openSUSE"/>
     <!-- XFCE: Additional packages -->
     <package name="gnome-bluetooth"/>
+    <!-- provide contrib repo information inside the rootfs -->
+    <archive name="contrib-repo-pinephone.tgz" bootinclude="true"/>
   </packages>
   <packages type="delete">
     <!-- not needed at runtime, but removing would happen too early
--- XFCE-raspberrypi.aarch64.kiwi.orig
+++ XFCE-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-raspberrypi2.kiwi.orig
+++ XFCE-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-rootfs.aarch64.kiwi.orig
+++ XFCE-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-rootfs.kiwi.orig
+++ XFCE-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-rootfs.riscv64.kiwi.orig
+++ XFCE-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-sabrelite.kiwi.orig
+++ XFCE-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-sinovoipbpim2plus.kiwi.orig
+++ XFCE-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- XFCE-sinovoipbpim2zero.kiwi.orig
+++ XFCE-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2025.01.29</version>
+    <version>2025.06.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us</keytable>
--- _constraints.orig
+++ _constraints
@@ -55,6 +55,7 @@
       <package>JeOS:JeOS-odroidc2</package>
       <package>JeOS:JeOS-odroidc4</package>
       <package>JeOS:JeOS-radxazero</package>
+      <package>JeOS:JeOS-n1sdp</package>
       <package>JeOS:JeOS-hikey960</package>
       <package>JeOS:JeOS-ultra96</package>
       <package>JeOS:JeOS-zynqmp</package>
--- _multibuild.orig
+++ _multibuild
@@ -1,122 +1,3 @@
 <multibuild>
-<package>JeOS</package>
-<package>JeOS-sinovoipbpim2plus</package>
-<package>JeOS-sinovoipbpim2zero</package>
-<package>JeOS-raspberrypi2</package>
-<package>JeOS-paz00</package>
-<package>JeOS-cuboxi</package>
-<package>JeOS-sabrelite</package>
-<package>JeOS-arndale</package>
-<package>JeOS-chromebook</package>
-<package>JeOS-a13olinuxino</package>
-<package>JeOS-a20olinuxinolime</package>
-<package>JeOS-a20olinuxinomicro</package>
-<package>JeOS-bananapi</package>
-<package>JeOS-cubieboard</package>
-<package>JeOS-cubieboard2</package>
-<package>JeOS-cubietruck</package>
-<package>JeOS-nanopineo</package>
-<package>JeOS-olinuxinolime</package>
-<package>JeOS-olinuxinolime2</package>
-<package>JeOS-midway-pxe</package>
-<package>JeOS-socfpgade0nanosoc</package>
-<package>JeOS-loco</package>
-<package>JeOS-udooneo</package>
-<package>JeOS-clearfog</package>
-<package>JeOS-cubox</package>
-<package>JeOS-bananapiR2</package>
-<package>JeOS-beagle</package>
-<package>JeOS-beaglebone</package>
-<package>JeOS-panda</package>
-<package>JeOS-wega</package>
-<package>JeOS-zturn</package>
-<package>JeOS-efi-pxe</package>
-<package>E20-rootfs</package>
-<package>LXQT-rootfs</package>
-<package>XFCE-rootfs</package>
-<package>X11-rootfs</package>
-<package>KDE-rootfs</package>
-<package>GNOME-rootfs</package>
-<package>E20-sinovoipbpim2plus</package>
-<package>LXQT-sinovoipbpim2plus</package>
-<package>XFCE-sinovoipbpim2plus</package>
-<package>X11-sinovoipbpim2plus</package>
-<package>E20-sinovoipbpim2zero</package>
-<package>LXQT-sinovoipbpim2zero</package>
-<package>XFCE-sinovoipbpim2zero</package>
-<package>X11-sinovoipbpim2zero</package>
-<package>E20-raspberrypi2</package>
-<package>LXQT-raspberrypi2</package>
-<package>XFCE-raspberrypi2</package>
-<package>X11-raspberrypi2</package>
-<package>E20-paz00</package>
-<package>LXQT-paz00</package>
-<package>XFCE-paz00</package>
-<package>X11-paz00</package>
-<package>E20-cuboxi</package>
-<package>LXQT-cuboxi</package>
-<package>XFCE-cuboxi</package>
-<package>X11-cuboxi</package>
-<package>E20-sabrelite</package>
-<package>LXQT-sabrelite</package>
-<package>XFCE-sabrelite</package>
-<package>X11-sabrelite</package>
-<package>E20-arndale</package>
-<package>LXQT-arndale</package>
-<package>XFCE-arndale</package>
-<package>X11-arndale</package>
-<package>E20-chromebook</package>
-<package>LXQT-chromebook</package>
-<package>XFCE-chromebook</package>
-<package>X11-chromebook</package>
-<package>JeOS.aarch64</package>
-<package>JeOS-efi.aarch64</package>
-<package>JeOS-raspberrypi.aarch64</package>
-<package>JeOS-efi-pxe.aarch64</package>
-<package>JeOS-efi-vmx.aarch64</package>
-<package>JeOS-radxazero</package>
-<package>JeOS-hikey960</package>
-<package>JeOS-efi-devel.aarch64</package>
-<package>E20-rootfs.aarch64</package>
-<package>LXQT-rootfs.aarch64</package>
-<package>XFCE-rootfs.aarch64</package>
-<package>X11-rootfs.aarch64</package>
-<package>KDE-rootfs.aarch64</package>
-<package>GNOME-rootfs.aarch64</package>
-<package>E20-efi.aarch64</package>
-<package>LXQT-efi.aarch64</package>
-<package>XFCE-efi.aarch64</package>
-<package>X11-efi.aarch64</package>
-<package>KDE-efi.aarch64</package>
-<package>GNOME-efi.aarch64</package>
-<package>E20-raspberrypi.aarch64</package>
-<package>LXQT-raspberrypi.aarch64</package>
-<package>XFCE-raspberrypi.aarch64</package>
-<package>X11-raspberrypi.aarch64</package>
-<package>KDE-raspberrypi.aarch64</package>
-<package>GNOME-raspberrypi.aarch64</package>
-<package>JeOS.riscv64</package>
-<package>JeOS-efi.riscv64</package>
-<package>JeOS-hifiveunmatched</package>
-<package>JeOS-efi-pxe.riscv64</package>
-<package>JeOS-hifiveunleashed</package>
-<package>JeOS-efi-devel.riscv64</package>
-<package>E20-rootfs.riscv64</package>
-<package>LXQT-rootfs.riscv64</package>
-<package>XFCE-rootfs.riscv64</package>
-<package>X11-rootfs.riscv64</package>
-<package>KDE-rootfs.riscv64</package>
-<package>GNOME-rootfs.riscv64</package>
-<package>E20-efi.riscv64</package>
-<package>LXQT-efi.riscv64</package>
-<package>XFCE-efi.riscv64</package>
-<package>X11-efi.riscv64</package>
-<package>KDE-efi.riscv64</package>
-<package>GNOME-efi.riscv64</package>
-<package>E20-hifiveunmatched</package>
-<package>LXQT-hifiveunmatched</package>
-<package>XFCE-hifiveunmatched</package>
-<package>X11-hifiveunmatched</package>
-<package>KDE-hifiveunmatched</package>
-<package>GNOME-hifiveunmatched</package>
+<package>JeOS-n1sdp</package>
 </multibuild>
--- config.sh.orig
+++ config.sh
@@ -142,9 +142,9 @@ esac
 # Add Contrib repo when needed
 #--------------------------------------
 if [ -f /kiwi-hooks/contrib_repo ]; then
-    REPO=$(cat /kiwi-hooks/contrib_repo | sed 's/devel:.*:Factory:Contrib://')
+    REPO=$(cat /kiwi-hooks/contrib_repo | sed 's/devel:ARM:15.6:Contrib://')
     URLREPO=$(sed 's/:/:\//g' /kiwi-hooks/contrib_repo)
-    zypper ar -f "http://download.opensuse.org/repositories/$URLREPO/standard/" "Factory-Contrib-$REPO"
+    zypper ar -f "http://download.opensuse.org/repositories/$URLREPO/15.6/" "15.6-Contrib-$REPO"
     rm -f /kiwi-hooks/contrib_repo
 
     if [ -z "$(ls -A /kiwi-hooks)" ]; then
--- contribs.orig
+++ contribs
@@ -12,6 +12,7 @@
 hikey			devel:ARM:Factory:Contrib:HiKey
 hip05d02		devel:ARM:Factory:Contrib:HIP05D02
 m400			devel:ARM:Factory:Contrib:m400
+n1sdp			devel:ARM:15.6:Contrib:N1SDP
 nanopik2		devel:ARM:Factory:Contrib:NanoPiK2
 nanopineoair		devel:ARM:Factory:Contrib:NanoPiNeo
 odroid			devel:ARM:Factory:Contrib:Odroid
--- pre_checkin.sh.orig
+++ pre_checkin.sh
@@ -80,6 +80,8 @@ if [[ $is_tumbleweed == 1 ]]; then
 fi
 # Amlogic
 aarch64_jeos_images="$aarch64_jeos_images nanopik2 odroidc2 odroidc4 radxazero"
+# Arm
+aarch64_jeos_images="$aarch64_jeos_images n1sdp"
 # Hisilicon
 aarch64_jeos_images="$aarch64_jeos_images hikey960"
 # Rockchip
@@ -242,11 +244,11 @@ for arch in $arch_list; do
             $CPP $image_type_info -DIS_FLAVOR_$flavor=1 -DFLAVOR_TYPE=$flavor_type -P Images.kiwi.in -o $t
         else
             # contribs are Tumbleweed only
-            if [[ $is_tumbleweed == 1 ]]; then
+#            if [[ $is_tumbleweed == 1 ]]; then
                 $CPP $image_type_info -DIS_FLAVOR_$flavor=1 -DFLAVOR_TYPE=$flavor_type -DCONTRIB_REPO -P Images.kiwi.in -o $t
-            else
-                echo "Skip $flavor_type as it is from contrib"
-            fi
+#            else
+#                echo "Skip $flavor_type as it is from contrib"
+#            fi
         fi
         if [ -s $t ]; then
             # replace defines that cpp would ignore
openSUSE Build Service is sponsored by