DTux/dtux__mageia4arm
Archived
1
0
Fork 0
Code Activity

Reparation build Rpi + essais Rpi3b+ 64bits

Browse Source
This commit is contained in:
Jybz
2020-01-04 08:52:48 +01:00
parent c9dbaadba7
commit 16ffe5ff5c
21 changed files with 505 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
platforms/xu4/specialFunctions.sh
View File

@ -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
}