Don't exclude xkeyboard-config from minimal images (#2175244)

See https://bugzilla.redhat.com/show_bug.cgi?id=2175244#c15 .
We really need libxkbcommon for initial-setup to work properly,
since an ordering change in systemd 253. This exclusion causes
it to get dropped. libxkbcommon requires xkeyboard-config; since
systemd only recommends libxkbcommon (rather than hard requiring
it), the solver decides to honor the request to exclude
xkeyboard-config by dropping both it and libxkbcommon.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

custom/qa-test-day.ks

@@ -85,14 +85,14 @@ gtk-recordmydesktop
 gconf-editor
 dconf-editor
 nautilus-open-terminal
-iotop-c
+iotop
 htop
 
 # Add favorite power-user tools
 mc
 vim
 nano
-wget2-wget
+wget
 
 # Add dependencies for the welcome screen
 # (this makes it run also on non-GNOME systems)

fedora-budgie-common.ks

@@ -11,10 +11,6 @@ fedora-release-budgie
 
 # recommended apps
 @budgie-desktop-apps
-@libreoffice
-libreoffice-draw
-libreoffice-math
-thunderbird
 
 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils

fedora-cinnamon-common.ks

@@ -14,6 +14,9 @@ fedora-release-cinnamon
 @^cinnamon-desktop-environment
 
 @libreoffice
-exaile
+rhythmbox
+
+# extra backgrounds
+f36-backgrounds-extras-gnome
 
 %end

fedora-cloud-base-gcp.ks

@@ -9,7 +9,7 @@
 # Don't show bootloader as it's impossible for the user to get to it in time
 # So we might as well not waste the 1 second on each boot.
 # https://cloud.google.com/compute/docs/import/import-existing-image
-bootloader --timeout=0 --location=mbr --append="no_timer_check console=ttyS0,38400n8d"
+bootloader --timeout=0 --location=mbr --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d"
 
 # redefine `services` here to drop cloud-init systemd unit enablements from
 # fedora-cloud-base.ks since we don't use them.
@@ -18,9 +18,6 @@ services --enabled=sshd
 %packages
 # GCP provides its own guest environment.
 google-compute-engine-guest-configs
-# BZ 2193039: Ensure additional packages are present for ssh access management
-google-compute-engine-oslogin
-google-guest-agent
 -cloud-init
 # Fedora Cloud Base includes the qemu guest agent. GCP prefers
 # that it not be installed  https://pagure.io/cloud-sig/issue/319

fedora-cloud-base-vagrant.ks

@@ -22,6 +22,12 @@ rootpw vagrant
 bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0"
 
 %packages
+# The default koji Vagrantfile configuration uses rsync to sync files between
+# the vagrant host and the guest.  It uses yum to verify that rsync is present
+# and/or install it if it is not.  It will fail without adding the yum compat
+# layer for dnf
+# TODO: Teach vagrant about dnf
+dnf-yum
 # rsync gets installed when the Vagrant box is first launched on the
 # users setup. This can actually take a bit of time.  Just fold it
 # in to the base box disk image

fedora-cloud-base.ks

@@ -31,7 +31,8 @@ rootpw --lock --iscrypted locked
 
 firewall --disabled
 
-bootloader --timeout=1 --location=mbr --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
+bootloader --timeout=1 --location=mbr --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
 
 services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
@@ -56,13 +57,6 @@ reboot
 # Include packages for the cloud-server-environment group
 @^cloud-server-environment
 
-# Install the tracer dnf plugin to enable automatic reboots
-# IF the user requests package updates
-# AND requests a reboot
-# AND the packages updated require a reboot.
-# https://fedoraproject.org/wiki/Changes/Automatic_Cloud_Reboot_On_Updates
-python3-dnf-plugin-tracer
-
 # Don't include the kernel toplevel package since it pulls in
 # kernel-modules. We're happy for now with kernel-core.
 -kernel

fedora-comp-neuro-common.ks

@@ -0,0 +1,29 @@
+# Description: Packages for the NeuroFedora computational neuroscience lab image.
+#
+# Maintained by the NeuroFedora SIG:
+# https://neuro.fedoraproject.org
+# mailto:neuro-sig@lists.fedoraproject.org
+
+%packages
+fedora-release-compneuro
+# Includes numpy, scipy, jupyter, pandas, scikit, scipy, statsmodels, sympy, matplotlib
+@python-science
+
+#Computational neuroscience packages
+arbor
+genesis-simulator
+moose
+nest
+neuron
+neuron-devel
+python3
+python3-brian2
+python3-ipython
+python3-lfpy
+python3-nest
+python3-netpyne
+python3-neuron
+python3-pynn
+python3-steps
+
+%end

fedora-container-base-minimal.ks

@@ -1,12 +1,12 @@
 # See fedora-container-common.ks for details on how to hack on container image kickstarts
-# This base is a stripped back Fedora image without python3.
+# This base is a stripped back Fedora image without python3/dnf.
 # If you need that use the standard base image.
 
 %include fedora-container-common.ks
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
-dnf5
+microdnf
--tzdata
+
 %end
 
 %post --erroronfail --log=/root/anaconda-post.log
@@ -33,6 +33,11 @@ rm -fv /usr/bin/pinky
 # we lose presets by removing /usr/lib/systemd but we do not care
 rm -rfv /usr/lib/systemd
 
