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=True): | 335 def extraversion(self, tag, append=1): |
336 os.chdir(self.build_dir) | 336 os.chdir(self.build_dir) |
337 extraversion_sub = r's/^CONFIG_LOCALVERSION=\s*"\(.*\)"/CONFIG_LOCALVERS
ION=' | 337 extraversion_sub = r's/^EXTRAVERSION =\s*\(.*\)/EXTRAVERSION = ' |
338 cfg = self.build_dir + '/.config' | |
339 if append: | 338 if append: |
340 p = extraversion_sub + '"\\1-%s"/' % tag | 339 p = extraversion_sub + '\\1-%s/' % tag |
341 else: | 340 else: |
342 p = extraversion_sub + '"-%s"/' % tag | 341 p = extraversion_sub + '-%s/' % tag |
343 utils.system('mv %s %s.old' % (cfg, cfg)) | 342 utils.system('mv Makefile Makefile.old') |
344 utils.system("sed '%s' < %s.old > %s" % (p, cfg, cfg)) | 343 utils.system('sed "%s" < Makefile.old > Makefile' % p) |
345 self.config(make='oldconfig') | |
346 | 344 |
347 | 345 |
348 @log.record | 346 @log.record |
349 @tee_output_logdir_mark | 347 @tee_output_logdir_mark |
350 def build(self, make_opts = '', logfile = '', extraversion='autotest'): | 348 def build(self, make_opts = '', logfile = '', extraversion='autotest'): |
351 """build the kernel | 349 """build the kernel |
352 | 350 |
353 make_opts | 351 make_opts |
354 additional options to make, if any | 352 additional options to make, if any |
355 """ | 353 """ |
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
868 # kernel from that specific path. | 866 # kernel from that specific path. |
869 job.pkgmgr.fetch_pkg(rpm_name, os.path.join(job.pkgdir, rpm_name
), | 867 job.pkgmgr.fetch_pkg(rpm_name, os.path.join(job.pkgdir, rpm_name
), |
870 repo_url=os.path.dirname(kernel_path)) | 868 repo_url=os.path.dirname(kernel_path)) |
871 | 869 |
872 rpm_paths.append(os.path.join(job.pkgdir, rpm_name)) | 870 rpm_paths.append(os.path.join(job.pkgdir, rpm_name)) |
873 return rpm_kernel_vendor(job, rpm_paths, subdir) | 871 return rpm_kernel_vendor(job, rpm_paths, subdir) |
874 else: | 872 else: |
875 if len(kernel_paths) > 1: | 873 if len(kernel_paths) > 1: |
876 raise error.TestError("don't know what to do with more than one non-
rpm kernel file") | 874 raise error.TestError("don't know what to do with more than one non-
rpm kernel file") |
877 return kernel(job,kernel_paths[0], subdir, tmp_dir, build_dir, leave) | 875 return kernel(job,kernel_paths[0], subdir, tmp_dir, build_dir, leave) |
OLD | NEW |