Diffstat (limited to 'teams/eln')
| -rw-r--r-- | teams/eln/cloud.xml | 2 | ||||
| -rw-r--r-- | teams/eln/container.xml | 28 | ||||
| -rw-r--r-- | teams/eln/desktop-environments.xml | 14 | ||||
| -rw-r--r-- | teams/eln/liveprofiles.xml | 4 | ||||
| -rw-r--r-- | teams/eln/wsl.xml | 2 |
5 files changed, 30 insertions, 20 deletions
diff --git a/teams/eln/cloud.xml b/teams/eln/cloud.xml index df9a4b0..b146d48 100644 --- a/teams/eln/cloud.xml +++ b/teams/eln/cloud.xml @@ -199,7 +199,7 @@ </type> </preferences> <packages type="bootstrap" patternType="plusRecommended" profiles="CloudCore,CloudCoreUKI"> - <package name="fedora-release-eln"/> + <package name="fedora-eln-release"/> </packages> <packages type="image" patternType="plusRecommended" profiles="CloudCore"> <namedCollection name="cloud-server-environment"/> diff --git a/teams/eln/container.xml b/teams/eln/container.xml index c9ca883..5eebfb4 100644 --- a/teams/eln/container.xml +++ b/teams/eln/container.xml @@ -18,14 +18,9 @@ <labels> <label name="org.opencontainers.image.vendor" value="Fedora Project"/> <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> - <label name="org.opencontainers.image.license" value="MIT"/> - <label name="org.opencontainers.image.name" value="fedora"/> + <label name="org.opencontainers.image.licenses" value="MIT"/> + <label name="org.opencontainers.image.title" value="fedora"/> <label name="org.opencontainers.image.version" value="eln"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="name" value="fedora"/> - <label name="version" value="eln"/> </labels> <environment> <env name="container" value="oci"/> @@ -48,15 +43,10 @@ <labels> <label name="org.opencontainers.image.vendor" value="Fedora Project"/> <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> - <label name="org.opencontainers.image.license" value="MIT"/> - <label name="org.opencontainers.image.name" value="fedora-toolbox"/> + <label name="org.opencontainers.image.licenses" value="MIT"/> + <label name="org.opencontainers.image.title" value="fedora-toolbox"/> <label name="org.opencontainers.image.version" value="eln"/> <label name="com.github.containers.toolbox" value="true"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="name" value="fedora-toolbox"/> - <label name="version" value="eln"/> </labels> <environment> <env name="container" value="oci"/> @@ -87,7 +77,7 @@ <ignore name="grubby"/> <ignore name="langpacks-en_GB"/> <ignore name="sssd-client"/> - <package name="fedora-release-eln"/> + <package name="fedora-eln-release"/> <package name="bash"/> <package name="coreutils"/> <package name="rpm"/> @@ -140,7 +130,7 @@ <package name="diffutils"/> <package name="dnf5"/> <package name="dnf5-plugins"/> - <package name="fedora-release-eln"/> + <package name="fedora-eln-release"/> <package name="file"/> <package name="findutils"/> <package name="flatpak-spawn"/> @@ -206,4 +196,10 @@ <package name="systemd-resolved"/> <package name="xkeyboard-config"/> </packages> + <packages type="bootstrap" profiles="Container-Base-Generic,Container-Toolbox"> + <package name="systemd-standalone-tmpfiles"/> + </packages> + <packages type="uninstall" profiles="Container-Base-Generic,Container-Toolbox"> + <package name="systemd-standalone-tmpfiles"/> + </packages> </image> diff --git a/teams/eln/desktop-environments.xml b/teams/eln/desktop-environments.xml index 93caba5..c9741b0 100644 --- a/teams/eln/desktop-environments.xml +++ b/teams/eln/desktop-environments.xml @@ -7,11 +7,16 @@ <profile name="KDE-Desktop" description="KDE Plasma Desktop"> <requires profile="DesktopCommon"/> </profile> + <profile name="COSMIC-Desktop" description="COSMIC Desktop"> + <requires profile="DesktopCommon"/> + </profile> </profiles> <packages type="image" patternType="plusRecommended" profiles="DesktopCommon"> <package name="fedora-eln-backgrounds"/> <package name="firefox"/> <package name="plymouth-theme-spinner"/> + <namedCollection name="base-graphical"/> + <namedCollection name="core"/> <namedCollection name="fonts"/> <namedCollection name="guest-desktop-agents"/> <namedCollection name="hardware-support"/> @@ -25,15 +30,20 @@ <ignore name="subscription-manager-cockpit"/> </packages> <packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop"> - <namedCollection name="workstation-product-environment"/> + <namedCollection name="gnome-desktop"/> + <namedCollection name="workstation-product"/> + <package name="gnome-classic-session"/> </packages> <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop"> - <namedCollection name="kde-spin-initial-setup"/> <namedCollection name="kde-desktop-environment"/> <namedCollection name="kde-apps"/> <namedCollection name="kde-media"/> + <ignore name="initial-setup"/> <!-- redundant with plasma-setup --> <ignore name="plasma-nm-l2tp"/> <ignore name="plasma-nm-vpnc"/> <package name="fuse"/> </packages> + <packages type="image" patternType="plusRecommended" profiles="COSMIC-Desktop"> + <namedCollection name="cosmic-desktop-environment"/> + </packages> </image> diff --git a/teams/eln/liveprofiles.xml b/teams/eln/liveprofiles.xml index 1dec143..05f7acb 100644 --- a/teams/eln/liveprofiles.xml +++ b/teams/eln/liveprofiles.xml @@ -8,5 +8,9 @@ <requires profile="KDE-Desktop"/> <requires profile="LiveInstall"/> </profile> + <profile name="COSMIC-Live" description="COSMIC Live DVD"> + <requires profile="COSMIC-Desktop"/> + <requires profile="LiveInstall"/> + </profile> </profiles> </image> diff --git a/teams/eln/wsl.xml b/teams/eln/wsl.xml index 6918bb3..051f8e6 100644 --- a/teams/eln/wsl.xml +++ b/teams/eln/wsl.xml @@ -14,7 +14,7 @@ <package name="coreutils"/> <package name="dnf5"/> <package name="dnf5-plugins"/> - <package name="fedora-release-eln"/> + <package name="fedora-eln-release"/> <package name="rpm"/> </packages> <packages type="image" patternType="plusRecommended" profiles="WSL-Base"> |