forked from srbala/fedora-kickstarts
IoT: armhfp fix, updates for stable
This commit is contained in:
parent
9a45c1d0a0
commit
c7036c7f02
@ -19,16 +19,19 @@ autopart --nohome --noswap --type=plain
|
|||||||
|
|
||||||
# Equivalent of %include fedora-repo.ks
|
# Equivalent of %include fedora-repo.ks
|
||||||
# Pull from the ostree repo that was created during the compose
|
# 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
|
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/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
|
# 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/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.
|
# 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
|
# 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
|
||||||
|
Loading…
Reference in New Issue
Block a user