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 85475b0458ebe79dcd791fccc3343e5c85b62464..b5b6393438b7e934282b34dbdab8ec2fb59a65ae 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('cros_generate_update_payload',

[Paul Stewart, 2011/02/24 18:49:39]

These changes force the user to run from within the chroot, whereas the
CrosUtilsPath indirection was meant to prevent that from necessarily being the
case.  Perhaps other changes have broken cros_image_to_target outside the chroot
though...

                         '--image=%s' % src, '--output=%s' % dst,
                         '--patch_kernel'):
       self.Error('generate_payload failed')
@@ -221,8 +221,7 @@ 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('cros_generate_stateful_update_payload',
         '--image=%s' % src, '--output=%s' % dst_dir)
 
   def GetSize(self, filename):
@@ -343,7 +342,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('/usr/bin/stateful_update',
                       '/tmp')
     if not self.ssh_cmd.Run('/tmp/stateful_update', url_base,
                             remote_tunnel=(port, port)):