@@ -212,25 +212,23 @@ elif [ "$partition" = "boot" ] || [ "$partition" = "vendor_boot" ]; then
212212 done
213213 # xây dựng dtb
214214 cd " $INPUT "
215- for redts in $( ls -1d dts_* .+ ([0-9]) 2> /dev/null | sort -n -t . -k 2) ; do
215+ if [ " $( cat dts_* | checksum) " != " $( cat cache/md5_dts) " ]; then
216+ for redts in $( ls -1d dts_* .+ ([0-9]) 2> /dev/null | grep -v " \.bak$" | sort -n -t . -k 2) ; do
216217 nrep=" ${redts/ dts_/ } "
217- if [ " $( checksum $redts ) " == " $( cat cache/md5_$nrep ) " ]; then
218- cp -f cache/${nrep} ${nrep}
219- else
220218 echo " Build DTB: $redts "
221219 dtc -q -I dts -O dtb -@ -o ${nrep} $redts
222220 [ " $? " != 0 ] && killtree " Error: Build DTB"
223- fi
224- done
225- for bdts in $( ls -1d cache/type_* 2> /dev/null ) ; do
226- nedts =" ${ bdts/ cache \/ type_ / } "
227- tydbs= " $( cat $bdts ) "
228- if [ " $tydbs " == ' dtb' ] || [ " $tydbs " == ' dtbo ' ] ; then
229- [ " $tydbs " == ' dtb ' ] && merge_dtb.py $nedts $( ls -1d $nedts .* | sort -n -t . -k 2) > /dev/null
230- [ " $tydbs " == ' dtbo ' ] && dtbo create $nedts $( ls -1d $nedts . * | sort -n -t . -k 2 ) > /dev/null
231- fi
232- rm -f $nedts . *
233- done
221+ done
222+ for bdts in $( ls -1d cache/type_ * 2> /dev/null ) ; do
223+ nedts= " ${bdts / cache\ / type_/ } "
224+ tydbs =" $( cat $ bdts) "
225+ if [ " $ tydbs" == ' dtb ' ] || [ " $tydbs " == ' dtbo ' ] ; then
226+ [ " $tydbs " == ' dtb' ] && merge_dtb.py $nedts $( ls -1d $nedts . * | sort -n -t . -k 2 ) > /dev/null
227+ [ " $tydbs " == ' dtbo ' ] && dtbo create $nedts $( ls -1d $nedts .* | sort -n -t . -k 2) > /dev/null
228+ fi
229+ rm -f $nedts . *
230+ done
231+ fi
234232 # xây dựng boot
235233 magiskboot repack " ${INPUT##*/ } .img" " $saved " 2>&1
236234 echo
@@ -243,20 +241,17 @@ elif [ "$partition" = "logo" ];then
243241 echo
244242elif [ " $partition " = " dtbo" ]; then
245243 cd " $INPUT "
246- for dtbo in $( ls -1d dts.* | sort -n -t . -k 2) ; do
247- if [ " $( checksum $dtbo ) " == " $( cat cache/md5_$dtbo 2> /dev/null) " ]; then
248- echo " Copy raw: dtb.${dtbo##* .} "
249- cp -f cache/dtb.${dtbo##* .} dtb.${dtbo##* .}
250- else
244+ if [ " $( cat dts.* | checksum) " != " $( cat cache/md5_dts) " ]; then
245+ for dtbo in $( ls -1d dts.* | grep -v " \.bak$" | sort -n -t . -k 2) ; do
251246 echo " Build dtb: $dtbo "
252247 dtc -q -I dts -O dtb -@ -o dtb.${dtbo##* .} $dtbo
253248 [ " $? " != 0 ] && killtree " Error: Build dtb"
254- fi
255- done
256- dtbo create dtbo.img $( ls -1d dtb.* | sort -n -t . -k 2) > /dev/null
249+ done
250+ dtbo create dtbo.img $( ls -1d dtb.* | sort -n -t . -k 2) > $TMP /dtbo_create.log
257251 rm -fr dtb.*
258- cp -f dtbo.img " $saved "
259252 echo
253+ fi
254+ cp -f dtbo.img " $saved "
260255elif [ " $partition " == " squashfs" ]; then
261256 [ " $ROT " == 0 ] && killtree " Error build: squashfs, $root_warning_text "
262257 loai_nen=" $( grep ' ^Compression' " $fs_options " | awk ' {print $2}' ) "
0 commit comments