Merge remote branch 'cros/upstream' into master

client/bin/kernel.py

 import os, shutil, copy, pickle, re, glob, time, logging
 from autotest_lib.client.bin import kernel_config, os_dep, kernelexpand, test
 from autotest_lib.client.bin import utils
 from autotest_lib.client.common_lib import log, error, packages
 
 
 def tee_output_logdir_mark(fn):
     def tee_logdir_mark_wrapper(self, *args, **dargs):
         mark = self.__class__.__name__ + "." + fn.__name__
         logging.info("--- START %s ---", mark)
@@ skipping 314 matching lines @@
         # otherwise, extract tarball
         else:
             os.chdir(os.path.dirname(self.src_dir))
             # Figure out local destination for tarball
             tarball = os.path.join(self.src_dir, os.path.basename(base_tree.split(';')[0]))
             utils.get_file(base_tree, tarball)
             print 'Extracting kernel tarball:', tarball, '...'
             utils.extract_tarball_to_dir(tarball, self.build_dir)
 
 
-    def extraversion(self, tag, append=1):
+    def extraversion(self, tag, append=True):
         os.chdir(self.build_dir)
-        extraversion_sub = r's/^EXTRAVERSION =\s*\(.*\)/EXTRAVERSION = '
+        extraversion_sub = r's/^CONFIG_LOCALVERSION=\s*"\(.*\)"/CONFIG_LOCALVERSION='
+        cfg = self.build_dir + '/.config'
         if append:
-            p = extraversion_sub + '\\1-%s/' % tag
+            p = extraversion_sub + '"\\1-%s"/' % tag
         else:
-            p = extraversion_sub + '-%s/' % tag
-        utils.system('mv Makefile Makefile.old')
-        utils.system('sed "%s" < Makefile.old > Makefile' % p)
+            p = extraversion_sub + '"-%s"/' % tag
+        utils.system('mv %s %s.old' % (cfg, cfg))
+        utils.system("sed '%s' < %s.old > %s" % (p, cfg, cfg))
+        self.config(make='oldconfig')
 
 
     @log.record
     @tee_output_logdir_mark
     def build(self, make_opts = '', logfile = '', extraversion='autotest'):
         """build the kernel
 
         make_opts
                 additional options to make, if any
         """
@@ skipping 512 matching lines @@
                 # kernel from that specific path.
                 job.pkgmgr.fetch_pkg(rpm_name, os.path.join(job.pkgdir, rpm_name),
                                      repo_url=os.path.dirname(kernel_path))
 
                 rpm_paths.append(os.path.join(job.pkgdir, rpm_name))
         return rpm_kernel_vendor(job, rpm_paths, subdir)
     else:
         if len(kernel_paths) > 1:
             raise error.TestError("don't know what to do with more than one non-rpm kernel file")
         return kernel(job,kernel_paths[0], subdir, tmp_dir, build_dir, leave)