+# if you want to change the timezone, bind-mount it from the host or reinstall tzdata
+rm -fv /etc/localtime
+mv /usr/share/zoneinfo/UTC /etc/localtime
+rm -rfv  /usr/share/zoneinfo
+
 # Final pruning
 rm -rfv /var/cache/* /var/log/* /tmp/*
 

fedora-container-base.ks

@@ -5,10 +5,12 @@
 
 %packages --excludedocs --instLangs=en --nocore --excludeWeakdeps
 rootfiles
+# https://communityblog.fedoraproject.org/modularity-dead-long-live-modularity/
+fedora-repos-modular
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
-dnf5
+dnf
-dnf5-plugins
+dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
 sudo
 -glibc-langpack-en
 -langpacks-en

fedora-container-common.ks

@@ -35,7 +35,6 @@ fedora-release-container
 bash
 coreutils
 glibc-minimal-langpack
-tzdata
 rpm
 util-linux-core
 -kernel

fedora-container-toolbox.ks

@@ -1,225 +0,0 @@
-# Kickstart file for Fedora Toolbox
-
-# See fedora-container-common.ks for details on how to hack on container image kickstarts
-
-text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
-bootloader --disabled
-timezone --isUtc Etc/UTC
-timesource --ntp-disable
-rootpw --lock --iscrypted locked
-keyboard us
-network --bootproto=dhcp --device=link --activate --onboot=on
-reboot
-
-# boot partitions are irrelevant as the final docker image is a tarball
-zerombr
-clearpart --all
-autopart --noboot --nohome --noswap --nolvm
-
-# Install packages
-%packages --nocore
-acl
-bash
-bash-completion
-bc
-bzip2
-coreutils
-coreutils-common
-curl
-default-editor
-diffutils
-dnf5
-dnf5-plugins
--dosfstools
--e2fsprogs
-fedora-release-toolbx
-findutils
-flatpak-spawn
-fpaste
--fuse-libs
-gawk
-git
--glibc-minimal-langpack
-glibc-all-langpacks
-gnupg2
-gnupg2-smime
-grep
--grubby
-gvfs-client
-gzip
-hostname
-iproute
-iputils
--kernel
-keyutils
-krb5-libs
-less
-libcap
--libss
-lsof
-man-db
-man-pages
-mesa-dri-drivers
-mesa-vulkan-drivers
-mtr
-nss-mdns
-openssh-clients
-openssl
-p11-kit
-pam
-pigz
--pinentry
-procps-ng
-psmisc
-python3
-rootfiles
-rpm
-rsync
-sed
-shadow-utils
--shared-mime-info
--sssd-client
-sudo
-# This is a weak dependency of systemd, we do not want
-# this in the container; see
-#  https://github.com/containers/toolbox/issues/1410
--systemd-resolved
-tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
-tcpdump
-time
-traceroute
-tree
--trousers
-tzdata
-unzip
-util-linux
-util-linux-core
-vim-minimal
-vte-profile
-vulkan-loader
-wget2-wget
-which
-whois
-words
--xkeyboard-config
-xorg-x11-xauth
-xz
-zip
-%end
-
-# Pre-installation commands
-%pre
-# Copy README.md
-cp /README.md /mnt/sysimage/README.md
-
-# Remove macros.image-language-conf file
-rm -f /mnt/sysimage/etc/rpm/macros.image-language-conf
-
-# Remove 'tsflags=nodocs' line from dnf.conf
-sed -i '/tsflags=nodocs/d' /mnt/sysimage/etc/dnf/dnf.conf
-%end
-
-%post --erroronfail --log=/root/anaconda-post.log
-set -eux
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1727489
-echo 'LANG="C.UTF-8"' >  /etc/locale.conf
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1400682
-echo "Import RPM GPG key"
-releasever=$(rpm --eval '%{?fedora}')
-
-# When building ELN containers, we don't have the %{fedora} macro
-if [ -z $releasever ]; then
-  releasever=eln
-fi
-
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary
-
-echo "# fstab intentionally empty for containers" > /etc/fstab
-
-# Remove machine-id on pre generated images
-rm -f /etc/machine-id
-touch /etc/machine-id
-
-echo "# resolv placeholder" > /etc/resolv.conf
-chmod 644 /etc/resolv.conf
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1343138
-# Fix /run/lock breakage since it's not tmpfs in docker
-# This unmounts /run (tmpfs) and then recreates the files
-# in the /run directory on the root filesystem of the container
-#
-# We ignore the return code of the systemd-tmpfiles command because
-# at this point we have already removed the /etc/machine-id and all
-# tmpfiles lines with %m in them will fail and cause a bad return
-# code. Example failure:
-#   [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m
-#
-umount /run
-rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316
-
-# Final pruning
-rm -rfv /var/cache/* /var/log/* /tmp/*
-
-# Check if specified files exist
-declare -a files=(
- # bash
- "/usr/share/man/man1/bash.1*"
- "/usr/share/man/man1/cd.1*"
- "/usr/share/man/man1/export.1*"
- # coreutils-common
- "/usr/share/man/man1/cat.1*"
- "/usr/share/man/man1/cp.1*"
- "/usr/share/man/man1/ls.1*"
- # gnupg2
- "/usr/share/man/man1/gpg2.1*"
- "/usr/share/man/man7/gnupg2.7*"
- # psmisc
- "/usr/share/man/fr/man1/pstree.1*"
- "/usr/share/man/ko/man1/pstree.1*"
- "/usr/share/man/man1/pstree.1*"
- # rpm
- "/usr/share/man/man8/rpm.8*"
- "/usr/share/man/man8/rpm2cpio.8*"
- # shadow-utils
- "/usr/share/man/fr/man8/useradd.8*"
- "/usr/share/man/ja/man8/useradd.8*"
- "/usr/share/man/man8/useradd.8*"
- # util-linux
- "/usr/share/man/man1/cal.1.*"
- "/usr/share/man/man1/getopt.1*"
- "/usr/share/man/man1/hexdump.1*"
- # util-linux-core
- "/usr/share/man/man1/kill.1*"
- "/usr/share/man/man8/mount.8*"
- # xz
- "/usr/share/man/fr/man1/xz.1*"
- "/usr/share/man/ko/man1/xz.1*"
- "/usr/share/man/man1/xz.1*"
-)
-
-ret_val=0
-for file in "${files[@]}"; do
- if ! compgen -G "$file" >/dev/null; then
-   echo "$file: No such file or directory" >&2
-   ret_val=1
-   break
- fi
-done
-
-if [ "$ret_val" -ne 0 ]; then
- false
-fi
-%end
-
-# Perform any necessary post-installation configurations specific to Fedora Toolbox (nochroot environment)
-# Post-installation commands
-
-%post --nochroot --erroronfail --log=/mnt/sysimage/root/anaconda-post-nochroot.log
-set -eux
-
-# Clean up dnf cache
-dnf clean all
-
-%end

fedora-design-suite-common.ks

@@ -6,11 +6,13 @@
 fedora-release-designsuite
 
 # Provides backup application
-#deja-dup
+deja-dup
+deja-dup-nautilus
 
 # Add extra gnome applications
 #gnome-books
 gnome-calendar
+gnome-photos
 gnome-pomodoro
 gnome-todo
 
@@ -21,6 +23,7 @@ powerline-fonts
 # removal of unneeded applications
 -gnome-boxes
 
+
 # temporarily removing conflicting application
 -mypaint
 -sparkleshare

fedora-disk-base.ks

@@ -34,6 +34,8 @@ firstboot --reconfig
 @hardware-support
 
 kernel
+# on 32bit arm make sure we only install one kernel
+-kernel-lpae
 # remove this in %post
 dracut-config-generic
 -dracut-config-rescue
@@ -57,9 +59,18 @@ glibc-all-langpacks
 
 # Find the architecture we are on
 arch=$(uname -m)
+
 # Setup Raspberry Pi firmware
+if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 if [[ $arch == "aarch64" ]]; then
+cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
+else
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
+fi
 fi
 
 releasever=$(rpm --eval '%{fedora}')
@@ -86,7 +97,7 @@ rm -f /var/lib/rpm/__db*
 # when you are using fedora via serial console as you do not get any output post grub
 # linux does a good job of knowing what consoles need to be enabled.
 # https://bugzilla.redhat.com/show_bug.cgi?id=2022757
-if [[ $arch == "aarch64" ]]; then
+if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
 fi
 

fedora-disk-minimal.ks

@@ -0,0 +1,6 @@
+%include fedora-disk-base.ks
+%include fedora-minimal-common.ks
+
+services --enabled=sshd,NetworkManager,chronyd,initial-setup
+
+autopart --type=plain --noswap

fedora-disk-server.ks

@@ -26,7 +26,8 @@ fedora-release-server
 
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
-systemctl set-default multi-user.target
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
 %end

fedora-disk-workstation.ks

@@ -7,7 +7,5 @@ autopart --type=btrfs --noswap
 %packages
 -initial-setup
 -initial-setup-gui
-gnome-initial-setup
-anaconda-webui
 
 %end

fedora-disk-xbase.ks

@@ -17,6 +17,6 @@ glibc-all-langpacks
 
 %post
 # Explicitly set graphical.target as default as this is how initial-setup detects which version to run
-systemctl set-default graphical.target
+ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
 
 %end

fedora-eln-container-base.ks

@@ -10,10 +10,8 @@ fedora-repos-eln
 rootfiles
 tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
 vim-minimal
-
+dnf
-dnf5
+dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
-dnf5-plugins
-
 sudo
 -glibc-langpack-en
 -langpacks-en

fedora-eln-guest.ks

@@ -32,10 +32,11 @@ reboot
 # Packages
 %packages
 @core
-dnf5
+dnf
 kernel
 yum
 nfs-utils
+dnf-utils
 
 # pull firmware packages out
 -aic94xx-firmware
@@ -112,8 +113,13 @@ subscription-manager-cockpit
 
 # rh-amazon-rhui-client
 
-# Transitively required by grub2-tools-extra
+# Exclude all langpacks for now
-langpacks-core-font-en
+-langpacks-*
+
+# The langpacks-en package is pulled in by Anaconda and it seems filtering
+# it out using langpacks-* is not sufficient. It needs to be filtered
+# directly.
+-langpacks-en
 
 # We are building Fedora-ELN
 fedora-release-eln
@@ -135,7 +141,8 @@ passwd -l root
 
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
-systemctl set-default multi-user.target
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
 # this is installed by default but we don't need it in virt

fedora-i3-common.ks

@@ -21,11 +21,9 @@ thunar
 gnome-keyring-pam
 # Admin tools are handy to have
 @admin-tools
-wget2-wget
+wget
 # Better more popular browser
 system-config-printer
-# Install XFCE polkit
-xfce-polkit
 
 # save some space
 -autofs

fedora-iot.ks

@@ -0,0 +1,99 @@
+# This is the kickstart for Fedora IoT disk images.
+
+text # don't use cmdline -- https://github.com/rhinstaller/anaconda/issues/931
+lang en_US.UTF-8
+keyboard us
+timezone --utc Etc/UTC
+
+selinux --enforcing
+rootpw --lock --iscrypted locked
+
+bootloader --timeout=1 --append="modprobe.blacklist=vc4"
+
+network --bootproto=dhcp --device=link --activate --onboot=on
+services --enabled=NetworkManager,sshd
+
+zerombr
+clearpart --all --initlabel --disklabel=msdos
+autopart --nohome --noswap --type=plain
+
+# Equivalent of %include fedora-repo.ks
+# Pull from the ostree repo that was created during the compose
+ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/devel/${basearch}/iot
+
+reboot
+
+%post --erroronfail
+# Find the architecture we are on
+arch=$(uname -m)
+if [[ $arch == "armv7l" ]]; then
+	arch="armhfp"
+fi
+
+# Setup Raspberry Pi firmware
+if [[ $arch == "aarch64" ]] || [[ $arch == "armhfp" ]]; then
+if [[ $arch == "aarch64" ]]; then
+cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
+cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
+else
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
+fi
+fi
+
+# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
+# We want consumers of this image to track the two week releases.
+ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/devel/${arch}/iot"
+
+# Make sure the ref we're supposedly sitting on (according
+# to the updated origin) exists.
+ostree refs "fedora-iot:fedora/devel/${arch}/iot" --create "fedora-iot:fedora/devel/${arch}/iot"
+
+# Remove the old ref so that the commit eventually gets cleaned up.
+ostree refs "fedora-iot:fedora/devel/${arch}/iot" --delete
+
+# delete/add the remote with new options to enable gpg verification
+# and to point them at the cdn url
+ostree remote delete fedora-iot
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/ --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist  fedora-iot 'https://ostree.fedoraproject.org/iot'
+
+# We're getting a stray console= from somewhere, work around it
+rpm-ostree kargs --delete=console=tty0
+
+# older versions of livecd-tools do not follow "rootpw --lock" line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
+# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590
+cp /etc/skel/.bash* /var/roothome
+
+# Remove any persistent NIC rules generated by udev
+rm -vf /etc/udev/rules.d/*persistent-net*.rules
+
+echo "Removing random-seed so it's not the same in every image."
+rm -f /var/lib/systemd/random-seed
+
+echo "Packages within this iot image:"
+echo "-----------------------------------------------------------------------"
+rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
+echo "-----------------------------------------------------------------------"
+# Note that running rpm recreates the rpm db files which aren't needed/wanted
+rm -f /var/lib/rpm/__db*
+
+echo "Zeroing out empty space."
+# This forces the filesystem to reclaim space from deleted files
+dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
+rm -f /var/tmp/zeros
+echo "(Don't worry -- that out-of-space error was expected.)"
+
+rm -f /etc/NetworkManager/system-connections/*.nmconnection
+
+# Anaconda is writing an /etc/resolv.conf from the install environment.
+# The system should start out with an empty file, otherwise cloud-init
+# will try to use this information and may error:
+# https://bugs.launchpad.net/cloud-init/+bug/1670052
+truncate -s 0 /etc/resolv.conf
+
+%end

fedora-kde-common.ks

@@ -6,9 +6,6 @@
 @firefox
 @kde-apps
 @kde-media
-@kde-pim
-# Ensure we have Anaconda initial setup using kwin
-@kde-spin-initial-setup
 @libreoffice
 # add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
 libreoffice-draw
@@ -22,14 +19,8 @@ fedora-release-kde
 -tracker-miners
 -tracker
 
-# Not needed on desktops. See: https://pagure.io/fedora-kde/SIG/issue/566
--mariadb-server-utils
-
 ### The KDE-Desktop
 
-# fedora-specific packages
-plasma-welcome-fedora
-
 ### fixes
 
 # minimal localization support - allows installing the kde-l10n-* packages

fedora-live-astronomy_kde.ks

@@ -13,8 +13,6 @@
 
 # Maintainer: Christian Dersch <lupinix@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Lupinix
-# Co-Maintainer: JT Pennington <q5sys@fedoraproject.org>
-#             https://fedoraproject.org/wiki/User:q5sys
 
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
@@ -35,7 +33,7 @@ part / --size 16000
 astrometry
 astrometry-tycho2
 cdsclient
-cfitsio-utils
+fpack
 psfex
 scamp
 sextractor
@@ -83,6 +81,7 @@ python3-astroML
 python3-astroquery
 python3-astroscrappy
 python3-APLpy
+python3-ATpy
 python3-ccdproc
 python3-fitsio
 python3-gatspy
@@ -97,10 +96,7 @@ python3-matplotlib-tk
 
 
 # Python IDE very useful for scientific use
-# FTI with Python 3.12:
+python3-spyder
-# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
-# can be restored when that is fixed
-#python3-spyder
 
 # BOINC for distributed computing
 boinc-client

fedora-live-base.ks

@@ -31,6 +31,7 @@ kernel-modules
 kernel-modules-extra
 
 # The point of a live image is to install
+anaconda
 anaconda-install-env-deps
 anaconda-live
 @anaconda-tools
@@ -38,7 +39,6 @@ anaconda-live
 # https://fedoraproject.org/wiki/Changes/RemoveDeviceMapperMultipathFromWorkstationLiveCD
 -fcoe-utils
 -device-mapper-multipath
--sdubby
 
 # Need aajohan-comfortaa-fonts for the SVG rnotes images
 aajohan-comfortaa-fonts

fedora-live-cinnamon.ks

@@ -9,7 +9,7 @@
 %include fedora-live-base.ks
 %include fedora-cinnamon-common.ks
 
-part / --size=9216
+part / --size=8192
 
 %post
 # cinnamon configuration

fedora-live-comp_neuro.ks

@@ -0,0 +1,12 @@
+# Description: The Workstation based NeuroFedora computational neuroscience lab image.
+# https://fedoraproject.org/wiki/Changes/Comp_Neuro_Lab
+#
+# Maintained by the NeuroFedora SIG:
+# https://neuro.fedoraproject.org
+# mailto:neuro-sig@lists.fedoraproject.org
+
+%include fedora-live-workstation.ks
+%include fedora-comp-neuro-common.ks
+%include fedora-neuro-gnome-common.ks
+
+part / --size 10240

fedora-live-design_suite.ks

@@ -62,8 +62,10 @@ if [ -f `which powerline-daemon` ]; then
 fi
 FOE
 
+cat >> /var/lib/livesys/livesys-session-extra << FOE
 #Override the favorite desktop application in Dash
-sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']/" /etc/rc.d/init.d/livesys
+sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'shotwell.desktop', 'gimp.desktop', 'darktable.desktop','krita.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'pitivi.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']/" /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override
+FOE
 
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas

fedora-live-games.ks

@@ -17,7 +17,8 @@
 
 %include fedora-live-xfce.ks
 
-part / --size 15360
+# The recommended part size for DVDs is too close to use for the games spin
+part / --size 14336
 
 %packages
 
@@ -26,7 +27,8 @@ part / --size 15360
 
 -wine
 
-# Remove libreoffice, we're here to have fun!
+# Remove libreoffice since it just got added to livecd-desktop and
+# will likely put the games spin over size and it is freeze time.
 -libreoffice*
 
 # Extra screensavers isn't much help for the games spin
@@ -44,17 +46,23 @@ armacycles-ad
 asc
 asc-music
 astromenace
+# beneath-a-steel-sky-cd scummvm games cut for size
 boswars
 bzflag
 crossfire-client
 extremetuxracer
+# flight-of-the-amazon-queen-cd scummvm games cut for size
 freeciv
 freecol
 freedoom
 freedroidrpg
 frozen-bubble
+gl-117
 # glob2 - currently broken
 lincity-ng
+#tmw - currently broken
+#maniadrive - currently broken
+#maniadrive-music - has been retired
 megaglest
 nethack-vultures
 netpanzer
@@ -92,6 +100,7 @@ knights
 lbrickbuster2
 # liquidwar # Would pull in fluid-soundfont-lite-patches
 lordsawar
+# lure scummvm games cut for size
 # machineball # Would pull in fluid-soundfont-lite-patches
 nethack
 openlierox
@@ -99,7 +108,7 @@ pachi
 pioneers
 quarry
 # Ri-li cut for size
-rogue
+# rogue # recently abandoned. Someone picked it up. Waiting for approval.
 # scorchwentbonkers # Would pull in fluid-soundfont-lite-patches
 solarwolf
 sopwith

fedora-live-i3.ks

@@ -13,9 +13,6 @@
 %include fedora-live-minimization.ks
 %include fedora-i3-common.ks
 
-# need a bigger /
-part / --size 6000
-
 %post
 # i3 configuration
 
@@ -26,15 +23,6 @@ PREFERRED=/usr/bin/i3
 DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
-
-# Fix https://bugzilla.redhat.com/show_bug.cgi?id=2240823
-cat > /etc/xdg/autostart/xfce-polkit.desktop <<EOF
-[Desktop Entry]
-Type=Application
-Name=xfce-polkit
-Exec=/usr/libexec/xfce-polkit
-EOF
-
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="i3"/' /etc/sysconfig/livesys
 

fedora-live-jam_kde.ks

@@ -12,7 +12,7 @@
 %include fedora-live-kde.ks
 
 # DVD size partition
-part / --size 11264 --fstype ext4
+part / --size 10240 --fstype ext4
 
 #enable threaded irqs
 bootloader --append="threadirqs"

fedora-live-kde.ks

@@ -11,7 +11,7 @@
 %include fedora-live-minimization.ks
 
 # DVD payload
-part / --size=9000
+part / --size=8000
 
 %post
 %end

fedora-live-lxde.ks

@@ -10,9 +10,6 @@
 %include fedora-live-minimization.ks
 %include fedora-lxde-common.ks
 
-# increate the disk size for compose
-part / --size 6144
-
 %post
 # LXDE and LXDM configuration
 

fedora-live-lxqt.ks

@@ -11,9 +11,6 @@
 %include fedora-live-minimization.ks
 %include fedora-lxqt-common.ks
 
-# need a bigger /
-part / --size 6000
-
 %packages
 dracut-config-generic
 %end

fedora-live-mate_compiz.ks

@@ -7,7 +7,7 @@
 %include fedora-mate-common.ks
 %include fedora-live-minimization.ks
 
-part / --size 9216
+part / --size 8192
 
 %post
 # set livesys session type

fedora-live-miraclewm.ks

@@ -1,30 +0,0 @@
-# fedora-livecd-miraclewm.ks
-#
-# Description:
-# - Fedora Live Spin with the tiling window manager Miracle
-#
-# Maintainer(s):
-# - Matthew Kosarek <mattkae@fedoraproject.org>
-# - Neal Gompa      <ngompa@fedoraproject.org>
-
-%include fedora-live-base.ks
-%include fedora-live-minimization.ks
-%include fedora-miraclewm-common.ks
-
-%packages
-# To be able to show installation instructions on background
-nwg-wrapper
-%end
-
-%post
-# create /etc/sysconfig/desktop (needed for installation)
-cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/miraclewm
-DISPLAYMANAGER=/bin/sddm
-EOF
-
-# set livesys session type
-sed -i 's/^livesys_session=.*/livesys_session="miraclewm"/' /etc/sysconfig/livesys
-
-%end
-

