arm: Update Raspberry Pi config to use universal firmware

We can now use a single U-Boot firmware to boot all 64 bit variants of the Rasperry Pi so we can now simplify this some what. Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
Don't exclude langpacks-en explicitly
2023-03-18 18:38:00 +00:00 · 2023-03-15 16:30:17 -04:00 · 2023-03-11 17:57:18 +02:00 · 2023-03-07 17:04:28 -08:00 · 2023-03-06 16:51:59 -08:00 · 2023-02-28 10:39:14 +00:00
8 changed files with 6 additions and 41 deletions
--- a/fedora-budgie-common.ks
+++ b/fedora-budgie-common.ks
@ -11,6 +11,10 @@ fedora-release-budgie

 # recommended apps
@budgie-desktop-apps
+@libreoffice
+libreoffice-draw
+libreoffice-math
+thunderbird

 # Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
--- a/fedora-disk-base.ks
+++ b/fedora-disk-base.ks
@ -34,8 +34,6 @@ 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
@ -59,18 +57,9 @@ 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}')
@ -97,7 +86,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" ]] || [[ $arch == "armv7l" ]]; then
+if [[ $arch == "aarch64" ]]; then
 sed -i -e 's|console=tty0||g' /boot/loader/entries/*conf
 fi

--- a/fedora-eln-guest.ks
+++ b/fedora-eln-guest.ks
@ -116,11 +116,6 @@ 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
--- a/fedora-iot.ks
+++ b/fedora-iot.ks
@ -24,23 +24,12 @@ ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipk
 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.
--- a/fedora-live-games.ks
+++ b/fedora-live-games.ks
@ -57,7 +57,6 @@ freecol
 freedoom
 freedroidrpg
 frozen-bubble
-gl-117
 # glob2 - currently broken
 lincity-ng
 #tmw - currently broken
--- a/fedora-minimal-common.ks
+++ b/fedora-minimal-common.ks
@ -4,7 +4,6 @@ microdnf
 -initial-setup-gui
 -generic-release*
 -glibc-all-langpacks
-xkeyboard-config
 # recommended by iproute, we don't want it in minimal
 -iproute-tc
 # recommended by gnutls, we don't want it in minimal
--- a/fedora-modular-disk-minimal.ks
+++ b/fedora-modular-disk-minimal.ks
@ -56,18 +56,9 @@ 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}')
--- a/fedora-scientific-common.ks
+++ b/fedora-scientific-common.ks
@ -133,7 +133,6 @@ tmux
 rlwrap
 hexchat
 fig2ps
-bibtex2html
 hevea

 #Include Mozilla Firefox
Author	SHA1	Message	Date
Peter Robinson	d44791744a	arm: Update Raspberry Pi config to use universal firmware We can now use a single U-Boot firmware to boot all 64 bit variants of the Rasperry Pi so we can now simplify this some what. Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2023-03-18 18:38:00 +00:00
Stephen Gallagher	2a5abd55f5	Don't exclude langpacks-en explicitly A recent change to Anaconda[1] now requires that this be available on the installed system, due to grub2-tools-extra now being part of the EFI GRUB2 install. [1] `1891b0f306` Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>	2023-03-15 16:30:17 -04:00
Joshua Strobl	0f52405431	Add libreoffice and thunderbird for Budgie Spin	2023-03-11 17:57:18 +02:00
Adam Williamson	89fe3c8395	Drop retired packages from scientific and games kickstarts bibtex2html (scientific) and gl-117 (games) got retired because they were unmaintained. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2023-03-07 17:04:28 -08:00
Adam Williamson	17178da61a	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>	2023-03-06 16:51:59 -08:00
Peter Robinson	fae2f44160	clean up some armhfp remnants There's a few bits of armhfp dregs hanging around so lets clean them up as they're no longer used. Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2023-02-28 10:39:14 +00:00