From c7036c7f02998433c0bbed749f5de065678a1ad0 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 27 Oct 2020 19:48:13 +0000 Subject: [PATCH] IoT: armhfp fix, updates for stable --- fedora-iot.ks | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fedora-iot.ks b/fedora-iot.ks index 2346568..a109fcc 100644 --- a/fedora-iot.ks +++ b/fedora-iot.ks @@ -19,16 +19,19 @@ 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/devel/${basearch}/iot +ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/stable/${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 == "armv7l" ]]; then +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 @@ -41,14 +44,14 @@ 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/devel/${arch}/iot" +ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/stable/${arch}/iot" # Make sure the ref we're supposedly sitting on (according # to the updated origin) exists. -ostree refs "fedora-iot:fedora/devel/${arch}/iot" --create "fedora-iot:fedora/devel/${arch}/iot" +ostree refs "fedora-iot:fedora/stable/${arch}/iot" --create "fedora-iot:fedora/stable/${arch}/iot" # Remove the old ref so that the commit eventually gets cleaned up. -ostree refs "fedora-iot:fedora/devel/${arch}/iot" --delete +ostree refs "fedora-iot:fedora/stable/${arch}/iot" --delete # delete/add the remote with new options to enable gpg verification # and to point them at the cdn url