fedora-live-robotics.ks

@@ -1,6 +1,6 @@
-# Maintained by lrossett and the Fedora Robotics SIG:
+# Maintained by x3mboy and the Fedora Robotics SIG:
-# https://docs.fedoraproject.org/en-US/robotics-sig/
+# https://fedoraproject.org/wiki/SIGs/Robotics
-# mailto:lrossett@redhat.com
+# mailto:x3mboy@fedoraproject.org
 # mailto:robotics@lists.fedoraproject.org
 
 %include fedora-live-base.ks
@@ -19,6 +19,7 @@ part / --size 10752
 pcl-devel
 player-devel
 stage-devel
+mrpt-devel
 
 # Add version control packages
 git

fedora-live-scientific_kde.ks

@@ -12,7 +12,8 @@
 %include fedora-live-minimization.ks
 %include fedora-scientific-common.ks
 
-part / --size 18000
+# The recommended part size for DVDs is too close to use for the scientific spin
+part / --size 15000
 
 %post
 

fedora-live-security.ks

@@ -45,7 +45,6 @@ gnome-keyring-pam
 -foomatic-db-ppds
 -foomatic
 -stix-fonts
--default-fonts-core-math
 -ibus-typing-booster
 -xfce4-sensors-plugin
 -man-pages-*
