Install fedora-release-* at bootstrap phase for various images

This ensures that the correct variant packages are installed.

23 files changed, 39 insertions, 11 deletions

diff --git a/components/desktops/budgie.xml b/components/desktops/budgie.xml
index 42ebab7..36ae5cf 100644
--- a/components/desktops/budgie.xml
+++ b/components/desktops/budgie.xml
@@ -9,7 +9,6 @@
 		<namedCollection name="budgie-desktop-environment"/>
 		<namedCollection name="budgie-desktop-apps"/>
 		<namedCollection name="libreoffice"/>
-		<package name="fedora-release-budgie"/>
 		<package name="libreoffice-draw"/>
 		<package name="libreoffice-math"/>
 		<package name="thunderbird"/>
diff --git a/components/desktops/cinnamon.xml b/components/desktops/cinnamon.xml
index 61fc852..9317053 100644
--- a/components/desktops/cinnamon.xml
+++ b/components/desktops/cinnamon.xml
@@ -9,7 +9,6 @@
 		<!-- install env-group to resolve RhBug:1891500 -->
 		<namedCollection name="cinnamon-desktop-environment"/>
 		<namedCollection name="libreoffice"/>
-		<package name="fedora-release-cinnamon"/>
 		<package name="rhythmbox"/>
 		<package name="f39-backgrounds-extras-gnome"/> <!-- extra backgrounds -->
 	</packages>
diff --git a/components/desktops/gnome.xml b/components/desktops/gnome.xml
index f0836ed..e81c540 100644
--- a/components/desktops/gnome.xml
+++ b/components/desktops/gnome.xml
@@ -8,6 +8,5 @@
 	<packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop">
 		<!-- install env-group to resolve RhBug:1891500 -->
 		<namedCollection name="workstation-product-environment"/>
-		<package name="fedora-release-workstation"/>
 	</packages>
 </image>
diff --git a/components/desktops/kde.xml b/components/desktops/kde.xml
index df379ff..faa3c59 100644
--- a/components/desktops/kde.xml
+++ b/components/desktops/kde.xml
@@ -12,7 +12,6 @@
 		<namedCollection name="kde-media"/>
 		<namedCollection name="kde-spin-initial-setup"/>
 		<package name="fuse"/>
-		<package name="fedora-release-kde"/>
 		<package name="kde-l10n"/>
 		<ignore name="@admin-tools"/>
 		<ignore name="gnome-disk-utility"/>
diff --git a/components/desktops/lxde.xml b/components/desktops/lxde.xml
index dc527ae..0dbe83b 100644
--- a/components/desktops/lxde.xml
+++ b/components/desktops/lxde.xml
@@ -11,7 +11,6 @@
 		<namedCollection name="lxde-apps"/>
 		<namedCollection name="lxde-media"/>
 		<namedCollection name="lxde-office"/>
-		<package name="fedora-release-lxde"/>
 		<package name="lxpolkit"/> <!-- Ensure LXDE polkit agent is used -->
 		<package name="notification-daemon"/> <!-- Ensure correct notification daemon is used -->
 		<ignore name="PackageKit*"/> <!-- we use dnfdragora instead -->
diff --git a/components/desktops/lxqt.xml b/components/desktops/lxqt.xml
index 6cf7462..2b20dd4 100644
--- a/components/desktops/lxqt.xml
+++ b/components/desktops/lxqt.xml
@@ -11,7 +11,6 @@
 		<namedCollection name="lxqt-apps"/>
 		<namedCollection name="lxqt-media"/>
 		<namedCollection name="lxqt-l10n"/>
-		<package name="fedora-release-lxqt"/>
 		<package name="lximage-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group -->
 		<package name="obconf-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group -->
 		<package name="pavucontrol-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group -->
diff --git a/components/desktops/mate.xml b/components/desktops/mate.xml
index e48d8a3..2239255 100644
--- a/components/desktops/mate.xml
+++ b/components/desktops/mate.xml
@@ -10,7 +10,6 @@
 		<namedCollection name="mate-desktop-environment"/>
 		<namedCollection name="compiz"/>
 		<namedCollection name="libreoffice"/>
-		<package name="fedora-release-matecompiz"/>
 		<ignore name="audacious"/> <!-- breaks the desktop -->
 		<!-- drop things for size -->
 		<ignore name="@3d-printing"/>
diff --git a/components/desktops/phosh.xml b/components/desktops/phosh.xml
index 1d3c7a5..cb8466e 100644
--- a/components/desktops/phosh.xml
+++ b/components/desktops/phosh.xml
@@ -5,9 +5,11 @@
 			<requires profile="DesktopCommon"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Phosh-Desktop">
+		<package name="fedora-release-phosh"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="Phosh-Desktop">
 		<!-- install env-group to resolve RhBug:1891500 -->
 		<namedCollection name="phosh-desktop-environment"/>
-		<package name="fedora-release-phosh"/>
 	</packages>
 </image>
