diff options
author | Jybz <j.biernacki@free.fr> | 2019-12-05 07:56:49 +0100 |
---|---|---|
committer | Jybz <j.biernacki@free.fr> | 2019-12-05 07:56:49 +0100 |
commit | 7d2a3797c3da434f32542b21ab3ebe9f6ee36124 (patch) | |
tree | 790f30e1ff6600e12faec5fee9a55bb3ec95c274 /platforms/xu4 | |
parent | c4b658842b4f4bc8b529b484002fd00469a38e0e (diff) | |
parent | d7c2376925bec483811b4bdada1c415b5a333b91 (diff) | |
download | mageia4arm-7d2a3797c3da434f32542b21ab3ebe9f6ee36124.tar mageia4arm-7d2a3797c3da434f32542b21ab3ebe9f6ee36124.tar.gz mageia4arm-7d2a3797c3da434f32542b21ab3ebe9f6ee36124.tar.bz2 mageia4arm-7d2a3797c3da434f32542b21ab3ebe9f6ee36124.tar.xz mageia4arm-7d2a3797c3da434f32542b21ab3ebe9f6ee36124.zip |
sync4
Diffstat (limited to 'platforms/xu4')
-rwxr-xr-x | platforms/xu4/specialFunctions.sh~ (renamed from platforms/xu4/specialFunctions.sh) | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/platforms/xu4/specialFunctions.sh b/platforms/xu4/specialFunctions.sh~ index 953be47..6b205bf 100755 --- a/platforms/xu4/specialFunctions.sh +++ b/platforms/xu4/specialFunctions.sh~ @@ -63,11 +63,19 @@ 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}" @@ -78,9 +86,15 @@ 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 } |