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

bin/cros_image_to_target.py

 #!/usr/bin/python
 #
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Create and copy update image to target host.
 
 auto-update and devserver change out from beneath us often enough
 that despite having to duplicate a litte code, it seems that the
@@ skipping 188 matching lines @@
     return (os.path.exists(dst) and
             os.path.getmtime(dst) >= os.path.getmtime(src))
 
   def GenerateUpdatePayload(self, src, dst):
     """Generate an update image from a build-image output file."""
 
     if self.GetCached(src, dst):
       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')
       return False
 
     return True
 
   def BuildStateful(self, src, dst_dir, dst_file):
     """Create a stateful partition update image."""
 
     if self.GetCached(src, dst_file):
       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):
     return os.path.getsize(filename)
 
   def GetHash(self, filename):
     return self.cmd.RunPipe([['openssl', 'sha1', '-binary'],
                              ['openssl', 'base64']],
                             infile=filename,
                             capture=True, oneline=True)
@@ skipping 100 matching lines @@
     # this will make the client read the files we have set up
     self.ssh_cmd.Run('/usr/bin/update_engine_client', '--update',
                      '--omaha_url', update_url, remote_tunnel=(port, port),
                      outfile=update_log)
 
     if self.GetUpdateStatus() != 'UPDATE_STATUS_UPDATED_NEED_REBOOT':
       self.Error('Client update failed')
       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)):
       self.Error('Client stateful update failed')
       return False
 
     self.Info('Rebooting client')
     if not self.ClientReboot():
       self.Error('Client may not have successfully rebooted...')
       return False
@@ skipping 358 matching lines @@
 
   if child:
     os.kill(child, 15)
 
   cros_env.Info('Server exiting with status %d' % exit_status)
   sys.exit(exit_status)
 
 
 if __name__ == '__main__':
   main(sys.argv)