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>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-arndale" bootinclude="true"/>
--- E20-chromebook.kiwi.orig
+++ E20-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-snow" bootinclude="true"/>
--- E20-cuboxi.kiwi.orig
+++ E20-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6cuboxi" bootinclude="true"/>
--- E20-efi.aarch64.kiwi.orig
+++ E20-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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"/>
--- E20-efi.riscv64.kiwi.orig
+++ E20-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- E20-paz00.kiwi.orig
+++ E20-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-paz00" bootinclude="true"/>
--- E20-raspberrypi.aarch64.kiwi.orig
+++ E20-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- E20-raspberrypi2.kiwi.orig
+++ E20-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- E20-rootfs.aarch64.kiwi.orig
+++ E20-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- E20-rootfs.kiwi.orig
+++ E20-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- E20-rootfs.riscv64.kiwi.orig
+++ E20-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- E20-sabrelite.kiwi.orig
+++ E20-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6qsabrelite" bootinclude="true"/>
--- E20-sinovoipbpim2plus.kiwi.orig
+++ E20-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2plush3" bootinclude="true"/>
--- E20-sinovoipbpim2zero.kiwi.orig
+++ E20-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2zero" bootinclude="true"/>
--- GNOME-arndale.kiwi.orig
+++ GNOME-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-arndale" bootinclude="true"/>
--- GNOME-chromebook.kiwi.orig
+++ GNOME-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-snow" bootinclude="true"/>
--- GNOME-cuboxi.kiwi.orig
+++ GNOME-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6cuboxi" bootinclude="true"/>
--- GNOME-efi.aarch64.kiwi.orig
+++ GNOME-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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"/>
--- GNOME-efi.riscv64.kiwi.orig
+++ GNOME-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- GNOME-paz00.kiwi.orig
+++ GNOME-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-paz00" bootinclude="true"/>
--- GNOME-raspberrypi.aarch64.kiwi.orig
+++ GNOME-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- GNOME-raspberrypi2.kiwi.orig
+++ GNOME-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- GNOME-rootfs.aarch64.kiwi.orig
+++ GNOME-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- GNOME-rootfs.kiwi.orig
+++ GNOME-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- GNOME-rootfs.riscv64.kiwi.orig
+++ GNOME-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- GNOME-sabrelite.kiwi.orig
+++ GNOME-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6qsabrelite" bootinclude="true"/>
--- GNOME-sinovoipbpim2plus.kiwi.orig
+++ GNOME-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2plush3" bootinclude="true"/>
--- GNOME-sinovoipbpim2zero.kiwi.orig
+++ GNOME-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2zero" bootinclude="true"/>
--- Images.kiwi.in.orig
+++ Images.kiwi.in
@@ -693,9 +693,12 @@
 PKG_BOOT_TAG(kernel-BOOTKERNEL)
 #ifdef IS_LEAP
 <!-- Since Leap 15.3, kernel is split in multiple packages -->
+#ifndef USE_VMX
+<!-- VMX uses kernel-default-base which has no -{extra,optional} -->
 PKG_BOOT_TAG(kernel-BOOTKERNEL-extra)
 PKG_BOOT_TAG(kernel-BOOTKERNEL-optional)
 #endif
+#endif
 EXTRA_PACKAGES
 #include "packagelist.inc"
 #if !IS_FLAVOR_rootfs && defined(CONTRIB_REPO)
