Risk: Required
Visibility: Minimal
Second pass on clean up.
I tested all test to make sure they at least run correctly, adding a few control
file stubs here and there.
Most of the fixes are import os fixes along with a few incorrect references
Signed-off-by: Scott Zawalski <scottz@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1607 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/kernel.py b/client/bin/kernel.py
index bc4397c..fca8f7e 100755
--- a/client/bin/kernel.py
+++ b/client/bin/kernel.py
@@ -86,7 +86,7 @@
self.build_target = 'bzImage'
self.build_image = None
- arch = get_current_kernel_arch()
+ arch = autotest_utils.get_current_kernel_arch()
if arch == 's390' or arch == 's390x':
self.build_target = 'image'
elif arch == 'ia64':
@@ -177,7 +177,7 @@
# FIXME: this isn't unique. Append something to it
# like wget does if it's not there?
print "get_file %s %s %s %s" % (patch, dest, self.src_dir, basename(patch))
- get_file(patch, dest)
+ utils.get_file(patch, dest)
# probably safer to use the command, not python library
md5sum = utils.system_output('md5sum ' + dest).split()[0]
local_patches.append((patch, dest, md5sum))
@@ -218,7 +218,7 @@
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))
- get_file(base_tree, tarball)
+ utils.get_file(base_tree, tarball)
print 'Extracting kernel tarball:', tarball, '...'
autotest_utils.extract_tarball_to_dir(tarball,
self.build_dir)
@@ -558,7 +558,7 @@
# If no 'target_arch' given assume native compilation
if target_arch == None:
- target_arch = get_current_kernel_arch()
+ target_arch = autotest_utils.get_current_kernel_arch()
if target_arch == 'ppc64':
if self.build_target == 'bzImage':
self.build_target = 'vmlinux'