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/xu4/specialFunctions.sh | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'platforms/xu4')

diff --git a/platforms/xu4/specialFunctions.sh b/platforms/xu4/specialFunctions.sh
index 640f18e..9860735 100755
--- a/platforms/xu4/specialFunctions.sh
+++ b/platforms/xu4/specialFunctions.sh
@@ -80,19 +80,11 @@ function bunrningBootloader()
 
 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}"
@@ -103,15 +95,9 @@ function copyingCustomSystem()
 
     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