External/fedora-kickstarts
1
0
Fork 0
mirror of https://pagure.io/fedora-kickstarts.git synced 2024-12-22 05:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix arch detection to use armhfp.

Browse Source 
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
This commit is contained in:
Paul Whalen 2020-10-26 20:15:47 -04:00
parent 9ea7904197
commit 0d39a9830c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fedora-iot.ks
View File

@ -26,9 +26,12 @@ reboot
%post --erroronfail %post --erroronfail
# Find the architecture we are on # Find the architecture we are on
arch=$(uname -m) arch=$(uname -m)
if [[ $arch == "armv7l" ]]; then
arch="armhfp"
fi
# Setup Raspberry Pi firmware # Setup Raspberry Pi firmware
if [[ $arch == "aarch64" ]] || [[ $arch == "armv7l" ]]; then if [[ $arch == "aarch64" ]] || [[ $arch == "armhfp" ]]; then
if [[ $arch == "aarch64" ]]; 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_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_4/u-boot.bin /boot/efi/rpi4-u-boot.bin
@ -41,14 +44,14 @@ fi
# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes. # 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. # 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/${basearch}/iot" ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/rawhide/${arch}/iot"
# Make sure the ref we're supposedly sitting on (according # Make sure the ref we're supposedly sitting on (according
# to the updated origin) exists. # to the updated origin) exists.
ostree refs "fedora-iot:fedora/rawhide/${basearch}/iot" --create "fedora-iot:fedora/rawhide/$basearch}/iot" ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --create "fedora-iot:fedora/rawhide/${arch}/iot"
# Remove the old ref so that the commit eventually gets cleaned up. # Remove the old ref so that the commit eventually gets cleaned up.
ostree refs "fedora-iot:fedora/rawhide/${basearch}/iot" --delete ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --delete
# delete/add the remote with new options to enable gpg verification # delete/add the remote with new options to enable gpg verification
# and to point them at the cdn url # and to point them at the cdn url