From 6b05f497c87f9047b448cdd141fafbf057deda9a Mon Sep 17 00:00:00 2001
From: Jybz <j.biernacki@free.fr>
Date: Thu, 5 Dec 2019 07:58:04 +0100
Subject: sync5

---
 platforms/xu4/specialFunctions.sh  | 100 +++++++++++++++++++++++++++++++++++++
 platforms/xu4/specialFunctions.sh~ | 100 -------------------------------------
 2 files changed, 100 insertions(+), 100 deletions(-)
 create mode 100755 platforms/xu4/specialFunctions.sh
 delete mode 100755 platforms/xu4/specialFunctions.sh~

(limited to 'platforms/xu4')

diff --git a/platforms/xu4/specialFunctions.sh b/platforms/xu4/specialFunctions.sh
new file mode 100755
index 0000000..6b205bf
--- /dev/null
+++ b/platforms/xu4/specialFunctions.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+#RPI partitionning :
+DEFAULT=""
+NEW_PART=n
+PRIMARY=p
+CHANGE_TYPE=t
+CHANGE_BOOTFLAG=a
+APPLY=w
+
+PART_BOOT=1
+PART_BOOT_FIRST_SECTOR=${DEFAULT}
+PART_BOOT_SIZE="+128M"
+
+PART_ROOT=2
+PART_ROOT_FIRST_SECTOR=${DEFAULT}
+PART_ROOT_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"
+
+
+function preImgCreation()
+{
+    title "Creating Odroid XU3-XU4 image"
+    return 0
+}
+
+
+function postPrepareChroot()
+{
+    #TEMPORARY CODE
+    #copying kernel odroid not existing in mageia repos
+    info "copying kernel-odroid and u-boot rpms in ${BUILD_PATH}/root"
+    #echo "/bin/cp ${CONFIG_PATH}/kernel-odroid-4.14.y-1.armv7hl.rpm ${BUILD_PATH}/root/"
+    /usr/bin/cp --preserve=mode "${CONFIG_PATH}/kernel-odroid-4.14.y-1.armv7hl.rpm" "${BUILD_PATH}/root/"
+    #echo "/bin/cp ${CONFIG_PATH}/u-boot-20180507-3.mga7.armv7hl.rpm ${BUILD_PATH}/root/"
+    /usr/bin/cp --preserve=mode "${CONFIG_PATH}/u-boot-20180507-3.mga7.armv7hl.rpm" "${BUILD_PATH}/root/"
+    if [ ${?} -ne 0 ]; then
+        error "line ${LINENO} error copying ${CONFIG_PATH}/kernel-odroid-4.14.y-1.armv7hl.rpm : exiting"
+        exit ${ERR_1}
+    fi
+    return 0
+}
+
+
+function bunrningBootloader()
+{
+    if [ ${TARGET} = "odroid" ]; then
+        info "installing blobs"
+        pushd "${CONFIG_PATH}/sd_fuse"
+        if [ ${?} -ne 0 ]; then
+            error "line ${LINENO} error directory ${CONFIG_PATH}/sd_fuse does not exists : exiting"
+            exit ${ERR_1}
+        else
+            ./sd_fusing.sh "${DEVICE}"
+        fi
+        pushd
+    fi
+    return 0
+}
+
+function copyingCustomSystem()
+{
+<<<<<<< HEAD
+#     ODROID_BOOT="${BUILD_PATH}/mnt/odroid_boot"
+#     if ! [ -d "${ODROID_BOOT}" ]; then
+#         rm -rf "${ODROID_BOOT}"
+#         mkdir -p "${ODROID_BOOT}"
+#     fi
+=======
+    ODROID_BOOT="${BUILD_PATH}/mnt/odroid_boot"
+    if ! [ -d "${ODROID_BOOT}" ]; then
+        rm -rf "${ODROID_BOOT}"
+        mkdir -p "${ODROID_BOOT}"
+    fi
+>>>>>>> d7c2376925bec483811b4bdada1c415b5a333b91
+    case ${TARGET_VERSION} in
+        "xu4")
+            info "copying u-boot for ${TARGET} ${TARGET_VERSION}"
+            cp --preserve=mode "${BUILD_PATH}/usr/lib/u-boot/${TARGET}-${TARGET_VERSION}/u-boot.bin" "${ARM_BOOT}/"
+            ;;
+    esac
+    ### temporary code waiting inclusion of xu4 in Mageia kernel and u-boot
+
+    info "Copying extlinux.conf on ${ODROID_BOOT}"
+    cp --preserve=mode -R "${BUILD_PATH}/boot/extlinux" "${ODROID_BOOT}/"
+<<<<<<< HEAD
+#     info "copying Mageia image to root partition"
+#     /bin/rsync -rlptogDH --exclude "${ODROID_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
+#     /bin/rsync -rlptogDH "${ODROID_BOOT}/" "${BOOT}/"
+=======
+    info "copying Mageia image to root partition"
+    /bin/rsync -rlptogDH --exclude "${ODROID_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
+    /bin/rsync -rlptogDH "${ODROID_BOOT}/" "${BOOT}/"
+>>>>>>> d7c2376925bec483811b4bdada1c415b5a333b91
+    return 0
+}
+
diff --git a/platforms/xu4/specialFunctions.sh~ b/platforms/xu4/specialFunctions.sh~
deleted file mode 100755
index 6b205bf..0000000
--- a/platforms/xu4/specialFunctions.sh~
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-#RPI partitionning :
-DEFAULT=""
-NEW_PART=n
-PRIMARY=p
-CHANGE_TYPE=t
-CHANGE_BOOTFLAG=a
-APPLY=w
-
-PART_BOOT=1
-PART_BOOT_FIRST_SECTOR=${DEFAULT}
-PART_BOOT_SIZE="+128M"
-
-PART_ROOT=2
-PART_ROOT_FIRST_SECTOR=${DEFAULT}
-PART_ROOT_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"
-
-
-function preImgCreation()
-{
-    title "Creating Odroid XU3-XU4 image"
-    return 0
-}
-
-
-function postPrepareChroot()
-{
-    #TEMPORARY CODE
-    #copying kernel odroid not existing in mageia repos
-    info "copying kernel-odroid and u-boot rpms in ${BUILD_PATH}/root"
-    #echo "/bin/cp ${CONFIG_PATH}/kernel-odroid-4.14.y-1.armv7hl.rpm ${BUILD_PATH}/root/"
-    /usr/bin/cp --preserve=mode "${CONFIG_PATH}/kernel-odroid-4.14.y-1.armv7hl.rpm" "${BUILD_PATH}/root/"
-    #echo "/bin/cp ${CONFIG_PATH}/u-boot-20180507-3.mga7.armv7hl.rpm ${BUILD_PATH}/root/"
-    /usr/bin/cp --preserve=mode "${CONFIG_PATH}/u-boot-20180507-3.mga7.armv7hl.rpm" "${BUILD_PATH}/root/"
-    if [ ${?} -ne 0 ]; then
-        error "line ${LINENO} error copying ${CONFIG_PATH}/kernel-odroid-4.14.y-1.armv7hl.rpm : exiting"
-        exit ${ERR_1}
-    fi
-    return 0
-}
-
-
-function bunrningBootloader()
-{
-    if [ ${TARGET} = "odroid" ]; then
-        info "installing blobs"
-        pushd "${CONFIG_PATH}/sd_fuse"
-        if [ ${?} -ne 0 ]; then
-            error "line ${LINENO} error directory ${CONFIG_PATH}/sd_fuse does not exists : exiting"
-            exit ${ERR_1}
-        else
-            ./sd_fusing.sh "${DEVICE}"
-        fi
-        pushd
-    fi
-    return 0
-}
-
-function copyingCustomSystem()
-{
-<<<<<<< HEAD
-#     ODROID_BOOT="${BUILD_PATH}/mnt/odroid_boot"
-#     if ! [ -d "${ODROID_BOOT}" ]; then
-#         rm -rf "${ODROID_BOOT}"
-#         mkdir -p "${ODROID_BOOT}"
-#     fi
-=======
-    ODROID_BOOT="${BUILD_PATH}/mnt/odroid_boot"
-    if ! [ -d "${ODROID_BOOT}" ]; then
-        rm -rf "${ODROID_BOOT}"
-        mkdir -p "${ODROID_BOOT}"
-    fi
->>>>>>> d7c2376925bec483811b4bdada1c415b5a333b91
-    case ${TARGET_VERSION} in
-        "xu4")
-            info "copying u-boot for ${TARGET} ${TARGET_VERSION}"
-            cp --preserve=mode "${BUILD_PATH}/usr/lib/u-boot/${TARGET}-${TARGET_VERSION}/u-boot.bin" "${ARM_BOOT}/"
-            ;;
-    esac
-    ### temporary code waiting inclusion of xu4 in Mageia kernel and u-boot
-
-    info "Copying extlinux.conf on ${ODROID_BOOT}"
-    cp --preserve=mode -R "${BUILD_PATH}/boot/extlinux" "${ODROID_BOOT}/"
-<<<<<<< HEAD
-#     info "copying Mageia image to root partition"
-#     /bin/rsync -rlptogDH --exclude "${ODROID_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
-#     /bin/rsync -rlptogDH "${ODROID_BOOT}/" "${BOOT}/"
-=======
-    info "copying Mageia image to root partition"
-    /bin/rsync -rlptogDH --exclude "${ODROID_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
-    /bin/rsync -rlptogDH "${ODROID_BOOT}/" "${BOOT}/"
->>>>>>> d7c2376925bec483811b4bdada1c415b5a333b91
-    return 0
-}
-
-- 
cgit v1.2.1