Skip to content

ota: Add precheck for diff apply #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 4 commits into from
Jul 22, 2025
Merged

ota: Add precheck for diff apply #12

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aadd636
ota: remove this redundant judgment
gneworld Mar 11, 2025
634b574
ota: need reboot and retry if patch failed
JianyuWang0623 Jun 6, 2025
47112b6
ota: Fix error that progress exceeds 100
JianyuWang0623 Jul 21, 2025
7add6a2
ota: Add precheck for diff apply
JianyuWang0623 Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 20 additions & 31 deletions tools/gen_ota_zip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ def gen_diff_ota_sh(patch_path, bin_list, newpartition_list, args, tmp_folder):

ota_progress = 30.0
max_progress = 100 - args.user_end_script_progress
gen_progress = (max_progress - ota_progress) * float(sum(bin_size_list[:bin_list_cnt]) / sum (bin_size_list))
ota_progress_list = []

for i in range(bin_list_cnt):
ota_progress += float(patch_size_list[i] / sum(patch_size_list)) * (max_progress - 30)
ota_progress_list.append(math.floor(ota_progress))
ota_progress_list.insert(len(ota_progress_list) // 2, math.floor(ota_progress + float(sum(patch_size_list[:i + 1]) / sum(patch_size_list)) * gen_progress * 0.1))
ota_progress_list.append(math.floor(ota_progress + gen_progress * 0.1 + float(sum(patch_size_list[:i + 1]) / sum(patch_size_list)) * gen_progress * 0.9))

for j in range(len(newpartition_list)):
ota_progress += float(bin_size_list[i + j] / sum(bin_size_list)) * (max_progress - 70)
ota_progress_list.append(math.floor(ota_progress))
ota_progress_list.append(math.floor(ota_progress + gen_progress + float(sum(bin_size_list[bin_list_cnt:bin_list_cnt + j + 1]) / sum(bin_size_list[bin_list_cnt:])) * (max_progress - ota_progress - gen_progress)))

ota_progress_list[-1] = max_progress
str = \
Expand All @@ -117,39 +117,28 @@ def gen_diff_ota_sh(patch_path, bin_list, newpartition_list, args, tmp_folder):
''' % (ota_progress_list[0])
fd.write(str)

str = \
'''if [ ! -e /ota/%s ]
then
''' % (bin_list[bin_list_cnt - 1])
fd.write(str)

for i in range(bin_list_cnt):
bin_list_cnt *= 2
for i, j in zip(list(range(bin_list_cnt // 2)) * 2, range(bin_list_cnt)):
str = \
'''
echo "generate %s"%s
time "ddelta_apply %s %s/ /ota/%spatch"
if [ $? -ne 0 ]
then
echo "ddelta_apply %s failed"%s
setprop ota.progress.current -1
exit
fi

setprop ota.progress.current %d
echo "generate %s"%s
time "ddelta_apply %s %s/ /ota/%spatch %s"
if [ $? -ne 0 ]
then
echo "ddelta_apply %s failed"%s
setprop ota.progress.current -1
reboot
fi

setprop ota.progress.current %d
''' % (bin_list[i], args.otalog,
patch_path[i], args.ota_tmp, bin_list[i][:-3],
patch_path[i], args.ota_tmp, bin_list[i][:-3], "precheck" if j < bin_list_cnt // 2 else "",
bin_list[i][:-4], args.otalog,
ota_progress_list[i])
if i + 1 < bin_list_cnt:
str += ' setprop ota.progress.next %d\n' % (ota_progress_list[i + 1])
ota_progress_list[j])
if j + 1 < bin_list_cnt:
str += 'setprop ota.progress.next %d\n' % (ota_progress_list[j + 1])
fd.write(str)

str = \
'''
fi
'''
fd.write(str)

i = 0
for file in newpartition_list:
str = \
Expand Down
Loading