OLD | NEW |
1 import os, shutil, copy, pickle, re, glob, time, logging | 1 import os, shutil, copy, pickle, re, glob, time, logging |
2 from autotest_lib.client.bin import kernel_config, os_dep, kernelexpand, test | 2 from autotest_lib.client.bin import kernel_config, os_dep, kernelexpand, test |
3 from autotest_lib.client.bin import utils | 3 from autotest_lib.client.bin import utils |
4 from autotest_lib.client.common_lib import log, error, packages | 4 from autotest_lib.client.common_lib import log, error, packages |
5 | 5 |
6 | 6 |
7 def tee_output_logdir_mark(fn): | 7 def tee_output_logdir_mark(fn): |
8 def tee_logdir_mark_wrapper(self, *args, **dargs): | 8 def tee_logdir_mark_wrapper(self, *args, **dargs): |
9 mark = self.__class__.__name__ + "." + fn.__name__ | 9 mark = self.__class__.__name__ + "." + fn.__name__ |
10 logging.info("--- START %s ---", mark) | 10 logging.info("--- START %s ---", mark) |
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 # otherwise, extract tarball | 325 # otherwise, extract tarball |
326 else: | 326 else: |
327 os.chdir(os.path.dirname(self.src_dir)) | 327 os.chdir(os.path.dirname(self.src_dir)) |
328 # Figure out local destination for tarball | 328 # Figure out local destination for tarball |
329 tarball = os.path.join(self.src_dir, os.path.basename(base_tree.spli
t(';')[0])) | 329 tarball = os.path.join(self.src_dir, os.path.basename(base_tree.spli
t(';')[0])) |
330 utils.get_file(base_tree, tarball) | 330 utils.get_file(base_tree, tarball) |
331 print 'Extracting kernel tarball:', tarball, '...' | 331 print 'Extracting kernel tarball:', tarball, '...' |
332 utils.extract_tarball_to_dir(tarball, self.build_dir) | 332 utils.extract_tarball_to_dir(tarball, self.build_dir) |
333 | 333 |
334 | 334 |
335 def extraversion(self, tag, append=1): | 335 def extraversion(self, tag, append=True): |
336 os.chdir(self.build_dir) | 336 os.chdir(self.build_dir) |
337 extraversion_sub = r's/^EXTRAVERSION =\s*\(.*\)/EXTRAVERSION = ' | 337 extraversion_sub = r's/^CONFIG_LOCALVERSION=\s*"\(.*\)"/CONFIG_LOCALVERS
ION=' |
| 338 cfg = self.build_dir + '/.config' |
338 if append: | 339 if append: |
339 p = extraversion_sub + '\\1-%s/' % tag | 340 p = extraversion_sub + '"\\1-%s"/' % tag |
340 else: | 341 else: |
341 p = extraversion_sub + '-%s/' % tag | 342 p = extraversion_sub + '"-%s"/' % tag |
342 utils.system('mv Makefile Makefile.old') | 343 utils.system('mv %s %s.old' % (cfg, cfg)) |
343 utils.system('sed "%s" < Makefile.old > Makefile' % p) | 344 utils.system("sed '%s' < %s.old > %s" % (p, cfg, cfg)) |
| 345 self.config(make='oldconfig') |
344 | 346 |
345 | 347 |
346 @log.record | 348 @log.record |
347 @tee_output_logdir_mark | 349 @tee_output_logdir_mark |
348 def build(self, make_opts = '', logfile = '', extraversion='autotest'): | 350 def build(self, make_opts = '', logfile = '', extraversion='autotest'): |
349 """build the kernel | 351 """build the kernel |
350 | 352 |
351 make_opts | 353 make_opts |
352 additional options to make, if any | 354 additional options to make, if any |
353 """ | 355 """ |
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
866 # kernel from that specific path. | 868 # kernel from that specific path. |
867 job.pkgmgr.fetch_pkg(rpm_name, os.path.join(job.pkgdir, rpm_name
), | 869 job.pkgmgr.fetch_pkg(rpm_name, os.path.join(job.pkgdir, rpm_name
), |
868 repo_url=os.path.dirname(kernel_path)) | 870 repo_url=os.path.dirname(kernel_path)) |
869 | 871 |
870 rpm_paths.append(os.path.join(job.pkgdir, rpm_name)) | 872 rpm_paths.append(os.path.join(job.pkgdir, rpm_name)) |
871 return rpm_kernel_vendor(job, rpm_paths, subdir) | 873 return rpm_kernel_vendor(job, rpm_paths, subdir) |
872 else: | 874 else: |
873 if len(kernel_paths) > 1: | 875 if len(kernel_paths) > 1: |
874 raise error.TestError("don't know what to do with more than one non-
rpm kernel file") | 876 raise error.TestError("don't know what to do with more than one non-
rpm kernel file") |
875 return kernel(job,kernel_paths[0], subdir, tmp_dir, build_dir, leave) | 877 return kernel(job,kernel_paths[0], subdir, tmp_dir, build_dir, leave) |
OLD | NEW |