enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert free space overhead change in e5e3206

Browse Source 
Don't create extra logs if logging to file is not enabled
This commit is contained in:
zador-blood-stained 2016-09-01 13:10:31 +03:00
parent 5d74a32b2d
commit 4a286d470e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.sh
View File

@ -99,12 +99,12 @@ compile_uboot()
cd $DEST/debs
display_alert "Building deb" "$uboot_name.deb" "info"
dpkg -b $uboot_name >> $DEST/debug/compilation.log 2>&1
eval 'dpkg -b $uboot_name 2>&1' ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/compilation.log'}
rm -rf $uboot_name
FILESIZE=$(wc -c $DEST/debs/$uboot_name.deb | cut -f 1 -d ' ')
local filesize=$(wc -c $DEST/debs/$uboot_name.deb | cut -f 1 -d ' ')
if [[ $FILESIZE -lt 50000 ]]; then
if [[ $filesize -lt 50000 ]]; then
rm $DEST/debs/$uboot_name.deb
exit_with_error "Building u-boot failed, check configuration"
fi

8
debootstrap-ng.sh
View File

@ -241,7 +241,7 @@ create_rootfs_cache()
# DEBUG: print free space
echo -e "\nFree space:"
df -h | grep "$CACHEDIR/" | tee -a $DEST/debug/debootstrap.log
eval df -h | grep "$CACHEDIR/" ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'}
# stage: remove downloaded packages
chroot $CACHEDIR/sdcard /bin/bash -c "apt-get clean"
@ -327,9 +327,9 @@ prepare_partitions()
fi
else
local imagesize=$(( $rootfs_size + $OFFSET + $BOOTSIZE )) # MiB
# Hardcoded overhead +25% and +128MB for ext4 leaves ~20% free on root partition
# Hardcoded overhead +40% and +128MB for ext4 is needed for desktop images, for CLI it can be lower
# extra 128 MiB for emergency swap file
local sdsize=$(bc -l <<< "scale=0; ($imagesize * 1.25) / 1 + 128")
local sdsize=$(bc -l <<< "scale=0; ($imagesize * 1.4) / 1 + 128")
fi
# stage: create blank image
@ -451,7 +451,7 @@ create_image()
# DEBUG: print free space
display_alert "Free space:" "SD card" "info"
df -h | grep "$CACHEDIR/" | tee -a $DEST/debug/debootstrap.log
eval df -h | grep "$CACHEDIR/" ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'}
# stage: write u-boot
write_uboot $LOOP