diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/boot-1.4.01.16100-mod-181118.img.md5 b/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/boot-1.4.01.16100-mod-181118.img.md5 deleted file mode 100644 index 3a8297e..0000000 --- a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/boot-1.4.01.16100-mod-181118.img.md5 +++ /dev/null @@ -1 +0,0 @@ -cad85861a484e850a0893a2e1d0c1b98 diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater.pkg b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater.pkg similarity index 57% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater.pkg rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater.pkg index 14f7f3e..c254f04 100644 Binary files a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater.pkg and b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater.pkg differ diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/animation.sh b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/animation.sh similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/animation.sh rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/animation.sh diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/boot-1.4.01.16100-mod-181118.img b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/boot-1.4.01.16100-mod-181214.img similarity index 73% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/boot-1.4.01.16100-mod-181118.img rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/boot-1.4.01.16100-mod-181214.img index 4ca9b9f..51fd094 100644 Binary files a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/boot-1.4.01.16100-mod-181118.img and b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/boot-1.4.01.16100-mod-181214.img differ diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/boot-1.4.01.16100-mod-181214.img.md5 b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/boot-1.4.01.16100-mod-181214.img.md5 new file mode 100644 index 0000000..975d469 --- /dev/null +++ b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/boot-1.4.01.16100-mod-181214.img.md5 @@ -0,0 +1 @@ +1867e8378c68753224677f8e00f81aad diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/chkver.sh b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/chkver.sh similarity index 98% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/chkver.sh rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/chkver.sh index 6b82de1..602ae5b 100755 --- a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/chkver.sh +++ b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/chkver.sh @@ -21,7 +21,7 @@ then else # echo "false"; echo "chkver.sh failed!" >> $LOG_FP - exit 1 + exit 127 fi diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/eufwupdater.sh b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/eufwupdater.sh similarity index 68% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/eufwupdater.sh rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/eufwupdater.sh index 33ad9b9..448d242 100755 --- a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/eufwupdater.sh +++ b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/eufwupdater.sh @@ -12,23 +12,24 @@ ${UPDATER_BASE}/animation.sh $LOG_FP & ANIM_PID=$! sleep 2 -# version check -${UPDATER_BASE}/chkver.sh ${UPDATER_BASE}/version $LOG_FP -if [ "$?" -eq 0 ] -then - echo "[updater.sh] version check OK" >> $LOG_FP -else - echo "[updater.sh] version check NG (TBD)" >> $LOG_FP - # strange version Package, so we must be install this package !! - exit 0; -fi -sync +# bypass version check +# # version check +# ${UPDATER_BASE}/chkver.sh ${UPDATER_BASE}/version $LOG_FP +# if [ "$?" -eq 0 ] +# then +# echo "[updater.sh] version check OK" >> $LOG_FP +# else +# echo "[updater.sh] version check NG (TBD)" >> $LOG_FP +# # strange version Package, so we must not install this package !! +# exit 0; +# fi +# sync # flash customized boot img echo "[updater.sh] writing boot.img.." >> $LOG_FP -if [ -f ${UPDATER_BASE}/boot-1.4.01.16100-mod-181118.img ] ; +if [ -f ${UPDATER_BASE}/boot-1.4.01.16100-mod-181214.img ] ; then - dd if=${UPDATER_BASE}/boot-1.4.01.16100-mod-181118.img of=/dev/mmcblk0p8 bs=4M + dd if=${UPDATER_BASE}/boot-1.4.01.16100-mod-181214.img of=/dev/mmcblk0p8 bs=4M sync else echo "[updater.sh] desired boot.img not exit; nothing did to boot partition" >> $LOG_FP diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status01.bmp b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status01.bmp similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status01.bmp rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status01.bmp diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status02.bmp b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status02.bmp similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status02.bmp rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status02.bmp diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status03.bmp b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status03.bmp similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status03.bmp rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status03.bmp diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status04.bmp b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status04.bmp similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status04.bmp rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status04.bmp diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status05.bmp b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status05.bmp similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status05.bmp rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status05.bmp diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status06.bmp b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status06.bmp similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status06.bmp rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status06.bmp diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status07.bmp b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status07.bmp similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/images/status07.bmp rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/images/status07.bmp diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/usbmemupdater.sh b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/usbmemupdater.sh similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/usbmemupdater.sh rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/usbmemupdater.sh diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/verify.sh b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/verify.sh similarity index 71% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/verify.sh rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/verify.sh index 1bda461..eee3f51 100755 --- a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/verify.sh +++ b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/verify.sh @@ -5,11 +5,11 @@ echo 3 > /proc/sys/vm/drop_caches LOG_FP=$2 -BOOT_IMG_SIZE=`stat -c%s $1/boot-1.4.01.16100-mod-181118.img` +BOOT_IMG_SIZE=`stat -c%s $1/boot-1.4.01.16100-mod-181214.img` 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-181118.img.md5` +BOOT_MD5=`cat $1/boot-1.4.01.16100-mod-181214.img.md5` echo "BLK08=$BLK8_MD5" >> $LOG_FP echo " BOOT=$BOOT_MD5" >> $LOG_FP @@ -21,6 +21,6 @@ echo "Verify OK" >> $LOG_FP exit 0; fi echo "Verify NG" >> $LOG_FP -exit 1; +exit 127; diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/version b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/version similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/FwUpdater/version rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/FwUpdater/version diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/aes.key b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/aes.key similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/aes.key rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/aes.key diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/decrypted_pkg.tar.gz b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/decrypted_pkg.tar.gz similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/decrypted_pkg.tar.gz rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/decrypted_pkg.tar.gz diff --git a/fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/init_vector b/fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/init_vector similarity index 100% rename from fw_updater_packer_unpacker/pkg_example/flashable_mod_RP1_boot_img/init_vector rename to fw_updater_packer_unpacker/pkg_example/flashable_mod_boot_img/init_vector