Diffstat (limited to 'teams')
| -rw-r--r-- | teams/asahi.xml | 7 | ||||
| -rw-r--r-- | teams/astronomy.xml | 106 | ||||
| -rw-r--r-- | teams/cloud/cloud.xml | 110 | ||||
| -rw-r--r-- | teams/cloud/container.xml | 44 | ||||
| -rw-r--r-- | teams/cloud/vagrant.xml | 6 | ||||
| -rw-r--r-- | teams/cloud/wsl.xml | 4 | ||||
| -rw-r--r-- | teams/designsuite.xml | 34 | ||||
| -rw-r--r-- | teams/eln/cloud.xml | 83 | ||||
| -rw-r--r-- | teams/eln/container.xml | 141 | ||||
| -rw-r--r-- | teams/eln/desktop-environments.xml | 49 | ||||
| -rw-r--r-- | teams/eln/liveprofiles.xml | 16 | ||||
| -rw-r--r-- | teams/eln/wsl.xml | 7 | ||||
| -rw-r--r-- | teams/games.xml | 173 | ||||
| -rw-r--r-- | teams/jam.xml | 50 | ||||
| -rw-r--r-- | teams/scitech.xml | 4 | ||||
| -rw-r--r-- | teams/security.xml | 76 | ||||
| -rw-r--r-- | teams/server.xml | 18 | ||||
| -rw-r--r-- | teams/sway.xml | 4 | ||||
| -rw-r--r-- | teams/workstation.xml | 3 |
19 files changed, 847 insertions, 88 deletions
diff --git a/teams/asahi.xml b/teams/asahi.xml index 4eefcbf..4d89966 100644 --- a/teams/asahi.xml +++ b/teams/asahi.xml @@ -35,8 +35,6 @@ <package name="mesa-dri-drivers.i686"/> <package name="mesa-vulkan-drivers.x86_64"/> <package name="mesa-vulkan-drivers.i686"/> - <package name="mesa-va-drivers.x86_64"/> - <package name="mesa-va-drivers.i686"/> <package name="mesa-demos.x86_64"/> <package name="libglvnd-opengl.x86_64"/> <package name="libglvnd-opengl.i686"/> @@ -122,12 +120,8 @@ <package name="libXrandr.i686"/> <package name="clang-libs.x86_64"/> <package name="clang-libs.i686"/> - <package name="clang18-libs.x86_64"/> - <package name="clang18-libs.i686"/> <package name="llvm-libs.x86_64"/> <package name="llvm-libs.i686"/> - <package name="llvm18-libs.x86_64"/> - <package name="llvm18-libs.i686"/> <package name="libclc.x86_64"/> <package name="libclc.i686"/> <package name="spirv-tools-libs.x86_64"/> @@ -158,7 +152,6 @@ <package name="xterm"/> <package name="xz"/> <package name="wine.x86_64"/> - <package name="wine.i686"/> <package name="vulkan-tools"/> <package name="vulkan-loader.i686"/> <package name="vulkan-loader.x86_64"/> diff --git a/teams/astronomy.xml b/teams/astronomy.xml new file mode 100644 index 0000000..740a949 --- /dev/null +++ b/teams/astronomy.xml @@ -0,0 +1,106 @@ +<image> + <profiles> + <profile name="AstronomyDesktop" description="Desktop packages for Astronomy"> + <requires profile="KDE-Desktop"/> + </profile> + <profile name="Astronomy_KDE-Live" description="Astronomy KDE Lab Live DVD"> + <requires profile="AstronomyDesktop"/> + <requires profile="LiveInstall"/> + </profile> + <profile name="Astronomy_KDE-Disk" description="Astronomy KDE Lab Install Disk"> + <requires profile="AstronomyDesktop"/> + <requires profile="BootDiskCore"/> + </profile> + </profiles> + <packages type="bootstrap" patternType="plusRecommended" profiles="AstronomyDesktop"> + <package name="fedora-release-kde"/> + </packages> + <packages type="image" patternType="plusRecommended" profiles="AstronomyDesktop"> + <!-- Installing the default/mandatory packages from engineering & scientific --> + <namedCollection name="engineering-and-scientific"/> + <!-- Basic development --> + <namedCollection name="development-tools"/> + <namedCollection name="c-development"/> + <!-- astronomical data analysis --> + <package name="astrometry"/> + <package name="astrometry-tycho2"/> + <package name="cdsclient"/> + <package name="cfitsio-utils"/> + <package name="psfex"/> + <package name="scamp"/> + <package name="sextractor"/> + <!-- <package name="siril"/> --> + <package name="skyviewer"/> + <package name="swarp"/> + <package name="wcstools"/> + <!-- Observatory: KStars + INDI --> + <package name="indistarter"/> + <package name="kstars"/> + <package name="libindi"/> + <!-- misc. astronomy --> + <!-- <package name="celestia"/> --> + <package name="stellarium"/> + <!-- <package name="virtualplanet"/> --> + <!-- Some astro environment stuff --> + <package name="astronomy-menus"/> + <package name="astronomy-menus-toplevel"/> + <!-- Python 3 and tools/libraries not included from the groups --> + <package name="python3"/> + <package name="python3-tools"/> + <package name="python3-matplotlib"/> + <package name="python3-scipy"/> + <package name="python3-numpy"/> + <package name="python3-ipython"/> + <package name="python3-ipython-console"/> + <package name="python3-ipython-notebook"/> + <package name="python3-sympy"/> + <package name="python3-networkx"/> + <package name="python3-pandas"/> + <package name="python3-pillow"/> + <package name="python3-seaborn"/> + <package name="python3-statsmodels"/> + <package name="python3-scikit-learn"/> + <package name="python3-scikit-image"/> + <!-- Python 3 astronomy --> + <package name="astropy-tools"/> + <package name="ginga"/> + <package name="python3-astropy"/> + <package name="python3-astroML"/> + <package name="python3-astroquery"/> + <package name="python3-astroscrappy"/> + <package name="python3-APLpy"/> + <package name="python3-ccdproc"/> + <package name="python3-fitsio"/> + <package name="python3-gatspy"/> + <package name="python3-photutils"/> + <package name="python3-pyvo"/> + <package name="python3-reproject"/> + <package name="python3-sep"/> + <!-- Matplotlib backend --> + <package name="python3-matplotlib-qt6"/> + <!-- Python IDE very useful for scientific use --> + <package name="python3-spyder"/> + <!-- BOINC for distributed computing --> + <package name="boinc-client"/> + <package name="boinc-manager"/> + <!-- Version control - A GUI for each as well --> + <package name="git"/> + <package name="git-gui"/> + <package name="git-cola"/> + <!-- Drawing, picture viewing tools, visualization tools --> + <package name="dia"/> + <package name="gimp"/> + <package name="kst"/> + <package name="kst-docs"/> + <package name="kst-fits"/> + <package name="LabPlot"/> + <!-- Misc tools --> + <package name="ImageMagick"/> + <package name="kate"/> + <package name="kate-plugins"/> + <package name="rlwrap"/> + <package name="screen"/> + <!-- Java JRE for VO tools --> + <package name="java"/> + </packages> +</image> diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml index 1bbd2c5..3a99ce7 100644 --- a/teams/cloud/cloud.xml +++ b/teams/cloud/cloud.xml @@ -28,17 +28,18 @@ <requires profile="Cloud-Base-Generic"/> </profile> </profiles> - <preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-Azure" arch="x86_64"> <type image="oem" format="vhd-fixed" formatoptions="force_size" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -48,18 +49,61 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-Azure" arch="aarch64"> + <type image="oem" format="vhd-fixed" formatoptions="force_size" + filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="false" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" console="serial" timeout="0"/> + <systemdisk> + <volume name="@root=root"/> + <volume name="boot" parent="/"/> + <volume name="home" parent="/"/> + <volume name="var" parent="/"/> + </systemdisk> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64"> <type image="oem" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" timeout="0"/> + <size unit="G">5</size> + <systemdisk> + <volume name="@root=root"/> + <volume name="boot" parent="/"/> + <volume name="home" parent="/"/> + <volume name="var" parent="/"/> + </systemdisk> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-AmazonEC2" arch="aarch64"> + <type image="oem" + filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" timeout="0"/> <size unit="G">5</size> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -68,12 +112,34 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-GCE" arch="x86_64"> <type image="oem" format="gce" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" timeout="0"/> + <!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G --> + <size unit="G">10</size> + <systemdisk> + <volume name="@root=root"/> + <volume name="boot" parent="/"/> + <volume name="home" parent="/"/> + <volume name="var" parent="/"/> + </systemdisk> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-GCE" arch="aarch64"> + <type image="oem" format="gce" + filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" + kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" timeout="0"/> @@ -81,6 +147,7 @@ <size unit="G">10</size> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -89,18 +156,40 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64,riscv64"> + <preferences profiles="Cloud-Base-Generic" arch="x86_64,riscv64"> <type image="oem" format="qcow2" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> + <size unit="G">5</size> + <systemdisk> + <volume name="@root=root"/> + <volume name="boot" parent="/"/> + <volume name="home" parent="/"/> + <volume name="var" parent="/"/> + </systemdisk> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-Generic" arch="aarch64"> + <type image="oem" format="qcow2" + filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> <size unit="G">5</size> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -114,13 +203,14 @@ filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw" + bootpartition="false" firmware="ofw" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> <size unit="G">5</size> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -134,7 +224,7 @@ filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" rootfs_label="fedora" > <bootloader name="zipl" timeout="1"/> diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml index 812a559..8b4b963 100644 --- a/teams/cloud/container.xml +++ b/teams/cloud/container.xml @@ -24,14 +24,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="rawhide"/> - <!-- 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="rawhide"/> </labels> <environment> <env name="container" value="oci"/> @@ -55,14 +50,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-minimal"/> + <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"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="name" value="fedora-minimal"/> - <label name="version" value="rawhide"/> </labels> <environment> <env name="container" value="oci"/> @@ -86,14 +76,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-init"/> + <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"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="name" value="fedora-init"/> - <label name="version" value="rawhide"/> </labels> <stopsignal>SIGRTMIN+3</stopsignal> </containerconfig> @@ -114,15 +99,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="rawhide"/> <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="rawhide"/> </labels> <environment> <env name="container" value="oci"/> @@ -160,6 +140,7 @@ <package name="rpm"/> <package name="shadow-utils"/> <package name="util-linux-core"/> + <package name="gawk"/> </packages> <packages type="bootstrap" profiles="Container-Base-Generic-Minimal"> <ignore name="glibc-langpack-en"/> @@ -250,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"/> @@ -294,4 +274,10 @@ <package name="systemd-resolved"/> <package name="xkeyboard-config"/> </packages> + <packages type="bootstrap" profiles="Container-Base-Generic-Minimal,Container-Base-Generic,Container-Toolbox"> + <package name="systemd-standalone-tmpfiles"/> + </packages> + <packages type="uninstall" profiles="Container-Base-Generic-Minimal,Container-Base-Generic,Container-Toolbox"> + <package name="systemd-standalone-tmpfiles"/> + </packages> </image> diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml index d25b163..301b08c 100644 --- a/teams/cloud/vagrant.xml +++ b/teams/cloud/vagrant.xml @@ -15,7 +15,7 @@ filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="1"/> @@ -23,6 +23,7 @@ <vagrantconfig provider="libvirt" virtualsize="5"/> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -36,7 +37,7 @@ filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="1"/> @@ -44,6 +45,7 @@ <vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="5"/> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> diff --git a/teams/cloud/wsl.xml b/teams/cloud/wsl.xml index 9c36b91..ffafb79 100644 --- a/teams/cloud/wsl.xml +++ b/teams/cloud/wsl.xml @@ -3,7 +3,7 @@ <profile name="WSL-Base" description="Windows Subsystem for Linux Base"/> </profiles> <preferences profiles="WSL-Base"> - <type image="tbz"/> + <type image="wsl"/> <timezone>Etc/UTC</timezone> <locale>en_US</locale> <rpm-locale-filtering>false</rpm-locale-filtering> @@ -15,9 +15,7 @@ <package name="dnf5"/> <package name="dnf5-plugins"/> <package name="fedora-release-wsl"/> - <package name="policycoreutils"/> <package name="rpm"/> - <package name="selinux-policy-targeted"/> </packages> <packages type="image" patternType="plusRecommended" profiles="WSL-Base"> <package name="attr"/> diff --git a/teams/designsuite.xml b/teams/designsuite.xml new file mode 100644 index 0000000..a50ed6b --- /dev/null +++ b/teams/designsuite.xml @@ -0,0 +1,34 @@ +<image> + <profiles> + <profile name="DesignSuiteDesktop" description="Desktop packages for Design Suite"> + <requires profile="GNOME-Desktop"/> + </profile> + <profile name="Design_suite-Live" description="Design Suite Lab Live DVD"> + <requires profile="DesignSuiteDesktop"/> + <requires profile="LiveInstall"/> + </profile> + <profile name="Design_suite-Disk" description="Design Suite Lab Install Disk"> + <requires profile="DesignSuiteDesktop"/> + <requires profile="BootDiskCore"/> + </profile> + </profiles> + <packages type="bootstrap" patternType="plusRecommended" profiles="DesignSuiteDesktop"> + <package name="fedora-release-designsuite"/> + </packages> + <packages type="image" patternType="plusRecommended" profiles="DesignSuiteDesktop"> + <namedCollection name="design-suite"/> + <!-- Provides backup application (blocked by Workstation exclude of python3-boto3) --> + <!-- <package name="deja-dup"/> --> + <!-- Add extra gnome applications --> + <package name="gnome-calendar"/> + <package name="gnome-shell-extension-gsconnect"/> + <!-- Some convertible devices have broken automatic screen rotation on GNOME Wayland --> + <package name="gnome-shell-extension-screen-autorotate"/> + <package name="gnome-todo"/> + <!-- Add cosmetic for terminal --> + <package name="powerline"/> + <package name="powerline-fonts"/> + <!-- Removal of unneeded applications --> + <ignore name="gnome-boxes"/> + </packages> +</image> diff --git a/teams/eln/cloud.xml b/teams/eln/cloud.xml index 090b7b5..b146d48 100644 --- a/teams/eln/cloud.xml +++ b/teams/eln/cloud.xml @@ -28,12 +28,12 @@ <requires profile="Cloud-Base-Generic"/> </profile> </profiles> - <preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-Azure" arch="x86_64"> <type image="oem" format="vhd-fixed" formatoptions="force_size" filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> @@ -43,12 +43,27 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-Azure" arch="aarch64"> + <type image="oem" format="vhd-fixed" formatoptions="force_size" + filesystem="xfs" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64"> <type image="oem" filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" timeout="0"/> @@ -58,12 +73,27 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-AmazonEC2" arch="aarch64"> + <type image="oem" + filesystem="xfs" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" timeout="0"/> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-GCE" arch="x86_64"> <type image="oem" format="gce" filesystem="xfs" kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" timeout="0"/> @@ -74,12 +104,43 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-GCE" arch="aarch64"> + <type image="oem" format="gce" + filesystem="xfs" + kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" timeout="0"/> + <!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G --> + <size unit="G">10</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-Generic" arch="x86_64"> <type image="oem" format="qcow2" filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-Generic" arch="aarch64"> + <type image="oem" format="qcow2" + filesystem="xfs" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> @@ -94,7 +155,7 @@ filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" firmware="ofw" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> @@ -109,7 +170,7 @@ filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" rootfs_label="fedora" > <bootloader name="zipl" timeout="1"/> @@ -138,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 ec934d1..5eebfb4 100644 --- a/teams/eln/container.xml +++ b/teams/eln/container.xml @@ -5,6 +5,7 @@ <profile name="Container-Base-Generic" description="Generic Base Container Image"> <requires profile="ContainerCore"/> </profile> + <profile name="Container-Toolbox" description="Toolbox Container Image"/> </profiles> <preferences profiles="Container-Base-Generic"> <type image="oci"> @@ -17,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"/> @@ -36,6 +32,33 @@ <rpm-locale-filtering>true</rpm-locale-filtering> <rpm-excludedocs>true</rpm-excludedocs> </preferences> + <preferences profiles="Container-Toolbox"> + <type image="oci"> + <containerconfig + name="fedora-toolbox" + tag="eln" + maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" + > + <subcommand execute="/bin/bash"/> + <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.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"/> + </labels> + <environment> + <env name="container" value="oci"/> + <env name="PATH" value="/usr/local/bin:/usr/bin"/> + </environment> + </containerconfig> + </type> + <timezone>Etc/UTC</timezone> + <locale>en_US</locale> + <rpm-locale-filtering>false</rpm-locale-filtering> + <rpm-excludedocs>false</rpm-excludedocs> + </preferences> <packages type="bootstrap" profiles="ContainerCore"> <ignore name="dosfstools"/> <ignore name="e2fsprogs"/> @@ -54,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"/> @@ -77,4 +100,106 @@ <package name="xz"/> <package name="zstd"/> </packages> + <packages type="bootstrap" patternType="plusRecommended" profiles="Container-Toolbox"> + <ignore name="dosfstools"/> + <ignore name="e2fsprogs"/> + <ignore name="*-firmware"/> + <ignore name="fuse-libs"/> + <ignore name="geolite2-city"/> + <ignore name="geolite2-country"/> + <ignore name="grubby"/> + <ignore name="kernel"/> + <ignore name="libss"/> <!-- used by e2fsprogs --> + <ignore name="pinentry"/> + <ignore name="shared-mime-info"/> + <ignore name="sssd-client"/> + <!-- This is a weak dep of systemd, we do not want this in the container; + see: https://github.com/containers/toolbox/issues/1410 --> + <ignore name="systemd-resolved"/> + <ignore name="trousers"/> + <ignore name="xkeyboard-config"/> + <package name="acl"/> + <package name="bash"/> + <package name="bash-completion"/> + <package name="bc"/> + <package name="bzip2"/> + <package name="coreutils"/> + <package name="coreutils-common"/> + <package name="cpio"/> + <package name="curl"/> + <package name="diffutils"/> + <package name="dnf5"/> + <package name="dnf5-plugins"/> + <package name="fedora-eln-release"/> + <package name="file"/> + <package name="findutils"/> + <package name="flatpak-spawn"/> + <package name="gawk"/> + <package name="git"/> + <package name="glibc-all-langpacks"/> + <package name="gnupg2"/> + <package name="gnupg2-smime"/> + <package name="grep"/> + <package name="gvfs-client"/> + <package name="gzip"/> + <package name="hostname"/> + <package name="iproute"/> + <package name="iputils"/> + <package name="kbd-misc"/> + <package name="keyutils"/> + <package name="krb5-libs"/> + <package name="langpacks-en"/> + <package name="less"/> + <package name="libcap"/> + <package name="lsof"/> + <package name="man-db"/> + <package name="man-pages"/> + <package name="mesa-dri-drivers"/> + <package name="mesa-vulkan-drivers" arch="x86_64"/> + <package name="mtr"/> + <package name="openssh-clients"/> + <package name="openssl"/> + <package name="pam"/> + <package name="pigz"/> + <package name="policycoreutils"/> + <package name="procps-ng"/> + <package name="psmisc"/> + <package name="python3"/> + <package name="rootfiles"/> + <package name="rpm"/> + <package name="rsync"/> + <package name="sed"/> + <package name="shadow-utils"/> + <package name="sudo"/> + <package name="tar"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1409920 --> + <package name="tcpdump"/> + <package name="time"/> + <package name="traceroute"/> + <package name="tree"/> + <package name="tzdata"/> + <package name="unzip"/> + <package name="util-linux"/> + <package name="vim-minimal"/> + <package name="vte-profile"/> + <package name="vulkan-loader"/> + <package name="wget"/> + <package name="which"/> + <package name="whois"/> + <package name="words"/> + <package name="xorg-x11-xauth"/> + <package name="xz"/> + <package name="zip"/> + </packages> + <packages type="uninstall" profiles="Container-Toolbox"> + <package name="dracut"/> + <package name="pinentry"/> + <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 new file mode 100644 index 0000000..c9741b0 --- /dev/null +++ b/teams/eln/desktop-environments.xml @@ -0,0 +1,49 @@ +<image> + <profiles> + <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="GNOME-Desktop" description="GNOME Desktop"> + <requires profile="DesktopCommon"/> + </profile> + <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"/> + <namedCollection name="multimedia"/> + <namedCollection name="networkmanager-submodules"/> + <namedCollection name="print-client"/> + <namedCollection name="standard"/> + <ignore name="insights-client"/> + <ignore name="libdnf-plugin-subscription-manager"/> + <ignore name="subscription-manager"/> + <ignore name="subscription-manager-cockpit"/> + </packages> + <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"/> + <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 new file mode 100644 index 0000000..05f7acb --- /dev/null +++ b/teams/eln/liveprofiles.xml @@ -0,0 +1,16 @@ +<image> + <profiles> + <profile name="GNOME-Live" description="GNOME Live DVD"> + <requires profile="GNOME-Desktop"/> + <requires profile="LiveInstall"/> + </profile> + <profile name="KDE-Live" description="KDE Plasma Live DVD"> + <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 c1c4beb..051f8e6 100644 --- a/teams/eln/wsl.xml +++ b/teams/eln/wsl.xml @@ -3,7 +3,7 @@ <profile name="WSL-Base" description="Windows Subsystem for Linux Base"/> </profiles> <preferences profiles="WSL-Base"> - <type image="tbz"/> + <type image="wsl"/> <timezone>Etc/UTC</timezone> <locale>en_US</locale> <rpm-locale-filtering>false</rpm-locale-filtering> @@ -14,10 +14,8 @@ <package name="coreutils"/> <package name="dnf5"/> <package name="dnf5-plugins"/> - <package name="fedora-release-eln"/> - <package name="policycoreutils"/> + <package name="fedora-eln-release"/> <package name="rpm"/> - <package name="selinux-policy-targeted"/> </packages> <packages type="image" patternType="plusRecommended" profiles="WSL-Base"> <package name="attr"/> @@ -61,6 +59,7 @@ <package name="wget"/> <package name="which"/> <package name="whois"/> + <package name="wsl-setup"/> <package name="zip"/> </packages> </image> diff --git a/teams/games.xml b/teams/games.xml new file mode 100644 index 0000000..fdfa829 --- /dev/null +++ b/teams/games.xml @@ -0,0 +1,173 @@ +<image> + <profiles> + <profile name="GamesKDEDesktop" description="KDE Desktop packages for Games Lab"> + <requires profile="DesktopCommon"/> + </profile> + <profile name="GamesDesktop" description="Desktop packages for Games Lab"> + <requires profile="GamesKDEDesktop"/> + </profile> + <profile name="Games-Live" description="Games Lab Live DVD"> + <requires profile="GamesDesktop"/> + <requires profile="LiveInstall"/> + </profile> + <profile name="Games-Disk" description="Games Lab Install Disk"> + <requires profile="GamesDesktop"/> + <requires profile="BootDiskCore"/> + </profile> + </profiles> + <packages type="bootstrap" patternType="plusRecommended" profiles="GamesKDEDesktop"> + <package name="fedora-release-kde"/> + </packages> + <packages type="image" patternType="plusRecommended" profiles="GamesKDEDesktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="kde-desktop-environment"/> + <namedCollection name="kde-apps"/> + <namedCollection name="kde-media"/> + <namedCollection name="firefox"/> + <namedCollection name="x86-emulation" arch="aarch64"/> + <package name="kde-l10n"/> + <ignore name="gnome-disk-utility"/> <!-- redundant with kde partitionmanager --> + <ignore name="mariadb-server-utils"/> <!-- Not needed on desktops (pagure.io:fedora-kde/SIG#566) --> + <ignore name="system-config-language"/> <!-- redundant with kcms --> + <ignore name="system-config-printer"/> <!-- redundant with kcms --> + <!-- drop tracker stuff pulled in by gtk3 (pagureio:fedora-kde/SIG#124) --> + <ignore name="tracker"/> + <ignore name="tracker-miners"/> + <!-- space issues --> + <ignore name="digikam"/> <!-- digikam has duplicate functionality with gwenview (~28 megs) --> + <ignore name="k3b"/> <!-- ~15 megs --> + <ignore name="kipi-plugins"/> <!-- ~8 megs + drags in marble --> + <ignore name="krusader"/> <!-- ~4 megs --> + <ignore name="ktorrent"/> <!-- ~15 megs --> + <ignore name="initial-setup"/> <!-- redundant with plasma-setup --> + </packages> + <packages type="image" patternType="plusRecommended" profiles="GamesDesktop"> + <!-- The point of this is to show off Fedora games, not running Windows ones --> + <ignore name="wine"/> + <!-- Remove LibreOffice, we're here to have fun! --> + <ignore name="libreoffice*"/> + <!-- Allow joysticks and gamepads to work --> + <package name="joystick-support"/> + <package name="steam-devices"/> + <!-- Games --> + <!-- Traditional (big) --> + <!-- <package name="alienarena"/> --> <!-- Cut for size --> + <package name="armacycles-ad"/> + <package name="asc"/> + <package name="asc-music"/> + <package name="astromenace"/> + <package name="boswars"/> + <package name="bzflag"/> + <package name="crossfire-client"/> + <package name="extremetuxracer"/> + <package name="freeciv"/> + <package name="freecol"/> + <package name="freedoom"/> + <package name="freedroidrpg"/> + <package name="frozen-bubble"/> + <package name="glob2"/> + <package name="lincity-ng"/> + <package name="megaglest"/> + <package name="nethack-vultures"/> + <package name="netpanzer"/> + <package name="neverball"/> + <package name="nogravity"/> + <!-- <package name="pinball"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <package name="scorched3d"/> + <package name="supertux"/> + <package name="supertuxkart"/> + <package name="ultimatestunts"/> + <package name="warzone2100"/> + <package name="wesnoth"/> + <!-- <package name="worminator"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <package name="warmux"/> + <package name="xmoto"/> + <!-- Traditional (small) --> + <package name="abe"/> + <!-- <package name="alex4"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <!-- <package name="ballz"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <package name="blobwars"/> + <package name="bombardier"/> + <package name="cdogs-sdl"/> + <package name="clanbomber"/> + <package name="colossus"/> + <package name="foobillard"/> + <package name="glaxium"/> + <package name="gnubg"/> + <package name="gnugo"/> + <package name="haxima"/> + <package name="hedgewars"/> + <package name="kcheckers"/> + <package name="knights"/> + <package name="lbrickbuster2"/> + <!-- <package name="liquidwar"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <package name="lordsawar"/> + <!-- <package name="machineball"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <package name="nethack"/> + <package name="openlierox"/> + <package name="pachi"/> + <package name="pioneers"/> + <package name="quarry"/> + <!-- <package name="Ri-li"/> --> <!-- Cut for size --> + <package name="rogue"/> + <!-- <package name="scorchwentbonkers"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <package name="solarwolf"/> + <package name="sopwith"/> + <package name="stormbaancoureur"/> + <package name="ularn"/> + <package name="xblast"/> + <!-- Arcade classics(ish) (big) --> + <package name="auriferous"/> + <package name="alienblaster"/> + <!-- <package name="duel3"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <package name="powermanga"/> + <!-- <package name="raidem"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <!-- <package name="raidem-music"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <package name="trackballs"/> + <package name="trackballs-music"/> + <!-- Arcade classics(ish) (small) --> + <package name="ballbuster"/> + <package name="CriticalMass"/> + <package name="dd2"/> + <package name="KoboDeluxe"/> + <!-- <package name="lacewing"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <package name="Maelstrom"/> + <package name="methane"/> + <package name="njam"/> + <package name="shippy"/> + <package name="tecnoballz"/> + <package name="wordwarvi"/> + <package name="xgalaxy"/> + <!-- <package name="zasx"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <!-- Falling blocks games (small) --> + <package name="amoebax"/> + <package name="crack-attack"/> + <!-- <package name="crystal-stacker"/> --> <!-- Would pull in fluid-soundfont-lite-patches --> + <package name="gemdropx"/> + <package name="gweled"/> + <!-- Puzzles (big) --> + <package name="enigma"/> + <package name="fillets-ng"/> + <package name="pingus"/> + <!-- Puzzles (small) --> + <!-- <package name="gbrainy"/> --> <!-- Removed for space - only game that pulls in mono --> + <package name="mirrormagic"/> + <package name="pipenightdreams"/> + <package name="pipepanic"/> + <package name="pychess"/> + <package name="rocksndiamonds"/> + <package name="vodovod"/> + <!-- Card games --> + <package name="PySolFC"/> + <!-- Educational/Simulation --> + <package name="planets"/> + <package name="tuxpaint"/> + <package name="tuxpaint-stamps"/> + <package name="tuxtype2"/> + <!-- Compilations (we are avoiding compilations, rare exceptions) --> + <package name="bsd-games"/> + <!-- Utilities --> + <package name="games-menus"/> + <ignore name="autodownloader"/> <!-- Nothing should be downloading data to play --> + </packages> +</image> diff --git a/teams/jam.xml b/teams/jam.xml new file mode 100644 index 0000000..33812e8 --- /dev/null +++ b/teams/jam.xml @@ -0,0 +1,50 @@ +<image> + <profiles> + <profile name="JamDesktop" description="Desktop packages for Jam"> + <requires profile="KDE-Desktop"/> + </profile> + <profile name="Jam_KDE-Live" description="Jam KDE Lab Live DVD"> + <requires profile="JamDesktop"/> + <requires profile="LiveInstall"/> + </profile> + <profile name="Jam_KDE-Disk" description="Jam KDE Lab Install Disk"> + <requires profile="JamDesktop"/> + <requires profile="BootDiskCore"/> + </profile> + </profiles> + <packages type="bootstrap" patternType="plusRecommended" profiles="JamDesktop"> + <package name="fedora-release-kde"/> + </packages> + <packages type="image" patternType="plusRecommended" profiles="JamDesktop"> + <!-- Installing the default/mandatory packages for audio production --> + <namedCollection name="audio"/> + <!-- PipeWire --> + <package name="pipewire"/> + <!-- sound analysis, none of these are packaged yet --> + <!-- <package name="praat"/> --> <!-- rhbz#666656 --> + <!-- <package name="friture"/> --> + <!-- writing & publishing --> + <package name="emacs"/> + <package name="emacs-color-theme"/> + <package name="vim-enhanced"/> + <package name="nano"/> + <!-- fedora jam theming (to be customized) --> + <package name="fedora-jam-backgrounds"/> + <package name="fedora-jam-kde-theme"/> + <!-- Misc tools --> + <package name="multimedia-menus"/> + <package name="kernel-tools"/> + <package name="screen"/> + <!-- Add Mozilla Thunderbird --> + <package name="thunderbird"/> + <!-- Remove packages not needed --> + <ignore name="akregator"/> + <ignore name="kaddressbook"/> + <ignore name="kmail"/> + <ignore name="kontact"/> + <ignore name="korganizer"/> + <ignore name="non-mixer"/> + <ignore name="non-session-manager"/> + <ignore name="non-sequencer"/> + </packages> +</image> diff --git a/teams/scitech.xml b/teams/scitech.xml index 831855f..9995bf2 100644 --- a/teams/scitech.xml +++ b/teams/scitech.xml @@ -28,7 +28,7 @@ filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="1"/> @@ -49,7 +49,7 @@ filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="1"/> diff --git a/teams/security.xml b/teams/security.xml new file mode 100644 index 0000000..a20b8ec --- /dev/null +++ b/teams/security.xml @@ -0,0 +1,76 @@ +<image> + <profiles> + <profile name="SecurityDesktop" description="Desktop packages for Security Lab"> + <requires profile="Xfce-Desktop"/> + </profile> + <profile name="Security-Live" description="Security Lab Live DVD"> + <requires profile="SecurityDesktop"/> + <requires profile="LiveInstall"/> + </profile> + <profile name="Security-Disk" description="Security Lab Install Disk"> + <requires profile="SecurityDesktop"/> + <requires profile="BootDiskCore"/> + </profile> + </profiles> + <packages type="bootstrap" patternType="plusRecommended" profiles="SecurityDesktop"> + <package name="fedora-release"/> + </packages> + <packages type="image" patternType="plusRecommended" profiles="SecurityDesktop"> + <!-- Security tools --> + <namedCollection name="security-lab"/> + <package name="security-menus"/> + <!-- Unlock default keyring. FIXME: Should be done in comps --> + <package name="gnome-keyring-pam"/> + <!-- Save some space --> + <ignore name="autofs"/> + <ignore name="acpid"/> + <ignore name="gimp-help"/> + <ignore name="desktop-backgrounds-basic"/> + <ignore name="PackageKit*"/> <!-- We switched to dnfdragora, so we don't need this --> + <ignore name="aspell-*"/> <!-- Dictionaries are big --> + <ignore name="gnumeric"/> + <ignore name="foomatic-db-ppds"/> + <ignore name="foomatic"/> + <ignore name="stix-fonts"/> + <ignore name="default-fonts-core-math"/> + <ignore name="ibus-typing-booster"/> + <ignore name="xfce4-sensors-plugin"/> + <ignore name="man-pages-*"/> + <!-- Drop some system-config things --> + <ignore name="system-config-rootpassword"/> + <ignore name="policycoreutils-gui"/> + <!-- Exclude some packages to save some space --> + <ignore name="ArpON"/> + <ignore name="aide"/> + <ignore name="binwalk"/> + <ignore name="bkhive"/> + <ignore name="bonesi"/> + <ignore name="cmospwd"/> + <ignore name="dnstop"/> + <ignore name="etherape"/> + <ignore name="hfsutils"/> + <ignore name="httpie"/> + <ignore name="httrack"/> + <ignore name="hydra"/> + <ignore name="kismon"/> + <ignore name="labrea"/> + <ignore name="nebula"/> + <ignore name="netsed"/> + <ignore name="onesixtyone"/> + <ignore name="packETH"/> + <ignore name="pads"/> + <ignore name="pdfcrack"/> + <ignore name="proxychains"/> + <ignore name="pyrit"/> + <ignore name="rkhunter"/> + <ignore name="safecopy"/> + <ignore name="samdump2"/> + <ignore name="scalpel"/> + <ignore name="sslstrip"/> + <ignore name="tcpreen"/> + <ignore name="tcpreplay"/> + <ignore name="tripwire"/> + <ignore name="wipe"/> + <ignore name="zmap"/> + </packages> +</image> diff --git a/teams/server.xml b/teams/server.xml index 25288c9..f3b88f4 100644 --- a/teams/server.xml +++ b/teams/server.xml @@ -23,7 +23,7 @@ filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="500" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="500" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> @@ -41,7 +41,7 @@ filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" firmware="ofw" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> @@ -59,7 +59,7 @@ filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" rootfs_label="fedora" > <bootloader name="zipl" timeout="1"/> @@ -77,7 +77,7 @@ filesystem="xfs" kernelcmdline="earlycon" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="500" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> @@ -94,7 +94,7 @@ <type image="oem" filesystem="xfs" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="500" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="500" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="3" timeout_style="menu"/> @@ -111,7 +111,7 @@ <type image="oem" filesystem="xfs" devicepersistency="by-uuid" force_mbr="true" editbootinstall="editbootinstall_rpilegacy.sh" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="500" disk_start_sector="34816" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="3" timeout_style="menu"/> @@ -128,7 +128,7 @@ <type image="oem" filesystem="xfs" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" firmware="ofw" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="3" timeout_style="menu"/> @@ -145,7 +145,7 @@ <type image="oem" filesystem="xfs" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" rootfs_label="fedora" > <bootloader name="zipl" timeout="3"/> @@ -163,7 +163,7 @@ filesystem="xfs" kernelcmdline="earlycon" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="500" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" efipartsize="500" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="3" timeout_style="menu"/> 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> diff --git a/teams/workstation.xml b/teams/workstation.xml index afbf24b..660de7c 100644 --- a/teams/workstation.xml +++ b/teams/workstation.xml @@ -12,7 +12,4 @@ <packages type="bootstrap" patternType="plusRecommended" profiles="Workstation-Live,Workstation-Disk"> <package name="fedora-release-workstation"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="Workstation-Live"> - <package name="anaconda-webui"/> - </packages> </image> |