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

Merge branch 'master' of https://github.com/armbian/build

Browse Source
This commit is contained in:
tonymac32 2020-04-05 01:36:50 -04:00
commit 4e48f295e7
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/build-all-ng.sh
View File

@ -98,13 +98,19 @@ pack_upload ()
if [[ $COMPRESS_OUTPUTIMAGE == *gz* ]]; then
display_alert "Compressing" "$DEST/images/${version}.img.gz" "info"
pigz < $DESTIMG/${version}.img > ${DESTIMG}/${version}.img.gz
pigz $DESTIMG/${version}.img
fi
if [[ $COMPRESS_OUTPUTIMAGE == *xz* ]]; then
display_alert "Compressing" "$DEST/images/${version}.img.xz" "info"
pixz -3 < $DESTIMG/${version}.img > ${DESTIMG}/${version}.img.xz
rm ${DESTIMG}/${version}.img
fi
if [[ -n "${SEND_TO_SERVER}" ]]; then
ssh "${SEND_TO_SERVER}" "mkdir -p ${SEND_TO_LOCATION}${BOARD}/{archive,nightly}" &
display_alert "Uploading" "Please wait!" "info"
nice -n 19 bash -c "rsync -arP --info=progress2,stats1 --ignore-existing --remove-source-files --prune-empty-dirs $DESTIMG/ -e 'ssh -p 22' ${SEND_TO_SERVER}:${SEND_TO_LOCATION}${BOARD}/${subdir}" &
nice -n 19 bash -c "rsync -arP --info=progress2 --ignore-existing --remove-source-files --prune-empty-dirs $DESTIMG/ -e 'ssh -T -c aes128-ctr -o Compression=no -x -p 22' ${SEND_TO_SERVER}:${SEND_TO_LOCATION}${BOARD}/${subdir}" &
else
mv $DESTIMG/*.* $DEST/images/
fi

8
lib/debootstrap.sh
View File

@ -656,7 +656,13 @@ create_image()
if [[ $COMPRESS_OUTPUTIMAGE == *gz* ]]; then
display_alert "Compressing" "$DEST/images/${version}.img.gz" "info"
pigz < $DESTIMG/${version}.img > $DEST/images/${version}.img.gz
pigz $DESTIMG/${version}.img
fi
if [[ $COMPRESS_OUTPUTIMAGE == *xz* ]]; then
display_alert "Compressing" "$DEST/images/${version}.img.xz" "info"
pixz -3 < $DESTIMG/${version}.img > $DEST/images/${version}.img.xz
find $DESTIMG -type f -name '${version}.img' -print0 | xargs -0 rm --
fi
mv $DESTIMG/${version}.img.txt $DEST/images/${version}.img.txt || exit 1