commit 0af7a9192676791ed0ad08cc682be2d481b22fc0
author Ryan Cui <rcui@chromium.org> Mon Jun 18 18:00:47 2012 -0700
committer Gerrit <chrome-bot@google.com> Wed Jun 27 17:40:38 2012 -0700
tree 0388a2c52329f5d6dcbaefa4e9fe6e8615149a2f
parent 1a83a71d09a5b28a3e4fbb2955512a0473e21f51

Add strip_package script

Just calls into the devserver code.  Used by cbuildbot to strip the
Chrome package.

BUG=chromium-os:31611
TEST=Ran through remote trybot

Change-Id: I4905eed47f8c7d7c95a0d824c860707cabd4da97
Reviewed-on: https://gerrit.chromium.org/gerrit/25592
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Ryan Cui <rcui@chromium.org>
Commit-Ready: Ryan Cui <rcui@chromium.org>

builder.py

diff --git a/builder.py b/builder.py
index df93d20..7b51b60 100644
--- a/builder.py
+++ b/builder.py
@@ -86,18 +86,21 @@
   xpak.tbz2(out_path).recompose_mem(x)
 
 
-def _UpdateGmergeBinhost(board, pkg, deep):
+def UpdateGmergeBinhost(board, pkg, deep):
   """Add pkg to our gmerge-specific binhost.
 
   Files matching DEFAULT_INSTALL_MASK are not included in the tarball.
   """
 
   root = '/build/%s/' % board
-  pkgdir = '/build/%s/packages' % board
-  gmerge_pkgdir = '/build/%s/gmerge-packages' % board
+  gmerge_pkgdir = os.path.join(root, 'gmerge-packages')
+  stripped_link = os.path.join(root, 'stripped-packages')
 
   # Create gmerge pkgdir and give us permission to write to it.
   subprocess.check_call(['sudo', 'mkdir', '-p', gmerge_pkgdir])
+  subprocess.check_call(['sudo', 'ln', '-snf', os.path.basename(gmerge_pkgdir),
+                         stripped_link])
+
   username = os.environ['PORTAGE_USERNAME']
   subprocess.check_call(['sudo', 'chown', username, gmerge_pkgdir])
 
@@ -214,7 +217,7 @@
 
       # Sync gmerge binhost.
       deep = additional_args.get('deep')
-      if not _UpdateGmergeBinhost(board, pkg, deep):
+      if not UpdateGmergeBinhost(board, pkg, deep):
         return self.SetError('Package %s is not installed' % pkg)
 
       return 'Success\n'