diff --git a/components/desktops/soas.xml b/components/desktops/soas.xml
index b4d6763..490172f 100644
--- a/components/desktops/soas.xml
+++ b/components/desktops/soas.xml
@@ -8,7 +8,6 @@
 	<packages type="image" patternType="plusRecommended" profiles="SoaS-Desktop">
 		<!-- install env-group to resolve RhBug:1891500 -->
 		<namedCollection name="sugar-desktop-environment"/>
-		<package name="fedora-release-soas"/>
 		<package name="dejavu-sans-fonts"/>
 		<package name="dejavu-sans-mono-fonts"/>
 		<package name="madan-fonts"/>
diff --git a/components/desktops/sway.xml b/components/desktops/sway.xml
index 64b5084..dee527a 100644
--- a/components/desktops/sway.xml
+++ b/components/desktops/sway.xml
@@ -10,6 +10,5 @@
 		<namedCollection name="sway-desktop-environment"/>
 		<namedCollection name="firefox"/>
 		<namedCollection name="swaywm-extended"/>
-		<package name="fedora-release-sway"/>
 	</packages>
 </image>
diff --git a/components/desktops/xfce.xml b/components/desktops/xfce.xml
index a7e0229..0812976 100644
--- a/components/desktops/xfce.xml
+++ b/components/desktops/xfce.xml
@@ -12,7 +12,6 @@
 		<namedCollection name="xfce-extra-plugins"/>
 		<namedCollection name="xfce-media"/>
 		<namedCollection name="xfce-office"/>
-		<package name="fedora-release-xfce"/>
 		<package name="wget"/>
 		<package name="system-config-printer"/>
 		<!-- Save some space -->
diff --git a/teams/budgie.xml b/teams/budgie.xml
index 665ca4b..415f0dd 100644
--- a/teams/budgie.xml
+++ b/teams/budgie.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Budgie-Live">
+		<package name="fedora-release-budgie"/>
+	</packages>
 </image>
diff --git a/teams/cinnamon.xml b/teams/cinnamon.xml
index 18c5cd2..db205a3 100644
--- a/teams/cinnamon.xml
+++ b/teams/cinnamon.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Cinnamon-Live">
+		<package name="fedora-release-cinnamon"/>
+	</packages>
 </image>
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
index b2a4449..ecc2677 100644
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@@ -150,6 +150,9 @@
 			</oemconfig>
 		</type>
 	</preferences>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="CloudCore,CloudCoreUKI">
+		<package name="fedora-release-cloud"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="CloudCore">
 		<namedCollection name="cloud-server-environment"/>
 		<ignore name="dracut-config-rescue"/>
diff --git a/teams/i3.xml b/teams/i3.xml
index 6a21728..fcef4e7 100644
--- a/teams/i3.xml
+++ b/teams/i3.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="i3-Live">
+		<package name="fedora-release-i3"/>
+	</packages>
 </image>
diff --git a/teams/kde.xml b/teams/kde.xml
index 114f269..77749d1 100644
--- a/teams/kde.xml
+++ b/teams/kde.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="KDE-Live">
+		<package name="fedora-release-kde"/>
+	</packages>
 </image>
diff --git a/teams/lxde.xml b/teams/lxde.xml
index f77f8ea..3660b2e 100644
--- a/teams/lxde.xml
+++ b/teams/lxde.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="LXDE-Live">
+		<package name="fedora-release-lxde"/>
+	</packages>
 </image>
diff --git a/teams/lxqt.xml b/teams/lxqt.xml
index ec974ab..41c741e 100644
--- a/teams/lxqt.xml
+++ b/teams/lxqt.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="LXQt-Live">
+		<package name="fedora-release-lxqt"/>
+	</packages>
 </image>
diff --git a/teams/mate.xml b/teams/mate.xml
index 2f6b566..5148afb 100644
--- a/teams/mate.xml
+++ b/teams/mate.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="MATE_Compiz-Live">
+		<package name="fedora-release-matecompiz"/>
+	</packages>
 </image>
diff --git a/teams/soas.xml b/teams/soas.xml
index 48878e4..31b1bab 100644
--- a/teams/soas.xml
+++ b/teams/soas.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="SoaS-Live">
+		<package name="fedora-release-soas"/>
+	</packages>
 </image>
diff --git a/teams/sway.xml b/teams/sway.xml
index 9e9603d..0ce036e 100644
--- a/teams/sway.xml
+++ b/teams/sway.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Sway-Live">
+		<package name="fedora-release-sway"/>
+	</packages>
 </image>
diff --git a/teams/workstation.xml b/teams/workstation.xml
index ad362cd..fc61499 100644
--- a/teams/workstation.xml
+++ b/teams/workstation.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Workstation-Live">
+		<package name="fedora-release-workstation"/>
+	</packages>
 </image>
diff --git a/teams/xfce.xml b/teams/xfce.xml
index c563bbc..09c3d1c 100644
--- a/teams/xfce.xml
+++ b/teams/xfce.xml
@@ -5,4 +5,7 @@
 			<requires profile="LiveInstall"/>
 		</profile>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="Xfce-Live">
+		<package name="fedora-release-xfce"/>
+	</packages>
 </image>