--- JeOS-a13olinuxino.kiwi.orig
+++ JeOS-a13olinuxino.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-a13-olinuxino" bootinclude="true"/>
--- JeOS-a20olinuxinolime.kiwi.orig
+++ JeOS-a20olinuxinolime.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-a20-olinuxino-lime" bootinclude="true"/>
--- JeOS-a20olinuxinomicro.kiwi.orig
+++ JeOS-a20olinuxinomicro.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-a20-olinuxinomicro" bootinclude="true"/>
--- JeOS-arndale.kiwi.orig
+++ JeOS-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-arndale" bootinclude="true"/>
--- JeOS-bananapi.kiwi.orig
+++ JeOS-bananapi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapi" bootinclude="true"/>
--- JeOS-bananapiR2.kiwi.orig
+++ JeOS-bananapiR2.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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-mt7623nbpir2" bootinclude="true"/>
--- JeOS-beagle.kiwi.orig
+++ JeOS-beagle.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-omap3beagle" bootinclude="true"/>
--- JeOS-beaglebone.kiwi.orig
+++ JeOS-beaglebone.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-am335xevm" bootinclude="true"/>
--- JeOS-chromebook.kiwi.orig
+++ JeOS-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-snow" bootinclude="true"/>
--- JeOS-clearfog.kiwi.orig
+++ JeOS-clearfog.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-clearfog" bootinclude="true"/>
--- JeOS-cubieboard.kiwi.orig
+++ JeOS-cubieboard.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-cubieboard" bootinclude="true"/>
--- JeOS-cubieboard2.kiwi.orig
+++ JeOS-cubieboard2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-cubieboard2" bootinclude="true"/>
--- JeOS-cubietruck.kiwi.orig
+++ JeOS-cubietruck.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-cubietruck" bootinclude="true"/>
--- JeOS-cubox.kiwi.orig
+++ JeOS-cubox.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-dove" bootinclude="true"/>
--- JeOS-cuboxi.kiwi.orig
+++ JeOS-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6cuboxi" bootinclude="true"/>
--- 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>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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"/>
--- 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>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- 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>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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"/>
--- JeOS-efi-pxe.kiwi.orig
+++ JeOS-efi-pxe.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- 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>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- 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>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,8 +54,6 @@
   <packages type="bootstrap">
     <package name="kernel-default-base" bootinclude="true"/>
     <!-- Since Leap 15.3, kernel is split in multiple packages -->
-    <package name="kernel-default-extra" bootinclude="true"/>
-    <package name="kernel-default-optional" bootinclude="true"/>
     <package name="qemu-guest-agent"/>
     <package name="cloud-init"/>
     <package name="cloud-init-config-suse"/>
--- JeOS-efi.aarch64.kiwi.orig
+++ JeOS-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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"/>
--- JeOS-efi.riscv64.kiwi.orig
+++ JeOS-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- JeOS-hifiveunleashed.kiwi.orig
+++ JeOS-hifiveunleashed.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-sifivefu540" bootinclude="true"/>
--- JeOS-hikey960.kiwi.orig
+++ JeOS-hikey960.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-hisilicon" bootinclude="true"/>
--- JeOS-loco.kiwi.orig
+++ JeOS-loco.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx53loco" bootinclude="true"/>
--- JeOS-midway-pxe.kiwi.orig
+++ JeOS-midway-pxe.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- JeOS-nanopineo.kiwi.orig
+++ JeOS-nanopineo.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-nanopineo" bootinclude="true"/>
--- JeOS-olinuxinolime.kiwi.orig
+++ JeOS-olinuxinolime.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-a10-olinuxino-lime" bootinclude="true"/>
--- JeOS-olinuxinolime2.kiwi.orig
+++ JeOS-olinuxinolime2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-a20-olinuxino-lime2" bootinclude="true"/>
--- JeOS-panda.kiwi.orig
+++ JeOS-panda.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-omap4panda" bootinclude="true"/>
--- JeOS-paz00.kiwi.orig
+++ JeOS-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-paz00" bootinclude="true"/>
--- JeOS-raspberrypi.aarch64.kiwi.orig
+++ JeOS-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- JeOS-raspberrypi2.kiwi.orig
+++ JeOS-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- JeOS-sabrelite.kiwi.orig
+++ JeOS-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6qsabrelite" bootinclude="true"/>
--- JeOS-sinovoipbpim2plus.kiwi.orig
+++ JeOS-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2plush3" bootinclude="true"/>
--- JeOS-sinovoipbpim2zero.kiwi.orig
+++ JeOS-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2zero" bootinclude="true"/>
--- JeOS-socfpgade0nanosoc.kiwi.orig
+++ JeOS-socfpgade0nanosoc.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-socfpgade0nanosoc" bootinclude="true"/>
--- JeOS-udooneo.kiwi.orig
+++ JeOS-udooneo.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-udooneo" bootinclude="true"/>
--- JeOS-zturn.kiwi.orig
+++ JeOS-zturn.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-zynqzturnv5" bootinclude="true"/>
--- JeOS.aarch64.kiwi.orig
+++ JeOS.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- JeOS.changes.orig
+++ JeOS.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Fri Mar  4 08:22:22 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Fix VMX which uses kernel-default-base which has no -{extra,optional}
+
+-------------------------------------------------------------------
+Thu Mar  3 16:22:21 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Don't delete /etc/machine-id (see gh#OSInside/kiwi#1650)
+
+-------------------------------------------------------------------
 Mon May 31 09:23:52 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
 - Rebase JeOS image on current Tumbleweed with few updates:
