cgpt: Remove unused key name 'blocks' and 'block_size'
Partition sizes are calculate in bytes instead of blocks. Remove
unused key 'blocks' and 'block_size from ApplyPartitionAdjust function.
BUG=chromium:832160
BRANCH=none
CQ-DEPEND=CL:*668838
CQ-DEPEND=CL:1189129
TEST=manual
setup_board --board=soraka
build_image --board=soraka
USE="chrome_media" ./build_image --board=soraka --adjust_part='STATE:+16G' --noenable_rootfs_verification test
cros tryjob -g 1179065 -g 1189129 tatl-paladin-tryjob
Change-Id: I8a5276adb4045e0fee940ce4f8a990c7a1e9303e
Reviewed-on: https://chromium-review.googlesource.com/1179065
Commit-Ready: Sam Hurst <shurst@google.com>
Tested-by: Sam Hurst <shurst@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
diff --git a/build_library/cgpt.py b/build_library/cgpt.py
index 39a17d0..b8b4063 100755
--- a/build_library/cgpt.py
+++ b/build_library/cgpt.py
@@ -351,7 +351,7 @@
valid_keys = set(('_comment', 'metadata', 'layouts', 'parent'))
valid_layout_keys = set((
- '_comment', 'num', 'blocks', 'block_size', 'fs_blocks', 'fs_block_size',
+ '_comment', 'num', 'fs_blocks', 'fs_block_size', 'bytes',
'uuid', 'label', 'format', 'fs_format', 'type', 'features',
'size', 'fs_size', 'fs_options', 'erase_block_size', 'hybrid_mbr',
'reserved_erase_blocks', 'max_bad_erase_blocks', 'external_gpt',
@@ -496,6 +496,7 @@
array) case.
Args:
+ config: The config dictionary.
partitions: List of partitions to process
Returns:
@@ -507,13 +508,14 @@
# will be 0, and we don't need to make space at the beginning for the GPT.
return 0
else:
- return START_SECTOR + _GetPrimaryEntryArrayPaddingBytes(config);
+ return START_SECTOR + _GetPrimaryEntryArrayPaddingBytes(config)
def GetTableTotals(config, partitions):
"""Calculates total sizes/counts for a partition table.
Args:
+ config: The config dictionary.
partitions: List of partitions to process
Returns:
@@ -622,20 +624,12 @@
partition = GetPartitionByLabel(partitions, label)
operand_bytes = ParseHumanNumber(operand)
- if operand_bytes % metadata['block_size'] == 0:
- operand_blocks = operand_bytes / metadata['block_size']
- else:
- raise InvalidAdjustment('Adjustment size %s not divisible by block size %s'
- % (operand_bytes, metadata['block_size']))
if operator == '+':
- partition['blocks'] += operand_blocks
partition['bytes'] += operand_bytes
elif operator == '-':
- partition['blocks'] -= operand_blocks
partition['bytes'] -= operand_bytes
elif operator == '=':
- partition['blocks'] = operand_blocks
partition['bytes'] = operand_bytes
else:
raise ValueError('unknown operator %s' % operator)
@@ -646,9 +640,7 @@
# the hashpad.
partition['fs_bytes'] = partition['bytes']
partition['fs_blocks'] = partition['fs_bytes'] / metadata['fs_block_size']
- partition['blocks'] = int(partition['blocks'] * 1.15)
- partition['bytes'] = partition['blocks'] * metadata['block_size']
-
+ partition['bytes'] = int(partition['bytes'] * 1.15)
def GetPartitionTableFromConfig(options, layout_filename, image_type):
"""Loads a partition table and returns a given partition table type
@@ -783,13 +775,13 @@
'local curr=%d' % _GetPartitionStartByteOffset(config, partitions),
'# Make sure Padding is block_size aligned.',
'if [ $(( %d & (block_size - 1) )) -gt 0 ]; then' %
- _GetPrimaryEntryArrayPaddingBytes(config),
+ _GetPrimaryEntryArrayPaddingBytes(config),
' echo "Primary Entry Array padding is not block aligned." >&2',
' exit 1',
'fi',
'# Create the GPT headers and tables. Pad the primary ones.',
'${GPT} create -p $(( %d / block_size )) ${target}' %
- _GetPrimaryEntryArrayPaddingBytes(config),
+ _GetPrimaryEntryArrayPaddingBytes(config),
]
metadata = GetMetadataPartition(partitions)
@@ -830,7 +822,7 @@
if stateful != None:
lines += align_to_fs_block + [
'blocks=$(( numsecs - (curr + %d) / block_size ))' %
- SECONDARY_GPT_BYTES,
+ SECONDARY_GPT_BYTES,
gpt_add % (stateful['num'], stateful['type'], stateful['label']),
]
