Merge branch 'i9.5' of git.inferitos.ru:msvsphere/pungi-msvsphere into i9.5

msvsphere-i686/additional_packages.conf

@@ -79,6 +79,34 @@ additional_packages = [
             ]
         }
     ),
+    (
+        '^LibreOffice$', {
+            '*': [
+                "sphere-repos-libreoffice"
+            ]
+        }
+    ),
+    (
+        '^Virtualization$', {
+            '*': [
+                "sphere-repos-virtualization"
+            ]
+        }
+    ),
+    (
+        '^Hosting$', {
+            '*': [
+                "sphere-repos-hosting"
+            ]
+        }
+    ),
+    (
+        '^KernelExtras$', {
+            '*': [
+                "sphere-repos-kernelextra"
+            ]
+        }
+    ),
     (
         '^Server$', {
             '*': [

variants-i686.xml

@@ -310,6 +310,38 @@
       <group default="false">additional-devel</group>
     </groups>
   </variant>
+  <variant id="KernelExtra" name="KernelExtra" type="variant">
+    <arches>
+      <arch>i386</arch>
+    </arches>
+    <groups>
+      <group default="false">additional-devel</group>
+    </groups>
+  </variant>
+  <variant id="Hosting" name="Hosting" type="variant">
+    <arches>
+      <arch>i386</arch>
+    </arches>
+    <groups>
+      <group default="false">additional-devel</group>
+    </groups>
+  </variant>
+  <variant id="LibreOffice" name="LibreOffice" type="variant">
+    <arches>
+      <arch>i386</arch>
+    </arches>
+    <groups>
+      <group default="false">additional-devel</group>
+    </groups>
+  </variant>
+  <variant id="Virtualization" name="Virtualization" type="variant">
+    <arches>
+      <arch>i386</arch>
+    </arches>
+    <groups>
+      <group default="false">additional-devel</group>
+    </groups>
+  </variant>
   <variant id="HighAvailability" name="HighAvailability" type="variant">
     <arches>
       <arch>i386</arch>