From 50c091ee5c4274d949a7b30a0220cfacb09db846 Mon Sep 17 00:00:00 2001
From: Jybz <j.biernacki@free.fr>
Date: Tue, 8 Oct 2019 14:14:43 +0000
Subject: add choice specific boot partition or not

---
 platforms/bananaPro/specialFunctions.sh | 44 +++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'platforms/bananaPro/specialFunctions.sh')

diff --git a/platforms/bananaPro/specialFunctions.sh b/platforms/bananaPro/specialFunctions.sh
index 845bda6..805a36a 100644
--- a/platforms/bananaPro/specialFunctions.sh
+++ b/platforms/bananaPro/specialFunctions.sh
@@ -8,17 +8,22 @@ CHANGE_TYPE=t
 CHANGE_BOOTFLAG=a
 APPLY=w
 
-PART_BOOT=1
-PART_BOOT_FIRST_SECTOR=${DEFAULT}
-PART_BOOT_SIZE="+128M"
+# PART_BOOT=1
+# PART_BOOT_FIRST_SECTOR=${DEFAULT}
+# PART_BOOT_SIZE="+128M"
+# 
+# PART_ROOT=2
+# PART_ROOT_FIRST_SECTOR=${DEFAULT}
+# PART_ROOT_SIZE=${DEFAULT}
 
-PART_ROOT=2
-PART_ROOT_FIRST_SECTOR=${DEFAULT}
-PART_ROOT_SIZE=${DEFAULT}
+PART_BOOTandROOT=1
+PART_BOOTandROOT_FIRST_SECTOR=${DEFAULT}
+PART_BOOTandROOT_SIZE=${DEFAULT}
 
 TYPE_FAT32LBA=c
 
-FDISK_SCRIPT="${NEW_PART}\n${PRIMARY}\n${PART_BOOT}\n${PART_BOOT_FIRST_SECTOR}\n${PART_BOOT_SIZE}\n${CHANGE_TYPE}\n${TYPE_FAT32LBA}\n${NEW_PART}\n${PRIMARY}\n${PART_ROOT}\n${PART_ROOT_FIRST_SECTOR}\n${PART_ROOT_SIZE}\n${CHANGE_BOOTFLAG}\n${PART_BOOT}\n${CHANGE_BOOTFLAG}\n${PART_ROOT}\n${APPLY}\n"
+#FDISK_SCRIPT="${NEW_PART}\n${PRIMARY}\n${PART_BOOT}\n${PART_BOOT_FIRST_SECTOR}\n${PART_BOOT_SIZE}\n${CHANGE_TYPE}\n${TYPE_FAT32LBA}\n${NEW_PART}\n${PRIMARY}\n${PART_ROOT}\n${PART_ROOT_FIRST_SECTOR}\n${PART_ROOT_SIZE}\n${CHANGE_BOOTFLAG}\n${PART_BOOT}\n${CHANGE_BOOTFLAG}\n${PART_ROOT}\n${APPLY}\n"
+FDISK_SCRIPT="${NEW_PART}\n${PRIMARY}\n${PART_BOOTandROOT}\n${PART_BOOT_FIRST_SECTOR}\n${PART_PART_BOOTandROOT_SIZE}\n${CHANGE_BOOTFLAG}\n${PART_PART_BOOTandROOT}\n${APPLY}\n"
 
 
 
@@ -32,14 +37,19 @@ function preImgCreation()
 
 function postPrepareChroot()
 {
-    info "copying update_testing/kernel-desktop in ${BUILD_PATH}/root"
-    /usr/bin/cp --preserve=mode "${CONFIG_PATH}/kernel-desktop-5.3.1-2.mga7-1-1.mga7.armv7hl.rpm" "${BUILD_PATH}/root/"
+    info "copying kernel-desktop, dtb, boot.scr and vmlinuz symlink in ${BUILD_PATH}/boot"
+#     /usr/bin/cp --preserve=mode "${CONFIG_PATH}/kernel-desktop-5.3.1-2.mga7-1-1.mga7.armv7hl.rpm" "${BUILD_PATH}/root/"
+    /usr/bin/cp --preserve=mode "${CONFIG_PATH}/sun7i-a20-bananapro.dtb" "${BUILD_PATH}/boot/"
+    /usr/bin/cp --preserve=mode "${CONFIG_PATH}/boot.scr" "${BUILD_PATH}/boot/"
+    /usr/bin/cp --preserve=mode "${CONFIG_PATH}/uboot.env" "${BUILD_PATH}/boot/"
+    /usr/bin/cp --preserve=mode -d "${CONFIG_PATH}/vmlinuz" "${BUILD_PATH}/boot/"
     return 0
 }
 
 function bunrningBootloader()
 {
     # DEVICE is set just before this function and looped.
+    title "Burning the bootloader..."
     dd if=${CONFIG_PATH}/u-boot-sunxi-with-spl.bin of=${DEVICE} bs=1024 seek=8
     return 0
 }
@@ -47,14 +57,12 @@ function bunrningBootloader()
 function copyingCustomSystem()
 {
     #${BOOT} defined to the path to the mounted boot partition.
-#     UBOOTCMD="${CONFIG_PATH}/uEnv.txt"
-    UBOOTCMD="${CONFIG_PATH}/boot.scr"
-    DTB="${CONFIG_PATH}/sun7i-a20-bananapro.dtb"
-    VMLINUZ_LINK="${CONFIG_PATH}/vmlinuz"
-    VMLINUZ_KERNEL="${CONFIG_PATH}/vmlinuz-5.3.1-desktop-2.mga7"
-    /usr/bin/cp --preserve=mode "${DTB}" "${BOOT}"
-    /usr/bin/cp --preserve=mode "${UBOOTCMD}" "${BOOT}/"
-    /usr/bin/cp --preserve=mode "${VMLINUZ_LINK}" "${BOOT}/"
-    /usr/bin/cp --preserve=mode "${VMLINUZ_KERNEL}" "${BOOT}/"
+#     /usr/bin/cp --preserve=mode "${CONFIG_PATH}/vmlinuz-5.3.1-desktop-2.mga7" "${BOOT}"
+#     /usr/bin/cp --preserve=mode "${CONFIG_PATH}/sun7i-a20-bananapro.dtb" "${BOOT}"
+#     /usr/bin/cp --preserve=mode "${CONFIG_PATH}/boot.scr" "${BOOT}/"
+#     /usr/bin/cp --preserve=mode "${CONFIG_PATH}/uboot.env" "${BOOT}/"
+#     /usr/bin/cp --preserve=mode "${CONFIG_PATH}/uEnv.txt" "${BOOT}/"
+#     /usr/bin/cp --preserve=mode -d "${CONFIG_PATH}/vmlinuz" "${BOOT}/"
+    cp --preserve=mode -R "${BUILD_PATH}/boot/extlinux" "${BOOT}/"
     return 0
 }
-- 
cgit v1.2.1