Merge branch 'develop'

This commit is contained in:
HappyZ 2019-03-22 21:45:01 -05:00
commit 6688f87c38
6 changed files with 5 additions and 5 deletions

View File

@ -0,0 +1 @@
9eb64a72d5dcf141fad34a13c3fb3b1a

View File

@ -27,9 +27,9 @@ sleep 2
# flash customized boot img # flash customized boot img
echo "[updater.sh] writing boot.img.." >> $LOG_FP echo "[updater.sh] writing boot.img.." >> $LOG_FP
if [ -f ${UPDATER_BASE}/boot-1.4.01.16100-mod-181214.img ] ; if [ -f ${UPDATER_BASE}/boot-1.4.01.16100-mod-190322.img ] ;
then then
dd if=${UPDATER_BASE}/boot-1.4.01.16100-mod-181214.img of=/dev/mmcblk0p8 bs=4M dd if=${UPDATER_BASE}/boot-1.4.01.16100-mod-190322.img of=/dev/mmcblk0p8 bs=4M
sync sync
else else
echo "[updater.sh] desired boot.img not exit; nothing did to boot partition" >> $LOG_FP echo "[updater.sh] desired boot.img not exit; nothing did to boot partition" >> $LOG_FP

View File

@ -5,11 +5,11 @@ echo 3 > /proc/sys/vm/drop_caches
LOG_FP=$2 LOG_FP=$2
BOOT_IMG_SIZE=`stat -c%s $1/boot-1.4.01.16100-mod-181214.img` BOOT_IMG_SIZE=`stat -c%s $1/boot-1.4.01.16100-mod-190322.img`
BLK8_MD5=`dd if=/dev/mmcblk0p8 bs=$BOOT_IMG_SIZE count=1 | md5sum | cut -d " " -f1` BLK8_MD5=`dd if=/dev/mmcblk0p8 bs=$BOOT_IMG_SIZE count=1 | md5sum | cut -d " " -f1`
BOOT_MD5=`cat $1/boot-1.4.01.16100-mod-181214.img.md5` BOOT_MD5=`cat $1/boot-1.4.01.16100-mod-190322.img.md5`
echo "BLK08=$BLK8_MD5" >> $LOG_FP echo "BLK08=$BLK8_MD5" >> $LOG_FP
echo " BOOT=$BOOT_MD5" >> $LOG_FP echo " BOOT=$BOOT_MD5" >> $LOG_FP