@@ -61,6 +60,7 @@ gnome-keyring-pam
 -binwalk
 -bkhive
 -bonesi
+-bro
 -cmospwd
 -dnstop
 -etherape
@@ -78,6 +78,7 @@ gnome-keyring-pam
 -pdfcrack
 -proxychains
 -pyrit
+-raddump
 -rkhunter
 -safecopy
 -samdump2

fedora-live-soas.ks

@@ -4,7 +4,7 @@
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
-# - Chihurumnaya Ibiam <ibiam AT sugarlabs DOT org>
+# - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
 # - Alex Perez <aperez AT alexperez DOT com>
 
 %include fedora-live-base.ks
@@ -13,14 +13,6 @@
 
 %post
 
-# Fix https://bugzilla.redhat.com/show_bug.cgi?id=2239137
-cat > /etc/xdg/autostart/xfce-polkit.desktop <<EOF
-[Desktop Entry]
-Type=Application
-Name=xfce-polkit
-Exec=/usr/libexec/xfce-polkit
-EOF
-
 # set livesys session type
 sed -i 's/^livesys_session=.*/livesys_session="soas"/' /etc/sysconfig/livesys
 

fedora-live-sway.ks

@@ -13,8 +13,6 @@
 %include fedora-live-minimization.ks
 %include fedora-sway-common.ks
 
