Expand environment variables in gen_esp32part

Allows parametrizing partition table with (exported) make variables.
This commit is contained in:
Deomid Ryabkov 2017-01-26 01:47:53 +00:00
parent 6bc9cd39e9
commit 22c3877183

View file

@ -5,8 +5,10 @@
# Converts partition tables to/from CSV and binary formats.
#
# See the sdkng README.md file for details about how to use this tool.
import struct
import argparse
import os
import re
import struct
import sys
MAX_PARTITION_LENGTH = 0xC00 # 3K for partition data (96 entries) leaves 1K in a 4K sector for signature
@ -163,7 +165,13 @@ class PartitionDefinition(object):
def from_csv(cls, line):
""" Parse a line from the CSV """
line_w_defaults = line + ",,,," # lazy way to support default fields
fields = [ f.strip() for f in line_w_defaults.split(",") ]
def expand_vars(f):
f = os.path.expandvars(f)
m = re.match(r'(?<!\\)\$([A-Za-z_][A-Za-z0-9_]*)', f)
if m:
raise InputError("unknown variable '%s'" % m.group(1))
return f
fields = [ expand_vars(f.strip()) for f in line_w_defaults.split(",") ]
res = PartitionDefinition()
res.name = fields[0]
@ -346,5 +354,5 @@ if __name__ == '__main__':
try:
main()
except InputError as e:
print(e)
print >>sys.stderr, e
sys.exit(2)