From 4ea7487cc353751c6706bcb3e73ddf45d0ec17f8 Mon Sep 17 00:00:00 2001
From: Jybz <j.biernacki@free.fr>
Date: Fri, 19 Feb 2021 14:36:49 +0100
Subject: Fix overwriting the MIRROR variable, workarround skip-fs-probe for
 grub2-install, add raspberrypi-firmware package

---
 platforms/rpi-aarch64/mageia4arm.cfg          |  7 +++++--
 platforms/rpi-aarch64/second_stage_install.sh |  3 +++
 platforms/rpi-aarch64/specialFunctions.sh     | 10 +++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/platforms/rpi-aarch64/mageia4arm.cfg b/platforms/rpi-aarch64/mageia4arm.cfg
index b862020..1de8b03 100644
--- a/platforms/rpi-aarch64/mageia4arm.cfg
+++ b/platforms/rpi-aarch64/mageia4arm.cfg
@@ -22,8 +22,11 @@ ARM_VERSION="aarch64"
 TARGET="rpi-aarch64"
 
 # URL of the Mageia mirror used to install ( see mirrors.mageia.org )
-MIRROR="http://ftp.free.fr/mirrors/mageia.org/distrib/${MAGEIA_VERSION}/${ARM_VERSION}"
-#MIRROR="/mnt/STOCK/mageia/distrib/$MAGEIA_VERSION/$ARM_VERSION"
+# MIRROR="http://ftp.free.fr/mirrors/mageia.org/distrib/${MAGEIA_VERSION}/${ARM_VERSION}"
+# #MIRROR="/mnt/STOCK/mageia/distrib/$MAGEIA_VERSION/$ARM_VERSION"
+MIRROR_ROOT=http://ftp.free.fr/mirrors/mageia.org/distrib
+MIRROR_REPO="${MIRROR_ROOT}/${MAGEIA_VERSION}/${ARM_VERSION}"
+MIRROR=${MIRROR:="${MIRROR_REPO}"}
 
 #Default user
 # ID_USER="pi"
diff --git a/platforms/rpi-aarch64/second_stage_install.sh b/platforms/rpi-aarch64/second_stage_install.sh
index 8f6a73f..59735c2 100644
--- a/platforms/rpi-aarch64/second_stage_install.sh
+++ b/platforms/rpi-aarch64/second_stage_install.sh
@@ -31,11 +31,14 @@ export ARCH=arm64
 /sbin/urpmi.update "Nonfree Updates"
 <INSTALL_EXEC> --media "Nonfree Release" kernel-firmware-nonfree
 <INSTALL_EXEC> --media "Nonfree Updates" kernel-firmware-nonfree
+<INSTALL_EXEC> --media "Nonfree Release,Nonfree Updates" raspberrypi-firmware
 
 /usr/bin/sed -i -e 's/GRUB_CMDLINE_LINUX_DEFAULT="\(.*\)"/GRUB_CMDLINE_LINUX_DEFAULT="\1 audit=0"/' /etc/default/grub
 
+mv /etc/grub.d/30_os-prober /tmp
 /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg
 /usr/sbin/grub2-install --skip-fs-probe --target=arm64-efi --efi-directory=/boot/EFI --force  --force-file-id
+mv /tmp/30_os-prober /etc/grub.d/
 
 /usr/bin/chown :chrony -R /etc/chrony.keys /var/log/chrony
 /usr/bin/chown :daemon /etc/wpa_supplicant.conf
diff --git a/platforms/rpi-aarch64/specialFunctions.sh b/platforms/rpi-aarch64/specialFunctions.sh
index 7cecb75..14c0b10 100755
--- a/platforms/rpi-aarch64/specialFunctions.sh
+++ b/platforms/rpi-aarch64/specialFunctions.sh
@@ -22,11 +22,11 @@ SFDISK_SCRIPT=",128M,c,*\n,,L,\nwrite\n"
 function preImgCreation()
 {
     
-    title "Download binary blob for Rpi"
-    for i in ${FIRMWARE_DOWNLOAD_URL}; do
-        info "Download ${i}"
-        curl -L -O -J ${i} -s
-    done
+#     title "Download binary blob for Rpi"
+#     for i in ${FIRMWARE_DOWNLOAD_URL}; do
+#         info "Download ${i}"
+#         curl -L -O -J ${i} -s
+#     done
 
     title "Creating Pi image"
     title "Making raspberry pi image"
-- 
cgit v1.2.1