Add vm flag to the devserver to not patch the kernel.

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 13 matching lines @@
     factory_config: Path to the factory config file if handling factory
       requests.
     use_test_image: Use chromiumos_test_image.bin rather than the standard.
     static_url_base: base URL, other than devserver, for update images.
     client_prefix: The prefix for the update engine client.
     forced_image: Path to an image to use for all updates.
   """
 
   def __init__(self, serve_only=None, test_image=False, urlbase=None,
                factory_config_path=None, client_prefix=None, forced_image=None,
-               use_cached=False, port=8080, src_image='', *args, **kwargs):
+               use_cached=False, port=8080, src_image='', vm=False, *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.use_cached = use_cached
     self.src_image = src_image
+    self.vm = vm
 
   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):
     """Returns the default board id stored in .default_board."""
     board_file = '%s/.default_board' % (self.scripts_dir)
     try:
@@ skipping 153 matching lines @@
   def GenerateUpdateFile(self, image_path):
     """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.
     """
     image_dir = os.path.dirname(image_path)
     update_path = os.path.join(image_dir, 'update.gz')
+    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 = ''
+
     mkupdate_command = (
         '%s/cros_generate_update_payload --image="%s" --output="%s" '
-        '--patch_kernel --noold_style --src_image="%s"' % (
-                                          self.scripts_dir, image_path,
-                                          update_path, self.src_image))
+        '%s --noold_style --src_image="%s"' % (
+            self.scripts_dir, image_path, update_path, patch_kernel_flag,
+            self.src_image))
     _LogMessage(mkupdate_command)
     if os.system(mkupdate_command) != 0:
       _LogMessage('Failed to create base update file')
       return None
 
     return update_path
 
   def GenerateStatefulFile(self, image_path):
     """Generates a stateful update gz given a full path to an image.
 
@@ skipping 315 matching lines @@
         is_delta_format = self._IsDeltaFormatFile(filename)
         if label:
           url = '%s/%s/update.gz' % (static_urlbase, label)
         else:
           url = '%s/update.gz' % static_urlbase
 
         _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()