Diffstat (limited to 'teams')
| -rw-r--r-- | teams/cloud/container.xml | 17 | ||||
| -rw-r--r-- | teams/eln/cloud.xml | 2 | ||||
| -rw-r--r-- | teams/eln/container.xml | 4 | ||||
| -rw-r--r-- | teams/eln/desktop-environments.xml | 1 | ||||
| -rw-r--r-- | teams/eln/wsl.xml | 2 | ||||
| -rw-r--r-- | teams/robotics.xml | 82 | ||||
| -rw-r--r-- | teams/sway.xml | 4 |
7 files changed, 17 insertions, 95 deletions
diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml index 9281fa3..25dcd49 100644 --- a/teams/cloud/container.xml +++ b/teams/cloud/container.xml @@ -17,7 +17,7 @@ <type image="oci"> <containerconfig name="fedora" - tag="rawhide" + tag="45" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/bin/bash"/> @@ -26,7 +26,7 @@ <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> <label name="org.opencontainers.image.licenses" value="MIT"/> <label name="org.opencontainers.image.title" value="fedora"/> - <label name="org.opencontainers.image.version" value="rawhide"/> + <label name="org.opencontainers.image.version" value="45"/> </labels> <environment> <env name="container" value="oci"/> @@ -43,7 +43,7 @@ <type image="oci"> <containerconfig name="fedora-minimal" - tag="rawhide" + tag="45" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/bin/bash"/> @@ -52,7 +52,7 @@ <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> <label name="org.opencontainers.image.licenses" value="MIT"/> <label name="org.opencontainers.image.title" value="fedora-minimal"/> - <label name="org.opencontainers.image.version" value="rawhide"/> + <label name="org.opencontainers.image.version" value="45"/> </labels> <environment> <env name="container" value="oci"/> @@ -69,7 +69,7 @@ <type image="oci"> <containerconfig name="fedora-init" - tag="rawhide" + tag="45" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/sbin/init"/> @@ -78,7 +78,7 @@ <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> <label name="org.opencontainers.image.licenses" value="MIT"/> <label name="org.opencontainers.image.title" value="fedora-init"/> - <label name="org.opencontainers.image.version" value="rawhide"/> + <label name="org.opencontainers.image.version" value="45"/> </labels> <stopsignal>SIGRTMIN+3</stopsignal> </containerconfig> @@ -92,7 +92,7 @@ <type image="oci"> <containerconfig name="fedora-toolbox" - tag="rawhide" + tag="45" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/bin/bash"/> @@ -101,7 +101,7 @@ <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> <label name="org.opencontainers.image.licenses" value="MIT"/> <label name="org.opencontainers.image.title" value="fedora-toolbox"/> - <label name="org.opencontainers.image.version" value="rawhide"/> + <label name="org.opencontainers.image.version" value="45"/> <label name="com.github.containers.toolbox" value="true"/> </labels> <environment> @@ -231,7 +231,6 @@ <package name="man-db"/> <package name="man-pages"/> <package name="mesa-dri-drivers"/> - <package name="mesa-va-drivers" arch="aarch64,ppc64le,x86_64,riscv64"/> <!-- doesn't exist in s390x --> <package name="mesa-vulkan-drivers"/> <package name="mtr"/> <package name="nss-mdns"/> 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 bda4459..5eebfb4 100644 --- a/teams/eln/container.xml +++ b/teams/eln/container.xml @@ -77,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"/> @@ -130,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"/> diff --git a/teams/eln/desktop-environments.xml b/teams/eln/desktop-environments.xml index 6a47168..c9741b0 100644 --- a/teams/eln/desktop-environments.xml +++ b/teams/eln/desktop-environments.xml @@ -32,6 +32,7 @@ <packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop"> <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-desktop-environment"/> 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"> diff --git a/teams/robotics.xml b/teams/robotics.xml deleted file mode 100644 index 5c84c79..0000000 --- a/teams/robotics.xml +++ /dev/null @@ -1,82 +0,0 @@ -<image> - <profiles> - <profile name="RoboticsCore" description="Core packages for Robotics"> - </profile> - <profile name="RoboticsGNOMEDesktop" description="Desktop packages for Robotics"> - <requires profile="RoboticsCore"/> - <requires profile="DesktopCommon"/> - </profile> - <profile name="Robotics-Live" description="Robotics Lab Live DVD"> - <requires profile="RoboticsGNOMEDesktop"/> - <requires profile="LiveInstall"/> - </profile> - <profile name="Robotics-Disk" description="Robotics Lab Install Disk"> - <requires profile="RoboticsGNOMEDesktop"/> - <requires profile="BootDiskCore"/> - </profile> - </profiles> - <packages type="bootstrap" patternType="plusRecommended" profiles="RoboticsGNOMEDesktop"> - <package name="fedora-release-workstation"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="RoboticsCore"> - <namedCollection name="core"/> - <namedCollection name="standard"/> - <!-- Add robotics suite development packages --> - <namedCollection name="robotics-suite"/> - <package name="langpacks-en"/> - <package name="nano"/> - <package name="openssh-clients"/> - <package name="vim-enhanced"/> - <package name="wget2-wget"/> - <!-- Add version control packages --> - <package name="git"/> - <package name="mercurial"/> - <!-- No abrt --> - <ignore name="abrt*"/> - <!-- No legacy crontab --> - <ignore name="cron*"/> - <!-- Remove LaTeX stack (rhbz#1862450, rhbz#1902354) --> - <ignore name="texlive-base"/> - <ignore name="texlive-latex"/> - <!-- Dictionaries are big --> - <ignore name="aspell-*"/> - <ignore name="man-pages*"/> - <ignore name="words"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="RoboticsGNOMEDesktop"> - <namedCollection name="base-graphical"/> - <namedCollection name="desktop-accessibility"/> - <namedCollection name="firefox"/> - <namedCollection name="gnome-desktop"/> - <namedCollection name="guest-desktop-agents"/> - <namedCollection name="networkmanager-submodules"/> - <package name="emacs"/> - <!-- Drop some system-config things --> - <ignore name="system-config-language"/> - <ignore name="system-config-network"/> - <ignore name="system-config-rootpassword"/> - <ignore name="system-config-services"/> - <ignore name="system-config-printer*"/> - <ignore name="policycoreutils-gui"/> - <!-- No user docs --> - <ignore name="gnome-user-docs"/> - <!-- No inkscape --> - <ignore name="inkscape*"/> - <ignore name="GraphicsMagick*"/> - <ignore name="ImageMagick*"/> - <!-- Block extra GNOME applications --> - <ignore name="gnome-boxes"/> - <ignore name="gnome-calendar"/> - <ignore name="gnome-clocks"/> - <ignore name="gnome-contacts"/> - <ignore name="gnome-disk-utility"/> - <ignore name="gnome-documents"/> - <ignore name="gnome-font-viewer"/> - <ignore name="gnome-maps"/> - <ignore name="gnome-photos"/> - <ignore name="gnome-weather"/> - <ignore name="grilo-plugins"/> - <ignore name="totem"/> - <ignore name="totem-nautilus"/> - </packages> -</image> diff --git a/teams/sway.xml b/teams/sway.xml index 2888b87..a7c7074 100644 --- a/teams/sway.xml +++ b/teams/sway.xml @@ -12,4 +12,8 @@ <packages type="bootstrap" patternType="plusRecommended" profiles="Sway-Live,Sway-Disk"> <package name="fedora-release-sway"/> </packages> + <packages type="image" patternType="plusRecommended" profiles="Sway-Live"> + <!-- Required to display installation instructions --> + <package name="nwg-wrapper"/> + </packages> </image> |