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>

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-cloud-base-gcp.ks

@@ -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.ks

@@ -57,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-container-base.ks

@@ -5,6 +5,8 @@
 
 %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
 dnf

fedora-container-toolbox.ks

@@ -1,152 +0,0 @@
-# Kickstart file for Fedora Toolbox
-
-# See fedora-container-common.ks for details on how to hack on container image kickstarts
-# This base is a standard Fedora image with python3 and dnf
-
-%include fedora-container-common.ks
-
-# Install packages
-%packages --inst-langs=en --nocore --exclude-weakdeps
-acl
-bash
-bash-completion
-bc
-bzip2
-coreutils-common
-curl
-diffutils
-dnf
-dnf-yum  # https://fedorahosted.org/fesco/ticket/1312#comment:29
-dnf-plugins-core
-findutils
-flatpak-spawn
-fpaste
-gawk
-git
--glibc-minimal-langpack
-glibc-all-langpacks
-gnupg2
-gnupg2-smime
-grep
-gvfs-client
-gzip
-hostname
-iproute
-iputils
-keyutils
-krb5-libs
-less
-libcap
-lsof
-man-db
-man-pages
-mesa-dri-drivers
-mesa-vulkan-drivers
-mtr
-nano-default-editor
-nss-mdns
-openssh-clients
-openssl
-p11-kit
-pam
-passwd
-pigz
-procps-ng
-python3
-rootfiles
-rpm
-rsync
-sed
-shadow-utils
-sudo
-systemd
-tar # https://bugzilla.redhat.com/show_bug.cgi?id=1409920
-tcpdump
-time
-traceroute
-tree
-unzip
-util-linux
-util-linux-core
-vim-enhanced
-vte-profile
-vulkan-loader
-wget
-which
-whois
-words
-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
-
-# 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/*
-
-%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
-
-# Check if specified files exist
-#declare -a files=(
-#  "/usr/share/man/man1/bash.1*"
-#  "/usr/share/man/man1/cd.1*"
-#  "/usr/share/man/man1/export.1*"
-#  "/usr/share/man/man1/cat.1*"
-#  "/usr/share/man/man1/cp.1*"
-#  "/usr/share/man/man1/ls.1*"
-#  "/usr/share/man/man1/gpg2.1*"
-#  "/usr/share/man/man7/gnupg2.7*"
-#  "/usr/share/man/fr/man8/rpm.8*"
-#  "/usr/share/man/ja/man8/rpm.8*"
-#  "/usr/share/man/man8/rpm.8*"
-#  "/usr/share/man/man1/kill.1*"
-#  "/usr/share/man/man8/mount.8*"
-#)
-
-#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
-
-# Clean up dnf cache
-dnf clean all
-
-%end

fedora-design-suite-common.ks

@@ -7,7 +7,7 @@ fedora-release-designsuite
 
 # Provides backup application
 deja-dup
-#deja-dup-nautilus
+deja-dup-nautilus
 
 # Add extra gnome applications
 #gnome-books
@@ -23,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-workstation.ks

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

fedora-eln-guest.ks

@@ -113,8 +113,13 @@ subscription-manager-cockpit
 
 # rh-amazon-rhui-client
 
-# Transitively required by grub2-tools-extra
-langpacks-core-font-en
+# Exclude all langpacks for now
+-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

fedora-iot.ks

@@ -19,29 +19,40 @@ 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/rawhide/${basearch}/iot
+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/rawhide/${arch}/iot"
+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/rawhide/${arch}/iot" --create "fedora-iot:fedora/rawhide/${arch}/iot"
+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/rawhide/${arch}/iot" --delete
+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

fedora-kde-common.ks

@@ -6,7 +6,6 @@
 @firefox
 @kde-apps
 @kde-media
-@kde-pim
 @libreoffice
 # add libreoffice-draw and libreoffice-math (pagureio:fedora-kde/SIG#103)
 libreoffice-draw

fedora-live-astronomy_kde.ks

@@ -96,10 +96,7 @@ python3-matplotlib-tk
 
 
 # Python IDE very useful for scientific use
-# FTI with Python 3.12:
-# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
-# can be restored when that is fixed
-#python3-spyder
+python3-spyder
 
 # BOINC for distributed computing
 boinc-client

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

@@ -57,6 +57,7 @@ freecol
 freedoom
 freedroidrpg
 frozen-bubble
+gl-117
 # glob2 - currently broken
 lincity-ng
 #tmw - currently broken

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-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-*

fedora-live-workstation.ks

@@ -12,11 +12,6 @@
 
 part / --size 7750
 
-%packages
-gnome-initial-setup
-anaconda-webui
-%end
-
 %post
 
 # set livesys session type

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-modular-disk-minimal.ks

@@ -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-python-classroom-common.ks

@@ -29,7 +29,6 @@ wget
 -python3.8
 -python3.9
 -python3.10
--python3.11
 -pypy
 
 # Remove LaTeX, see https://bugzilla.redhat.com/show_bug.cgi?id=1862450

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
+%include fedora-repo-not-rawhide.ks

fedora-scientific-common.ks

@@ -61,10 +61,7 @@ julia
 julia-doc
 julia-devel
 
-# FTI with Python 3.12:
-# https://bugzilla.redhat.com/show_bug.cgi?id=2220598
-# can be restored when that is fixed
-#python3-spyder
+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.
@@ -174,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,5 +192,10 @@ 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 ########################################

maintainers.toml

@@ -13,8 +13,8 @@ fas = [ "nonamedotc", "kevin", "maxamillion" ]
 maintainers = [ "Mukundan Ragavan", "Kevin Fenzi", "Adam Miller" ]
 
 [spins.kde.x86_64]
-fas = [ "rdieter", "marcdeop", "ngompa" ]
-maintainers = [ "Rex Dieter", "Marc Deop", "Neal Gompa" ]
+fas = [ "rdieter", "svahl" ]
+maintainers = [ "Rex Dieter", "Sebastian Vahl" ]
 
 [spins.cinnamon.x86_64]
 fas = [ "grinnz" ]
@@ -89,43 +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" ]
-
-[silverblue.x86_64]
-fas = [ "siosm", "tpopela" ]
-maintainers = [ "Timothée Ravier", "Tomáš Popela" ]
-[silverblue.aarch64]
-fas = [ "siosm", "tpopela" ]
-maintainers = [ "Timothée Ravier", "Tomáš Popela" ]
-[silverblue.ppc64le]
-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" ]
-[kinoite.ppc64le]
-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" ]
-[sericea.ppc64le]
-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" ]
-[onyx.ppc64le]
-fas = [ "joshstrobl" ]
-maintainers = [ "Joshua Strobl" ]