#1097 Enable all ELN and ELN-Extras variants
Merged 2 years ago by sgallagh. Opened 2 years ago by sgallagh.
sgallagh/pungi-fedora eln  into  eln

file modified
+25 -4
@@ -1,10 +1,6 @@ 

  # This files overrides default variables defined in the configs in

  # the ../shared directory.

  

- # In Fedora, we do not build all variants, because they do not make sense

- # in the Fedora world.

- tree_variants = ["Everything", "BaseOS", "AppStream", "CRB"]

- 

  # Fedora signing keys.

  sigkeys = ['5323552a']

  
@@ -46,6 +42,31 @@ 

      ("AppStream", "BaseOS"),

      ("CRB", "BaseOS"),

      ("CRB", "AppStream"),

+     ("Extras", "BaseOS"),

+     ("Extras", "AppStream"),

+     ("Extras", "CRB"),

+     ("Extras", "HighAvailability"),

+     ("Extras", "ResilientStorage"),

+     ("Extras", "RT"),

+     ("Extras", "NFV"),

+     ("Extras", "SAP"),

+     ("Extras", "SAPHANA"),

+     ("HighAvailability", "BaseOS"),

+     ("HighAvailability", "AppStream"),

+     ("ResilientStorage", "BaseOS"),

+     ("ResilientStorage", "AppStream"),

+     ("RT", "BaseOS"),

+     ("RT", "AppStream"),

+     ("NFV", "BaseOS"),

+     ("NFV", "AppStream"),

+     ("CRB", "BaseOS"),

+     ("CRB", "AppStream"),

+     ("SAP", "BaseOS"),

+     ("SAP", "AppStream"),

+     ("SAP", "HighAvailability"),

+     ("SAPHANA", "BaseOS"),

+     ("SAPHANA", "AppStream"),

+     ("SAPHANA", "HighAvailability"),

  ]

  

  gather_method = {

file modified
+2 -120
@@ -3,7 +3,8 @@ 

  <variants>

  

      <!-- General variants built also in Fedora. -->

-     <variant id="Everything" name="Everything" type="variant">

+     <variant id="Extras" name="Extras" type="variant">

+     <!-- Contains any packages not part of one of the other variants -->

          <arches>

              <arch>aarch64</arch>

              <arch>ppc64le</arch>
@@ -11,125 +12,6 @@ 

              <arch>x86_64</arch>

              <arch>i386</arch>

          </arches>

-         <groups>

-             <!-- From BaseOS -->

-             <!-- Essential groups for Anaconda installation -->

-             <group default="true">guest-agents</group>

-             <group default="true">standard</group>

-             <group default="true">base</group>

-             <group default="true">core</group>

-             <!-- Other groups -->

-             <group default="true">additional-devel</group>

-             <group default="false">anaconda-tools</group>

-             <group default="false">conflicts-baseos</group>

-             <group default="true">development</group>

-             <group default="true">server-product</group>

-             <group default="true">dial-up</group>

-             <group default="true">networkmanager-submodules</group>

-             <group default="true">file-server</group>

-             <group default="true">fonts</group>

-             <group default="true">gnome-desktop</group>

-             <group default="true">graphical-admin-tools</group>

-             <group default="true">hardware-monitoring</group>

-             <group default="true">hardware-support</group>

-             <group default="true">infiniband</group>

-             <group default="true">headless-management</group>

-             <group default="true">large-systems</group>

-             <group default="true">legacy-unix</group>

-             <group default="true">mail-server</group>

-             <group default="true">mainframe-access</group>

-             <group default="true">multimedia</group>

-             <group default="true">smart-card</group>

-             <group default="true">smb-server</group>

-             <group default="true">network-tools</group>

-             <group default="true">network-file-system-client</group>

-             <group default="true">network-server</group>

-             <group default="true">performance</group>

-             <group default="true">platform-devel</group>

-             <group default="true">python-web</group>

-             <group default="true">remote-system-management</group>

-             <group default="true">scientific</group>

-             <group default="true">security-tools</group>

-             <group default="true">system-tools</group>

-             <group default="true">workstation-product</group>

-             <!-- From AppStream -->

-             <group default="true">standard</group>

-             <group default="false">anaconda-tools</group>

-             <group default="true">base</group>

-             <group default="false">conflicts-appstream</group>

-             <group default="true">core</group>

-             <group default="true">additional-devel</group>

-             <group default="true">base-x</group>

-             <group default="true">console-internet</group>

-             <group default="true">debugging</group>

-             <group default="true">development</group>

-             <group default="true">dotnet</group>

-             <group default="true">dns-server</group>

-             <group default="true">emacs</group>

-             <group default="true">file-server</group>

-             <group default="true">ftp-server</group>

-             <group default="true">gnome-apps</group>

-             <group default="true">gnome-desktop</group>

-             <group default="true">guest-desktop-agents</group>

-             <group default="true">graphical-admin-tools</group>

-             <group default="true">graphics</group>

-             <group default="true">hardware-monitoring</group>

-             <group default="true">infiniband</group>

-             <group default="true">workstation-product</group>

-             <group default="true">multimedia</group>

-             <group default="true">mail-server</group>

-             <group default="true">mainframe-access</group>

-             <group default="true">network-server</group>

-             <group default="true">network-tools</group>

-             <group default="true">container-management</group>

-             <group default="true">smb-server</group>

-             <group default="true">dial-up</group>

-             <group default="true">fonts</group>

-             <group default="true">input-methods</group>

-             <group default="true">multimedia</group>

-             <group default="true">networkmanager-submodules</group>

-             <group default="true">network-file-system-client</group>

-             <group default="true">print-client</group>

-             <group default="true">desktop-debugging</group>

-             <group default="true">internet-browser</group>

-             <group default="true">gnome-desktop</group>

-             <group default="true">guest-agents</group>

-             <group default="true">guest-desktop-agents</group>

-             <group default="true">headless-management</group>

-             <group default="true">java-platform</group>

-             <group default="true">java-development</group>

-             <group default="true">gnome-apps</group>

-             <group default="true">internet-applications</group>

-             <group default="true">office-suite</group>

-             <group default="true">performance</group>

-             <group default="true">platform-devel</group>

-             <group default="true">platform-kvm</group>

-             <group default="true">platform-microsoft</group>

-             <group default="true">platform-vmware</group>

-             <group default="true">scientific</group>

-             <group default="true">ostree-support</group>

-             <group default="true">security-tools</group>

-             <group default="true">smart-card</group>

-             <group default="true">smb-server</group>

-             <group default="true">system-tools</group>

-             <group default="true">texlive</group>

-             <group default="true">legacy-x</group>

-             <group default="true">backup-client</group>

-             <group default="true">remote-desktop-clients</group>

-             <group default="true">remote-system-management</group>

-             <group default="true">rpm-development-tools</group>

-             <group default="true">virtualization-client</group>

-             <group default="true">virtualization-hypervisor</group>

-             <group default="true">virtualization-platform</group>

-             <group default="true">virtualization-tools</group>

-             <group default="true">web-server</group>

-         </groups>

-         <!-- List of environments from comps that should be part of BaseOS compose variant -->

-         <environments>

-             <environment display_order="3">minimal-environment</environment>

-             <environment display_order="99">custom-environment</environment>

-             <environment display_order="2">server-product-environment</environment>

-         </environments>

      </variant>

      <variant id="BaseOS" name="BaseOS" type="variant" has_optional="false">

          <arches>

Pull-Request has been merged by sgallagh

2 years ago
Metadata