Don't modify fv old-style bitmaps

scripts/newbitmaps/make_bmp_from_components.py

 #!/usr/bin/python2.6
 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Call on a directory with components_XXX_XXX files, to create
 # bitmaps with the appropriate names and contents.
 
 import sys
 import glob
@@ skipping 31 matching lines @@
   os.system("pushd %s >/dev/null; bmpblk_utility -c %s %s; popd >/dev/null" % (
             imagedir, newyamlfile, outputbmp))
   os.system("rm -rf %s" % tmpdir)
 
 def ProcessDir(directory):
   """ Find all the components file in this dir. """
   # Regex to find the values we want.
   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_*"))
   for file in files:
     # Scan for the values.
     f = open(file, "r")
     bmp = None
     hwid = None
     geom = None
     for line in f.readlines():
       m = re_bmp.search(line)
       if m:
         bmp = m.group('bmp')
 
       m = re_hwid.search(line)
       if m:
         hwid = m.group('hwid')
 
       m = re_geom.search(line)
       if m:
         geom = m.group('geom')
     f.close()
     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:

[Jay Kim, 2011/03/06 23:49:56]

Adding a condition to check if it is old style bitmap to execute MakeBmp only
for new bitmap.

+      print "HWID: %s, %s, %s" % (hwid, geom, bmp)
+      MakeBmp(hwid, geom, bmp, directory)
 
 def main():
   directory = os.path.abspath(sys.argv[1])
   print "Generating HWID bmp based on %s" % directory
   ProcessDir(directory)
 
 if __name__ == '__main__':
   main()