From 25a2be8e4d15eab6f8be91f057f4ea471f8848e0 Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Thu, 28 Nov 2019 11:35:22 +0800 Subject: [PATCH] scripts: repack-bootimg: fix os patch level "m" equal 0 Traceback (most recent call last): File "./scripts/mkbootimg", line 234, in main() File "./scripts/mkbootimg", line 224, in main args = parse_cmdline() File "./scripts/mkbootimg", line 210, in parse_cmdline return parser.parse_args() File "/usr/lib/python2.7/argparse.py", line 1690, in parse_args args, argv = self.parse_known_args(args, namespace) File "/usr/lib/python2.7/argparse.py", line 1722, in parse_known_args namespace, args = self._parse_known_args(args, namespace) File "/usr/lib/python2.7/argparse.py", line 1928, in _parse_known_args start_index = consume_optional(start_index) File "/usr/lib/python2.7/argparse.py", line 1868, in consume_optional take_action(action, args, option_string) File "/usr/lib/python2.7/argparse.py", line 1780, in take_action argument_values = self._get_values(action, argument_strings) File "/usr/lib/python2.7/argparse.py", line 2220, in _get_values value = self._get_value(action, arg_string) File "/usr/lib/python2.7/argparse.py", line 2249, in _get_value result = type_func(arg_string) File "./scripts/mkbootimg", line 172, in parse_os_patch_level assert m > 0 and m <= 12 AssertionError Signed-off-by: Joseph Chen Change-Id: I625717d27b9e807c4a2afee6b38eca9750ee4e41 --- scripts/repack-bootimg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/repack-bootimg b/scripts/repack-bootimg index aecd5a7ffc..61cc32c49c 100755 --- a/scripts/repack-bootimg +++ b/scripts/repack-bootimg @@ -133,6 +133,11 @@ os_version=$(printf '%d.%d.%d' $a $b $c) v=$(($os_version_patch_level & 0x7ff)) y=$((($v >> 4) + 2000)) m=$((($v & 15))) + +if [ $m -eq 0 ]; then + m=1 +fi + os_patch_level=$(printf '%d-%02d-01' $y $m) dtb_size=$(grep -a "^dtb size: " $log | sed "s/^dtb size: //")