--- JeOS.kiwi.orig
+++ JeOS.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- JeOS.riscv64.kiwi.orig
+++ JeOS.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- KDE-arndale.kiwi.orig
+++ KDE-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-arndale" bootinclude="true"/>
--- KDE-chromebook.kiwi.orig
+++ KDE-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-snow" bootinclude="true"/>
--- KDE-cuboxi.kiwi.orig
+++ KDE-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6cuboxi" bootinclude="true"/>
--- KDE-efi.aarch64.kiwi.orig
+++ KDE-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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"/>
--- KDE-efi.riscv64.kiwi.orig
+++ KDE-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- KDE-paz00.kiwi.orig
+++ KDE-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-paz00" bootinclude="true"/>
--- KDE-raspberrypi.aarch64.kiwi.orig
+++ KDE-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- KDE-raspberrypi2.kiwi.orig
+++ KDE-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- KDE-rootfs.aarch64.kiwi.orig
+++ KDE-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- KDE-rootfs.kiwi.orig
+++ KDE-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- KDE-rootfs.riscv64.kiwi.orig
+++ KDE-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- KDE-sabrelite.kiwi.orig
+++ KDE-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6qsabrelite" bootinclude="true"/>
--- KDE-sinovoipbpim2plus.kiwi.orig
+++ KDE-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2plush3" bootinclude="true"/>
--- KDE-sinovoipbpim2zero.kiwi.orig
+++ KDE-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2zero" bootinclude="true"/>
--- LXQT-arndale.kiwi.orig
+++ LXQT-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-arndale" bootinclude="true"/>
--- LXQT-chromebook.kiwi.orig
+++ LXQT-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-snow" bootinclude="true"/>
--- LXQT-cuboxi.kiwi.orig
+++ LXQT-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6cuboxi" bootinclude="true"/>
--- LXQT-efi.aarch64.kiwi.orig
+++ LXQT-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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"/>
--- LXQT-efi.riscv64.kiwi.orig
+++ LXQT-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- LXQT-paz00.kiwi.orig
+++ LXQT-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-paz00" bootinclude="true"/>
--- LXQT-raspberrypi.aarch64.kiwi.orig
+++ LXQT-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- LXQT-raspberrypi2.kiwi.orig
+++ LXQT-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- LXQT-rootfs.aarch64.kiwi.orig
+++ LXQT-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- LXQT-rootfs.kiwi.orig
+++ LXQT-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- LXQT-rootfs.riscv64.kiwi.orig
+++ LXQT-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- LXQT-sabrelite.kiwi.orig
+++ LXQT-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6qsabrelite" bootinclude="true"/>
--- LXQT-sinovoipbpim2plus.kiwi.orig
+++ LXQT-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2plush3" bootinclude="true"/>
--- LXQT-sinovoipbpim2zero.kiwi.orig
+++ LXQT-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2zero" bootinclude="true"/>
--- X11-arndale.kiwi.orig
+++ X11-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-arndale" bootinclude="true"/>
--- X11-chromebook.kiwi.orig
+++ X11-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-snow" bootinclude="true"/>
--- X11-cuboxi.kiwi.orig
+++ X11-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6cuboxi" bootinclude="true"/>
--- X11-efi.aarch64.kiwi.orig
+++ X11-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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"/>
--- X11-efi.riscv64.kiwi.orig
+++ X11-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- X11-paz00.kiwi.orig
+++ X11-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-paz00" bootinclude="true"/>
--- X11-raspberrypi.aarch64.kiwi.orig
+++ X11-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- X11-raspberrypi2.kiwi.orig
+++ X11-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- X11-rootfs.aarch64.kiwi.orig
+++ X11-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- X11-rootfs.kiwi.orig
+++ X11-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- X11-rootfs.riscv64.kiwi.orig
+++ X11-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- X11-sabrelite.kiwi.orig
+++ X11-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6qsabrelite" bootinclude="true"/>
--- X11-sinovoipbpim2plus.kiwi.orig
+++ X11-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2plush3" bootinclude="true"/>
--- X11-sinovoipbpim2zero.kiwi.orig
+++ X11-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2zero" bootinclude="true"/>
--- XFCE-arndale.kiwi.orig
+++ XFCE-arndale.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-arndale" bootinclude="true"/>
--- XFCE-chromebook.kiwi.orig
+++ XFCE-chromebook.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-snow" bootinclude="true"/>
--- XFCE-cuboxi.kiwi.orig
+++ XFCE-cuboxi.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6cuboxi" bootinclude="true"/>
--- XFCE-efi.aarch64.kiwi.orig
+++ XFCE-efi.aarch64.kiwi
@@ -35,7 +35,7 @@
         <volume name="var" copy_on_write="false"/>
       </systemdisk>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -54,6 +54,7 @@
   <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"/>
