From 4dd8211d56463a65f356d41b6ac2cfa4a74cf4d6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 13 Dec 2019 04:34:51 +0000 Subject: [PATCH] Some rpi updates for image builds --- fedora-arm-base.ks | 1 + fedora-disk-base.ks | 1 + fedora-iot.ks | 2 ++ fedora-modular-disk-minimal.ks | 1 + 4 files changed, 5 insertions(+) diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks index 29d9c2c..439fd37 100644 --- a/fedora-arm-base.ks +++ b/fedora-arm-base.ks @@ -49,6 +49,7 @@ glibc-all-langpacks # Setup Raspberry Pi firmware 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 # work around for poor key import UI in PackageKit rm -f /var/lib/rpm/__db* diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks index 3486dd9..773ab76 100644 --- a/fedora-disk-base.ks +++ b/fedora-disk-base.ks @@ -60,6 +60,7 @@ glibc-all-langpacks # Setup Raspberry Pi firmware 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 releasever=$(rpm --eval '%{fedora}') rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary diff --git a/fedora-iot.ks b/fedora-iot.ks index 7169634..73370f3 100644 --- a/fedora-iot.ks +++ b/fedora-iot.ks @@ -31,9 +31,11 @@ arch=$(uname -m) 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 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 diff --git a/fedora-modular-disk-minimal.ks b/fedora-modular-disk-minimal.ks index 5c839cd..a9a2842 100644 --- a/fedora-modular-disk-minimal.ks +++ b/fedora-modular-disk-minimal.ks @@ -55,6 +55,7 @@ dhcp-client # Setup Raspberry Pi firmware 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 releasever=$(rpm --eval '%{fedora}') rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-primary