-part / --size 6144
-
 %packages
 # To be able to show installation instructions on background
 nwg-wrapper

fedora-live-workstation.ks

@@ -10,12 +10,7 @@
 #
 #include snippets/packagekit-cached-metadata.ks
 
-part / --size 8576
+part / --size 7750
-
-%packages
-gnome-initial-setup
-anaconda-webui
-%end
 
 %post
 

fedora-lxde-common.ks

@@ -15,6 +15,9 @@
 @lxde-media
 @lxde-office
 
+# FIXME: can be omitted once comps is updated
+midori
+
 # pam-fprint causes a segfault in LXDM when enabled
 -fprintd-pam
 
@@ -46,7 +49,6 @@ metacity
 -foomatic-db-ppds
 -foomatic
 -stix-fonts
--default-fonts-core-math
 -ibus-typing-booster
 -xscreensaver-extras
 #-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps

fedora-mate-common.ks

@@ -20,6 +20,12 @@ fusion-icon
 # blacklist applications which breaks mate-desktop
 -audacious
 
+# see https://bugzilla.redhat.com/show_bug.cgi?id=2068699
+# and https://bugzilla.redhat.com/show_bug.cgi?id=1933494
+# use earlyoom instead of systemd-oomd-defaults
+earlyoom
+-systemd-oomd-defaults
+
 # office
 @libreoffice
 