--- XFCE-efi.riscv64.kiwi.orig
+++ XFCE-efi.riscv64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- XFCE-paz00.kiwi.orig
+++ XFCE-paz00.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-paz00" bootinclude="true"/>
--- XFCE-raspberrypi.aarch64.kiwi.orig
+++ XFCE-raspberrypi.aarch64.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- XFCE-raspberrypi2.kiwi.orig
+++ XFCE-raspberrypi2.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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="raspberrypi-firmware" bootinclude="true"/>
--- XFCE-rootfs.aarch64.kiwi.orig
+++ XFCE-rootfs.aarch64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: aarch64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- XFCE-rootfs.kiwi.orig
+++ XFCE-rootfs.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: armv7l armv7hl -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- XFCE-rootfs.riscv64.kiwi.orig
+++ XFCE-rootfs.riscv64.kiwi
@@ -19,7 +19,7 @@
   <!-- OBS-ExclusiveArch: riscv64 -->
   <preferences>
     <type image="tbz" primary="true"/>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -38,6 +38,7 @@
   <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"/>
     <!-- JeOS: Base patterns -->
--- XFCE-sabrelite.kiwi.orig
+++ XFCE-sabrelite.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-mx6qsabrelite" bootinclude="true"/>
--- XFCE-sinovoipbpim2plus.kiwi.orig
+++ XFCE-sinovoipbpim2plus.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2plush3" bootinclude="true"/>
--- XFCE-sinovoipbpim2zero.kiwi.orig
+++ XFCE-sinovoipbpim2zero.kiwi
@@ -25,7 +25,7 @@
         <oem-skip-verify>true</oem-skip-verify>
       </oemconfig>
     </type>
-    <version>2021.05.31</version>
+    <version>2022.03.04</version>
     <packagemanager>zypper</packagemanager>
     <locale>en_US</locale>
     <keytable>us.map.gz</keytable>
@@ -44,6 +44,7 @@
   <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-bananapim2zero" bootinclude="true"/>
--- config.sh.orig
+++ config.sh
@@ -123,7 +123,6 @@ rm -f $t
 # prepare for setting root pw, timezone
 #--------------------------------------
 echo ** "reset machine settings"
-rm /etc/machine-id
 rm /etc/localtime
 rm /var/lib/zypp/AnonymousUniqueId
 rm /var/lib/systemd/random-seed
openSUSE Build Service is sponsored by