diff options
author | Nick Sanders <nsanders@google.com> | 2011-03-11 22:20:48 -0800 |
---|---|---|
committer | Nick Sanders <nsanders@google.com> | 2011-03-11 22:20:48 -0800 |
commit | cca3ccaebbb3319c00ddf86a7ded83cb024d4ffb (patch) | |
tree | 77b5283ab125b5c222efb9d6a546deccf708435e | |
parent | c324fbfb6d37aa62b0e6e2f22dae7c949896ddef (diff) | |
download | vboot-cca3ccaebbb3319c00ddf86a7ded83cb024d4ffb.tar.gz |
Don't modify fv old-style bitmaps11.1.241.B0.11.241.B
* Just make new "bmp" files as necessary
BUG=chrome-os-partner:2558
TEST=runs as expected
Change-Id: I3046630ea3e3f0a40429bb63a986c6044b83c6a6
Review URL: http://codereview.chromium.org/6623008
(cherry picked from commit d221f223bdf97912101747d029403053dadf6da5)
Review URL: http://codereview.chromium.org/6686025
-rwxr-xr-x | scripts/newbitmaps/make_bmp_from_components.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/newbitmaps/make_bmp_from_components.py b/scripts/newbitmaps/make_bmp_from_components.py index ad4c3d4e..dffe1eda 100755 --- a/scripts/newbitmaps/make_bmp_from_components.py +++ b/scripts/newbitmaps/make_bmp_from_components.py @@ -49,6 +49,8 @@ def ProcessDir(directory): re_bmp = re.compile(r'\'data_bitmap_fv\': \[\'(?P<bmp>.*)\'\],') re_hwid = re.compile(r'\'part_id_hwqual\': \[\'(?P<hwid>.*)\'\],') re_geom = re.compile(r'\'data_display_geometry\': \[\'(?P<geom>.*)\'\],') + # Old bitmap style + re_fv = re.compile(r'.*\.fv') # Find the components files. files = glob.glob(os.path.join(directory, "data_*/components_*")) @@ -74,8 +76,11 @@ def ProcessDir(directory): if not ( bmp and hwid and geom): print "Corrupt HWID configuration" sys.exit(1) - print "HWID: %s, %s, %s" % (hwid, geom, bmp) - MakeBmp(hwid, geom, bmp, directory) + if re_fv.match(bmp): + print "HWID: %s, %s, %s (skipping old style bitmap)" % (hwid, geom, bmp) + else: + print "HWID: %s, %s, %s" % (hwid, geom, bmp) + MakeBmp(hwid, geom, bmp, directory) def main(): directory = os.path.abspath(sys.argv[1]) |