#941 clean up some armhfp remnants
Merged a year ago by ngompa. Opened a year ago by pbrobinson.
pbrobinson/fedora-kickstarts armhfp-cleanup  into  main

file modified
+1 -12
@@ -34,8 +34,6 @@ 

  @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
@@ -57,20 +55,11 @@ 

  

  %post

  

- # 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 @@ 

  # 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

  

file modified
-12
@@ -24,23 +24,11 @@ 

  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.

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

rebased onto fae2f44

a year ago

Pull-Request has been merged by ngompa

a year ago
Metadata