scripts: call devserver/payload generators from chroot & delete moved scripts

bin/cros_image_to_target.py

Index: bin/cros_image_to_target.py
diff --git a/bin/cros_image_to_target.py b/bin/cros_image_to_target.py
index 0aa0d51cea4a579b98bcaf1cac448a666bf39415..6f1209b1e487a29de62c99594fd85a339fe6a9cc 100755
--- a/bin/cros_image_to_target.py
+++ b/bin/cros_image_to_target.py
@@ -206,7 +206,7 @@ class CrosEnv(object):
       self.Info('Using cached update image %s' % dst)
       return True
 
-    if not self.cmd.Run(self.CrosUtilsPath('cros_generate_update_payload'),
+    if not self.cmd.Run(self.ChrootPath('/usr/bin/cros_generate_update_payload'),

[sjg, 2011/03/01 05:04:51]

Is /usr/bin not in the path already?

[Paul Stewart, 2011/03/01 17:58:31]

It's not in the path if run outside the chroot.

                         '--image=%s' % src, '--output=%s' % dst,
                         '--patch_kernel'):
       self.Error('generate_payload failed')
@@ -221,8 +221,8 @@ class CrosEnv(object):
       self.Info('Using cached stateful %s' % dst_file)
       return True
 
-    return self.cmd.Run(self.CrosUtilsPath(
-        'cros_generate_stateful_update_payload'),
+    return self.cmd.Run(
+        self.ChrootPath('/usr/bin/cros_generate_stateful_update_payload'),

[sjg, 2011/03/01 05:04:51]

Same comment

[Paul Stewart, 2011/03/01 17:58:31]

Same response.

         '--image=%s' % src, '--output=%s' % dst_dir)
 
   def GetSize(self, filename):
@@ -343,7 +343,7 @@ class CrosEnv(object):
       return False
 
     self.Info('Update complete - running update script on client')
-    self.ssh_cmd.Copy(self.CrosUtilsPath('../platform/dev/stateful_update'),
+    self.ssh_cmd.Copy(self.ChrootPath('/usr/bin/stateful_update'),
                       '/tmp')
     if not self.ssh_cmd.Run('/tmp/stateful_update', url_base,
                             remote_tunnel=(port, port)):