fedora-minimal-common.ks

@@ -0,0 +1,24 @@
+%packages
+microdnf
+-@standard
+-initial-setup-gui
+-generic-release*
+-glibc-all-langpacks
+# recommended by iproute, we don't want it in minimal
+-iproute-tc
+# recommended by gnutls, we don't want it in minimal
+-trousers
+glibc-langpack-en
+iw
+NetworkManager-wifi
+%end
+
+%post
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+%end

fedora-miraclewm-common.ks

@@ -1,15 +0,0 @@
-# fedora-livecd-miraclewm.ks
-#
-# Description:
-# - Fedora Live Spin with the tiling window manager Miracle
-#
-# Maintainer(s):
-# - Matthew Kosarek <mattkae@fedoraproject.org>
-# - Neal Gompa      <ngompa@fedoraproject.org>
-
-%packages
-fedora-release-miraclewm
-@^miraclewm-desktop-environment
-@firefox
-initial-setup-gui-wayland-miraclewm
-%end

fedora-modular-disk-minimal.ks

@@ -31,7 +31,7 @@ coreutils-single
 util-linux
 rpm
 shadow-utils
-dnf5
+microdnf
 glibc-minimal-langpack
 grubby
 kernel
@@ -56,9 +56,18 @@ sssd-client
 
 # Find the architecture we are on
 arch=$(uname -m)
+
 # Setup Raspberry Pi firmware
+if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
 if [[ $arch == "aarch64" ]]; then
+cp -P /usr/share/uboot/rpi_3/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
 cp -P /usr/share/uboot/rpi_arm64/u-boot.bin /boot/efi/rpi-u-boot.bin
+else
+cp -P /usr/share/uboot/rpi_2/u-boot.bin /boot/efi/rpi2-u-boot.bin
+cp -P /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/efi/rpi3-u-boot.bin
+cp -P /usr/share/uboot/rpi_4_32b/u-boot.bin /boot/efi/rpi4-u-boot.bin
+fi
 fi
 
 releasever=$(rpm --eval '%{fedora}')

fedora-neuro-gnome-common.ks

@@ -0,0 +1,30 @@
+# Description: Common gnome based configuration for NeuroFedora spin images.
+#
+# Maintained by the NeuroFedora SIG:
+# https://neuro.fedoraproject.org
+# mailto:neuro-sig@lists.fedoraproject.org
+
+# Please specify the individual package sets in their own ks files:
+# - fedora-comp-neuro-common.ks
+
+%packages
+@firefox
+
+# Editors
+emacs
+vim-X11
+
+# This is no longer workstation
+-@workstation-product
+
+# No Workstation backgrounds
+#-desktop-backgrounds-basic
+#-*backgrounds-extras
+%end
+
+%post
+
+#Override the favorite desktop application in Dash
+sed -i "s/favorite-apps=."'*'"/favorite-apps=['firefox.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'anaconda.desktop']/" /etc/rc.d/init.d/livesys
+
+%end

fedora-python-classroom-common.ks

@@ -10,7 +10,7 @@
 nano
 openssh-clients
 vim-enhanced
-wget2-wget
+wget
 
 # Remove Pythons possibly recommended by tox
 -python2
@@ -29,10 +29,7 @@ wget2-wget
 -python3.8
 -python3.9
 -python3.10
--python3.11
--python3.12
 -pypy
--pypy3.9
 
 # Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450
 #               and https://bugzilla.redhat.com/show_bug.cgi?id=1902354

fedora-repo.ks

@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented
 
 # For the master branch the following should be uncommented
-# %include fedora-repo-rawhide.ks
+#%include fedora-repo-rawhide.ks
 
 # For non-master branches the following should be uncommented
 %include fedora-repo-not-rawhide.ks

fedora-scientific-common.ks

@@ -61,10 +61,7 @@ julia
 julia-doc
 julia-devel
 
-# FTI with Python 3.12:
+python3-spyder
-# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
-# can be restored when that is fixed
-#python3-spyder
 python3-spyder-kernels
 
 
@@ -136,6 +133,7 @@ tmux
 rlwrap
 hexchat
 fig2ps
+bibtex2html
 hevea
 
 #Include Mozilla Firefox

fedora-server-vm-full.ks

