Add ability to pass a private_key when generating a payload.

autoupdate.py

 # Copyright (c) 2009-2010 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.
 
 from buildutil import BuildObject
 from xml.dom import minidom
 
 import cherrypy
 import os
 import shutil
@@ skipping 45 matching lines @@
     vm: Set for VM images (doesn't patch kernel)
     board: board for the image.  Needed for pre-generating of updates.
     copy_to_static_root: Copies images generated from the cache to
       ~/static.
   """
 
   def __init__(self, serve_only=None, test_image=False, urlbase=None,
                factory_config_path=None, client_prefix=None,
                forced_image=None, forced_payload=None,
                port=8080, proxy_port=None, src_image='', vm=False, board=None,
-               copy_to_static_root=True,
+               copy_to_static_root=True, private_key=None,
                *args, **kwargs):
     super(Autoupdate, self).__init__(*args, **kwargs)
     self.serve_only = serve_only
     self.factory_config = factory_config_path
     self.use_test_image = test_image
     if urlbase:
       self.urlbase = urlbase
     else:
       self.urlbase = None
 
     self.client_prefix = client_prefix
     self.forced_image = forced_image
     self.forced_payload = forced_payload
     self.src_image = src_image
     self.proxy_port = proxy_port
     self.vm = vm
     self.board = board
     self.copy_to_static_root = copy_to_static_root
+    self.private_key = private_key
 
     # Path to pre-generated file.
     self.pregenerated_path = None
 
   def _GetSecondsSinceMidnight(self):
     """Returns the seconds since midnight as a decimal value."""
     now = time.localtime()
     return now[3] * 3600 + now[4] * 60 + now[5]
 
   def _GetDefaultBoardID(self):
@@ skipping 137 matching lines @@
 
   def GenerateUpdateFile(self, src_image, image_path, output_dir):
     """Generates an update gz given a full path to an image.
 
     Args:
       image_path: Full path to image.
     Returns:
       Path to created update_payload or None on error.
     """
     update_path = os.path.join(output_dir, UPDATE_FILE)
-    patch_kernel_flag = '--patch_kernel'
     _LogMessage('Generating update image %s' % update_path)
 
-    # Don't patch the kernel for vm images as they don't need the patch.
-    if self.vm:
-      patch_kernel_flag = ''
+    update_command = [
+        '%s/cros_generate_update_payload' % self.scripts_dir,
+        '--image="%s"' % image_path,
+        '--output="%s"' % update_path,
+        '--noold_style',
+    ]
 
-    mkupdate_command = (
-        '%s/cros_generate_update_payload --image="%s" --output="%s" '
-        '%s --noold_style --src_image="%s"' % (
-            self.scripts_dir, image_path, update_path, patch_kernel_flag,
-            src_image))
-    _LogMessage(mkupdate_command)
-    if os.system(mkupdate_command) != 0:
+    if src_image: update_command.append('--src_image="%s"' % src_image)
+    if not self.vm: update_command.append('--patch_kernel')
+    if self.private_key: update_command.append('--private_key="%s"' %
+                                               self.private_key)
+
+    update_string = ' '.join(update_command)
+    _LogMessage('Running ' + update_string)
+    if os.system(update_string) != 0:
       _LogMessage('Failed to create update payload')
       return None
 
     return UPDATE_FILE
 
   def GenerateStatefulFile(self, image_path, output_dir):
     """Generates a stateful update payload given a full path to an image.
 
     Args:
       image_path: Full path to image.
@@ skipping 391 matching lines @@
         is_delta_format = self._IsDeltaFormatFile(filename)
         if label:
           url = '%s/%s/%s' % (static_urlbase, label, payload_path)
         else:
           url = '%s/%s' % (static_urlbase, payload_path)
 
         _LogMessage('Responding to client to use url %s to get image.' % url)
         return self.GetUpdatePayload(hash, sha256, size, url, is_delta_format)
       else:
         return self.GetNoUpdatePayload()