From 7cfffc39267e5a30d597d1b03aee844865fa888a Mon Sep 17 00:00:00 2001 From: luz Date: Mon, 28 Apr 2025 14:26:49 -0500 Subject: [PATCH] Rerrange recipes --- recipes/desktop-hypervisor-amdcpu.cfg | 18 ++++++++++++------ .../desktop-hypervisor-intelcpu-intelgpu.cfg | 18 ++++++++++++------ recipes/desktop-hypervisor-intelcpu.cfg | 13 +++++++++---- recipes/desktop-hypervisor.cfg | 7 +++++-- recipes/virtual-desktop-hypervisor.cfg | 5 ++++- recipes/virtual-desktop.cfg | 5 ++++- recipes/virtual-server.cfg | 5 ++++- 7 files changed, 50 insertions(+), 21 deletions(-) diff --git a/recipes/desktop-hypervisor-amdcpu.cfg b/recipes/desktop-hypervisor-amdcpu.cfg index 51fa953..3a36249 100644 --- a/recipes/desktop-hypervisor-amdcpu.cfg +++ b/recipes/desktop-hypervisor-amdcpu.cfg @@ -9,14 +9,20 @@ %include ../ingredients/core.cfg # The core configuration %include ../ingredients/core-storage.cfg # The core configuration storage -%include ../ingredients/core-locale.cfg # A system locale -%include ../ingredients/core-packages.cfg # The default group of packages -%include ../ingredients/core-packages-hardware-support.cfg # Provides extended hardware support -%include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -%include ../ingredients/core-post.cfg # Post configuration script -%include ../ingredients/core-desktop-initial-setup.cfg # Includes initial-setup for GNOME Shell, allowing for the creation of a user after the first boot, as well as some basic configuration +%include ../ingredients/core-locale.cfg # System locale +%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-packages-default.cfg # Default but not necessary packages +%include ../ingredients/core-packages-generic.cfg # Make it a generic distribution +%include ../ingredients/core-packages-custom.cfg # Hand-picked packages +%include ../ingredients/core-packages-hardware-support.cfg # Provides extended hardware support +%include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora + +%include ../ingredients/core-post.cfg # Post configuration script + +%include ../ingredients/core-desktop-initial-setup.cfg # Includes initial-setup for GNOME Shell, allowing for the creation of a user after the first boot, as well as some basic configuration %include ../ingredients/base-desktop-gnome.cfg # A desktop environment + %include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager %include ../ingredients/base-hypervisor.cfg # A base hypervisor %include ../ingredients/base-hypervisor-amdcpu.cfg # Specific virtualization configuration for AMD (tm) CPUs \ No newline at end of file diff --git a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg index 5be9749..7bc9c08 100644 --- a/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg +++ b/recipes/desktop-hypervisor-intelcpu-intelgpu.cfg @@ -9,14 +9,20 @@ %include ../ingredients/core.cfg # The core configuration %include ../ingredients/core-storage.cfg # The core configuration storage -%include ../ingredients/core-locale.cfg # A system locale -%include ../ingredients/core-packages.cfg # The default group of packages -%include ../ingredients/core-packages-hardware-support.cfg # Provides extended hardware support -%include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -%include ../ingredients/core-post.cfg # Post configuration script -%include ../ingredients/core-desktop-initial-setup.cfg # Includes initial-setup for GNOME Shell, allowing for the creation of a user after the first boot, as well as some basic configuration +%include ../ingredients/core-locale.cfg # System locale +%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-packages-default.cfg # Default but not necessary packages +%include ../ingredients/core-packages-generic.cfg # Make it a generic distribution +%include ../ingredients/core-packages-custom.cfg # Hand-picked packages +%include ../ingredients/core-packages-hardware-support.cfg # Provides extended hardware support +%include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora + +%include ../ingredients/core-post.cfg # Post configuration script + +%include ../ingredients/core-desktop-initial-setup.cfg # Includes initial-setup for GNOME Shell, allowing for the creation of a user after the first boot, as well as some basic configuration %include ../ingredients/base-desktop-gnome.cfg # A desktop environment + %include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager %include ../ingredients/base-hypervisor.cfg # A base hypervisor %include ../ingredients/base-hypervisor-intelcpu.cfg # Specific virtualization configuration for Intel (tm) CPUs diff --git a/recipes/desktop-hypervisor-intelcpu.cfg b/recipes/desktop-hypervisor-intelcpu.cfg index 213d949..8e0dffb 100644 --- a/recipes/desktop-hypervisor-intelcpu.cfg +++ b/recipes/desktop-hypervisor-intelcpu.cfg @@ -9,13 +9,18 @@ %include ../ingredients/core.cfg # The core configuration %include ../ingredients/core-storage.cfg # The core configuration storage -%include ../ingredients/core-locale.cfg # A system locale -%include ../ingredients/core-packages.cfg # The default group of packages +%include ../ingredients/core-locale.cfg # System locale + +%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-packages-default.cfg # Default but not necessary packages +%include ../ingredients/core-packages-generic.cfg # Make it a generic distribution +%include ../ingredients/core-packages-custom.cfg # Hand-picked packages %include ../ingredients/core-packages-hardware-support.cfg # Provides extended hardware support %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora -%include ../ingredients/core-post.cfg # Post configuration script -%include ../ingredients/core-desktop-initial-setup.cfg # Includes initial-setup for GNOME Shell, allowing for the creation of a user after the first boot, as well as some basic configuration +%include ../ingredients/core-post.cfg # Post configuration script + +%include ../ingredients/core-desktop-initial-setup.cfg # Includes initial-setup for GNOME Shell, allowing for the creation of a user after the first boot, as well as some basic configuration %include ../ingredients/base-desktop-gnome.cfg # A desktop environment %include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager diff --git a/recipes/desktop-hypervisor.cfg b/recipes/desktop-hypervisor.cfg index fc42e90..5eb4129 100644 --- a/recipes/desktop-hypervisor.cfg +++ b/recipes/desktop-hypervisor.cfg @@ -9,8 +9,11 @@ %include ../ingredients/core.cfg # The core configuration %include ../ingredients/core-storage.cfg # The core configuration storage -%include ../ingredients/core-locale.cfg # A system locale -%include ../ingredients/core-packages.cfg # The default group of packages +%include ../ingredients/core-locale.cfg # System locale +%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-packages-default.cfg # Default but not necessary packages +%include ../ingredients/core-packages-generic.cfg # Make it a generic distribution +%include ../ingredients/core-packages-custom.cfg # Hand-picked packages %include ../ingredients/core-packages-hardware-support.cfg # Provides extended hardware support %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora %include ../ingredients/core-post.cfg # Post configuration script diff --git a/recipes/virtual-desktop-hypervisor.cfg b/recipes/virtual-desktop-hypervisor.cfg index a81edfc..a7b07a4 100644 --- a/recipes/virtual-desktop-hypervisor.cfg +++ b/recipes/virtual-desktop-hypervisor.cfg @@ -10,7 +10,10 @@ %include ../ingredients/core.cfg # The core configuration %include ../ingredients/core-storage.cfg # The core configuration storage %include ../ingredients/core-locale.cfg # System locale -%include ../ingredients/core-packages.cfg # The default group of packages +%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-packages-default.cfg # Default but not necessary packages +%include ../ingredients/core-packages-generic.cfg # Make it a generic distribution +%include ../ingredients/core-packages-custom.cfg # Hand-picked packages %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora %include ../ingredients/core-post.cfg # Post configuration script %include ../ingredients/core-desktop-initial-setup.cfg # Includes initial-setup for GNOME Shell, allowing for the creation of a user after the first boot, as well as some basic configuration diff --git a/recipes/virtual-desktop.cfg b/recipes/virtual-desktop.cfg index b3bef96..d54638f 100644 --- a/recipes/virtual-desktop.cfg +++ b/recipes/virtual-desktop.cfg @@ -10,7 +10,10 @@ %include ../ingredients/core.cfg # The core configuration %include ../ingredients/core-storage.cfg # The core configuration storage %include ../ingredients/core-locale.cfg # A system locale -%include ../ingredients/core-packages.cfg # The default group of packages +%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-packages-default.cfg # Default but not necessary packages +%include ../ingredients/core-packages-generic.cfg # Make it a generic distribution +%include ../ingredients/core-packages-custom.cfg # Hand-picked packages %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora %include ../ingredients/core-post.cfg # Post configuration script %include ../ingredients/core-desktop-initial-setup.cfg # Includes initial-setup for GNOME Shell, allowing for the creation of a user after the first boot, as well as some basic configuration diff --git a/recipes/virtual-server.cfg b/recipes/virtual-server.cfg index 056af15..a5ab670 100644 --- a/recipes/virtual-server.cfg +++ b/recipes/virtual-server.cfg @@ -10,7 +10,10 @@ %include ../ingredients/core.cfg # The core configuration %include ../ingredients/core-storage.cfg # The core configuration storage %include ../ingredients/core-locale.cfg # A system locale -%include ../ingredients/core-packages.cfg # The default group of packages +%include ../ingredients/core-packages-mandatory.cfg # Mandatory packages +%include ../ingredients/core-packages-default.cfg # Default but not necessary packages +%include ../ingredients/core-packages-generic.cfg # Make it a generic distribution +%include ../ingredients/core-packages-custom.cfg # Hand-picked packages %include ../ingredients/core-fedora-repo.cfg # Offical repositories for Fedora %include ../ingredients/core-post.cfg # Post configuration script %include ../ingredients/core-server-initial-setup.cfg # Includes initial-setup so on first-boot a new user can be created