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-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-eln-guest.ks

@@ -116,6 +116,11 @@ subscription-manager-cockpit
 # 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-repos-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-live-games.ks

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

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

@@ -133,6 +133,7 @@ tmux
 rlwrap
 hexchat
 fig2ps
+bibtex2html
 hevea
 
 #Include Mozilla Firefox