From 16ffe5ff5c499a8d7700d2228b672b3b6e42b20c Mon Sep 17 00:00:00 2001
From: Jybz <j.biernacki@free.fr>
Date: Sat, 4 Jan 2020 08:52:48 +0100
Subject: Reparation build Rpi + essais Rpi3b+ 64bits

---
 platforms/rpi3+/firmware-stable.zip | Bin 0 -> 21999616 bytes
 platforms/rpi3+/mageia4arm.cfg      |  23 ++++++++++++-----------
 platforms/rpi3+/specialFunctions.sh |   2 +-
 platforms/rpi3+/stable.zip          | Bin 0 -> 2945024 bytes
 4 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 platforms/rpi3+/firmware-stable.zip
 create mode 100644 platforms/rpi3+/stable.zip

(limited to 'platforms/rpi3+')

diff --git a/platforms/rpi3+/firmware-stable.zip b/platforms/rpi3+/firmware-stable.zip
new file mode 100644
index 0000000..b8e29c3
Binary files /dev/null and b/platforms/rpi3+/firmware-stable.zip differ
diff --git a/platforms/rpi3+/mageia4arm.cfg b/platforms/rpi3+/mageia4arm.cfg
index bf8a58a..8667978 100644
--- a/platforms/rpi3+/mageia4arm.cfg
+++ b/platforms/rpi3+/mageia4arm.cfg
@@ -25,21 +25,17 @@ TARGET="rpi"
 TARGET_VERSION="3+"
 
 # 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="http://ftp.free.fr/mirrors/mageia.org/distrib/${MAGEIA_VERSION}/${ARM_VERSION}"
 #MIRROR="/mnt/STOCK/mageia/distrib/$MAGEIA_VERSION/$ARM_VERSION"
-# image will be created here
 
-INSTALL_PATH="/mnt/perso/raspi-test"
+# image will be created here
+# INSTALL_PATH="/mnt/perso/raspi-test"
 
 # Build directory will be created here
-BUILD_PATH="$INSTALL_PATH/build"
+BUILD_PATH="${INSTALL_PATH}/build"
 
 #name of the image
-IMAGE="Mageia-${MAGEIA_VERSION}-$TARGET.img"
-
-#Mount point of image's partitions
-BOOT="/mnt/boot"
-ROOT="/mnt/root"
+IMAGE="Mageia-${MAGEIA_VERSION}-${TARGET}.img"
 
 #Default user
 ID_USER="pi"
@@ -49,16 +45,21 @@ PASSWORD="raspberry"
 ROOT_PWD="piroot"
 
 #Hostname
-HOSTNAME="$TARGET.$ID_USER"
+HOSTNAME="${TARGET}"
 
 #Filesystem of boot partitions (default ext4 raspberry pi need vfat)
+SEPARATE_BOOT_PARTITION=1
 BOOTFS="vfat"
 
+#Mount point of image's partitions
+BOOT="/mnt/boot"
+ROOT="/mnt/root"
+
 #The arguments for the Kernel
 BOOT_ARGS='dwc_otg.lpm_enable=0 console=ttyS0,115200 kgdboc=ttyS0,115200 console=tty1 rootwait fsck.repair=1 8250.nr_uarts=1 elevator=deadline cma=256M\@512M audit=0'
 
 #Path where the raspberry pi firmware is/will be installed
-FIRMWARE_PATH="$INSTALL_PATH"
+FIRMWARE_PATH="${INSTALL_PATH}"
 FIRMWARE_DIR="firmware-stable"
 FIRMWARE_DOWNLOAD_URL="https://github.com/raspberrypi/firmware/archive/stable.zip"
 
diff --git a/platforms/rpi3+/specialFunctions.sh b/platforms/rpi3+/specialFunctions.sh
index ad00c50..2dc08f5 100755
--- a/platforms/rpi3+/specialFunctions.sh
+++ b/platforms/rpi3+/specialFunctions.sh
@@ -132,7 +132,7 @@ function copyingCustomSystem()
     if ! [ -d "${ROOT}/usr/lib/firmware/brcm/" ]; then
         /bin/mkdir -p "${ROOT}/usr/lib/firmware/brcm/"
     fi
-    if ! [ -f "${ROOT}/usr/lib/firmware/brcm/brcmfmac434"* ]; then
+    if ! [[ -f "${ROOT}/usr/lib/firmware/brcm/brcmfmac434"* ]]; then
         /bin/cp --preserve=mode "${CONFIG_PATH}/brcmfmac434"* "${ROOT}/usr/lib/firmware/brcm/"
         if [ ${?} -ne 0 ]; then
             error "line ${LINENO} error copying wifi firmware in ${ROOTP}/usr/lib/firmware/brcm/ : exiting"
diff --git a/platforms/rpi3+/stable.zip b/platforms/rpi3+/stable.zip
new file mode 100644
index 0000000..fd6dc63
Binary files /dev/null and b/platforms/rpi3+/stable.zip differ
-- 
cgit v1.2.1