@@ -1,4 +1,4 @@
-# fedora-server-vm-full.ks (rel. 1.02)
+# fedora-server-vm-full.ks (rel. 1.01)
 # Kickstart file to build a Fedora Server Edition VM disk image.
 # The image aims to resemble as close as technically possible the
 # full features of a Fedora Server Edition in a virtual machine.
@@ -162,10 +162,6 @@ if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then
  sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
 fi
 
-# Trigger lvm-devices-import.path and .service to create
-# a new /etc/lvm/devices/system.devices for the root VG.
-rm -f /etc/lvm/devices/system.devices
-touch /etc/lvm/devices/auto-import-rootvg
 
 # Remove machine-id on pre generated images
 rm -f /etc/machine-id
@@ -178,11 +174,6 @@ touch /etc/machine-id
 ##### begin custom post script (after base) #########################
 %post
 
-# When we build the image /var/log gets populated.
-# Let's clean it up.
-echo "Cleanup leftover in /var/log"
-cd /var/log  && find . -name \* -type f -delete 
-
 echo "Zeroing out empty space."
 # Create zeros file with nodatacow and no compression
 touch /var/tmp/zeros
@@ -197,8 +188,14 @@ sync /
 
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
-systemctl set-default multi-user.target
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
 echo .
 
+# When we build the image /var/log gets populated.
+# Let's clean it up.
+echo "Cleanup leftover in /var/log"
+rm -rf /var/log/*
+
 %end
 ##### end custom post script ########################################

fedora-soas-common.ks

@@ -4,7 +4,7 @@
 # - A Sugar environment that you can carry in your pocket
 #
 # Maintainers:
-# - Chihurumnaya Ibiam <ibiam AT sugarlabs DOT org>
+# - Chihurumnaya Ibiam <ibiamchihurumnaya AT gmail DOT com>
 # - Alex Perez <aperez AT alexperez DOT com>
 
 firewall --enabled --service=mdns,presence
@@ -65,9 +65,6 @@ livecd-tools
 -plymouth-system-theme
 -plymouth-theme-charge
 
-# Install XFCE polkit
-xfce-polkit
-
 %end
 
 %post

fedora-workstation-common.ks

@@ -12,7 +12,4 @@
 -gfs2-utils
 -reiserfs-utils
 
-# Exclude extra unwanted packages
--python3-botocore
-
 %end

fedora-xfce-common.ks

@@ -19,7 +19,7 @@ fedora-release-xfce
 @xfce-media
 @xfce-office
 
-wget2-wget
+wget
 system-config-printer
 
 # save some space

maintainers.toml

@@ -1,9 +1,9 @@
 [spins.lxqt.x86_64]
-fas = [ "lupinix", "zsun", "farchord", "ngompa" ]
+fas = [ "lupinix", "zsun" ]
-maintainers = [ "Christian Dersch", "Zamir SUN", "Steve Cossette", "Neal Gompa" ]
+maintainers = [ "Christian Dersch", "Zamir SUN" ]
 [spins.lxqt.armhfp]
-fas = [ "lupinix", "zsun", "farchord", "ngompa" ]
+fas = [ "lupinix", "zsun" ]
-maintainers = [ "Christian Dersch", "Zamir SUN", "Steve Cossette", "Neal Gompa" ]
+maintainers = [ "Christian Dersch", "Zamir SUN" ]
 
 [spins.xfce.x86_64]
 fas = [ "nonamedotc", "kevin", "maxamillion" ]
@@ -13,17 +13,13 @@ fas = [ "nonamedotc", "kevin", "maxamillion" ]
 maintainers = [ "Mukundan Ragavan", "Kevin Fenzi", "Adam Miller" ]
 
 [spins.kde.x86_64]
-fas = [ "rdieter", "marcdeop", "ngompa" ]
+fas = [ "rdieter", "svahl" ]
-maintainers = [ "Rex Dieter", "Marc Deop", "Neal Gompa" ]
+maintainers = [ "Rex Dieter", "Sebastian Vahl" ]
 
 [spins.cinnamon.x86_64]
 fas = [ "grinnz" ]
 maintainers = [ "Dan Book" ]
 
-[spins.mate_compiz.x86_64]
-fas = [ "raveit65" ]
-maintainers = [ "Wolfgang Ulbrich" ]
-
 [spins.lxde.x86_64]
 fas = [ "cwickert", "mtasaka" ]
 maintainers = [ "Christoph Wickert", "Mamoru TASAKA" ]
@@ -39,20 +35,24 @@ fas = [ "chimosky", "aperezbios", ]
 maintainers = [ "Chihurumnaya Ibiam", "Alex Perez" ]
 
 [labs.astronomy_kde.x86_64]
-fas = [ "lupinix", "q5sys" ]
+fas = [ "lupinix" ]
-maintainers = [ "Christian Dersch", "JT Pennington" ]
+maintainers = [ "Christian Dersch" ]
 
 [labs.security.x86_64]
 fas = [ "fab", "jsimon", "q5sys"]
 maintainers = [ "Fabian Affolter", "Joerg Simon", "JT Pennington" ]
 
+[labs.comp_neuro.x86_64]
+fas = [ "bt0dotninja", "dan1mal", "ankursinha", "neuro-sig" ]
+maintainers = [ "Alberto Rodriguez Sanchez", "Danny Lee", "Ankur Sinha", "NeuroFedora SIG" ]
+
 [labs.design_suite.x86_64]
 fas = [ "luya" ]
 maintainers = [ "Luya Tshimbalanga" ]
 
 [labs.games.x86_64]
-fas = [ "ngompa", "q5sys" ]
+fas = [ "dagostinelli", "richardanaya" ]
-maintainers = [ "Neal Gompa", "JT Pennington" ]
+maintainers = [ "Darryl T. Agostinelli", "Richard Anaya" ]
 
 [labs.jam_kde.x86_64]
 fas = [ "q5sys" ]
@@ -71,16 +71,16 @@ fas = [ "scitech" ]
 maintainers = [ "SciTech SIG" ]
 
 [labs.robotics.x86_64]
-fas = [ "lrossett", "robotics-sig" ]
+fas = [ "x3mboy", "robotics-sig" ]
-maintainers = [ "Leonardo Rossetti", "Robotics SIG" ]
+maintainers = [ "Eduard Lucena", "Robotics SIG" ]
 
 [spins.i3.x86_64]
 fas = [ "jflory7", "defolos", "nasirhm", "odilhao", "x3mboy" ]
 maintainers = [ "Justin Flory", "Dan Čermák", "Nasir Hussain", "Odilon Junior", "Eduard Lucena" ]
 
 [eln]
-fas = [ "sgallagh", "tdawson", "asamalik", "yselkowitz" ]
+fas = [ "sgallagh", "tdawson", "asamalik" ]
-maintainers = [ "Stephen Gallagher", "Troy Dawson", "Adam Samalik", "Yaakov Selkowitz" ]
+maintainers = [ "Stephen Gallagher", "Troy Dawson", "Adam Samalik" ]
 
 [spins.budgie.x86_64]
 fas = [ "joshstrobl" ]
@@ -89,35 +89,3 @@ maintainers = [ "Joshua Strobl" ]
 [spins.sway.x86_64]
 fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
 maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
-
-[spins.miraclewm.x86_64]
-fas = [ "mattkae", "ngompa" ]
-maintainers = [ "Matthew Kosarek", "Neal Gompa" ]
-
-[silverblue.x86_64]
-fas = [ "siosm", "tpopela" ]
-maintainers = [ "Timothée Ravier", "Tomáš Popela" ]
-[silverblue.aarch64]
-fas = [ "siosm", "tpopela" ]
-maintainers = [ "Timothée Ravier", "Tomáš Popela" ]
-
-[kinoite.x86_64]
-fas = [ "siosm" ]
-maintainers = [ "Timothée Ravier" ]
-[kinoite.aarch64]
-fas = [ "siosm" ]
-maintainers = [ "Timothée Ravier" ]
-
-[sericea.x86_64]
-fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
-maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
-[sericea.aarch64]
-fas = [ "alebastr", "jkonecny", "anthr76", "fale" ]
-maintainers = [ "Aleksei Bavshin", "Jiří Konečný", "Anthony Rabbito", "Fabio Alessandro Locati" ]
-
-[onyx.x86_64]
-fas = [ "joshstrobl" ]
-maintainers = [ "Joshua Strobl" ]
-[onyx.aarch64]
-fas = [ "joshstrobl" ]
-maintainers = [ "Joshua Strobl" ]

tools/list-packages-for-ks.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
 # Given as input a comps definition and a .ks file, list
 # the packages which would be installed.  This list is
 # NOT depsolved, it's merely a textual list of explicitly
@@ -11,40 +11,38 @@
 import os
 import sys
 import getopt
-import xml.etree.ElementTree as ElementTree
+import xml.etree.cElementTree as ElementTree
 
 import pykickstart
 import pykickstart.parser
 import pykickstart.version
 
-
 def usage(ecode):
-    print("Usage: {} [--version=VERSION] COMPS.xml KICKSTART.ks".format(sys.argv[0]))
+    print "Usage: %s [--version=VERSION] COMPS.xml KICKSTART.ks" % (sys.argv[0], )
-    print("List packages installed by KICKSTART.")
+    print "List packages installed by KICKSTART."
     sys.exit(ecode)
 
-
 def main():
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'h', ['help', 'version=', 'debug'])
+        opts,args = getopt.getopt(sys.argv[1:], 'h', ['help', 'version=', 'debug'])
-    except getopt.GetoptError as e:
+    except getopt.GetoptError, e:
         usage(1)
-
+        
     version = None
     debug = False
-    for o, a in opts:
+    for o,a in opts:
         if o in ('-h', '--help'):
             usage(0)
-        elif o in ('--debug',):
+        elif o in ('--debug', ):
             debug = True
-        elif o in ('--version',):
+        elif o in ('--version', ):
             version = a
-
+        
     if len(args) != 2:
         usage(1)
     comps_filename = args[0]
     kickstart_filename = args[1]
-
+    
     if version:
         version_cls = pykickstart.version.stringToVersion(version)
     else:
@@ -57,10 +55,10 @@ def main():
     working_directory = os.path.dirname(kickstart_filename)
     if working_directory:
         os.chdir(working_directory)
-
+        
     parser = pykickstart.parser.KickstartParser(version_cls)
     parser.readKickstart(kickstart_filename)
-
+   
     comps_groups = comps.findall('group')
     packages_for_group = {}
     for group in comps_groups:
@@ -76,29 +74,27 @@ def main():
         packages_for_group[group_id.text] = pkglist
 
     pkg_list = set()
-
+   
     for group in parser.handler.packages.groupList:
         if debug:
-            print("# Including {} packages from group '{}'".format(len(packages_for_group.get(group.name, [])),
+            print >>sys.stderr, "# Including %d packages from group %r" % (len(packages_for_group[group.name]), group.name)
-                                                                   group.name), file=sys.stderr)
+        for pkg in packages_for_group[group.name]:
-        for pkg in packages_for_group.get(group.name, []):
             pkg_list.add(pkg)
     if debug:
-        print("# Adding {} explicitly specified packages".format(len(parser.handler.packages.packageList)),
+        print >>sys.stderr, "# Adding %d explicitly specified packages" % (len(parser.handler.packages.packageList), )
-              file=sys.stderr)
     for pkg in parser.handler.packages.packageList:
         pkg_list.add(pkg)
     if debug:
-        print("# Processing {} explicitly excluded packages".format(len(parser.handler.packages.excludedList)),
+        print >>sys.stderr, "# Processing %d explicitly excluded packages" % (len(parser.handler.packages.excludedList), )
-              file=sys.stderr)
     for pkg in parser.handler.packages.excludedList:
-        pkg_list.discard(pkg)
+        if pkg in pkg_list:
+            pkg_list.remove(pkg)
 
     for pkg in sorted(pkg_list):
-        print(pkg)
+        print "%s" % (pkg, )
 
     sys.exit(0)
 
-
 if __name__ == '__main__':
     main()
+