Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 1 | #!/usr/bin/python |
| 2 | |
Mike Frysinger | 110750a | 2012-03-26 14:19:20 -0400 | [diff] [blame] | 3 | # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 4 | # Use of this source code is governed by a BSD-style license that can be |
| 5 | # found in the LICENSE file. |
| 6 | |
| 7 | """This module uprevs a given package's ebuild to the next revision.""" |
| 8 | |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 9 | import optparse |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 10 | import os |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 11 | import sys |
| 12 | |
Mike Frysinger | 6cb624a | 2012-05-24 18:17:38 -0400 | [diff] [blame] | 13 | from chromite.buildbot import constants |
David James | 6600946 | 2012-03-25 10:08:38 -0700 | [diff] [blame] | 14 | from chromite.buildbot import portage_utilities |
Chris Sosa | c13bba5 | 2011-05-24 15:14:09 -0700 | [diff] [blame] | 15 | from chromite.lib import cros_build_lib |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 16 | from chromite.lib import git |
Mike Frysinger | fddaeb5 | 2012-11-20 11:17:31 -0500 | [diff] [blame] | 17 | from chromite.lib import osutils |
David James | 6450a0a | 2012-12-04 07:59:53 -0800 | [diff] [blame] | 18 | from chromite.lib import parallel |
Chris Sosa | c13bba5 | 2011-05-24 15:14:09 -0700 | [diff] [blame] | 19 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 20 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 21 | # Dictionary of valid commands with usage information. |
| 22 | COMMAND_DICTIONARY = { |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 23 | 'commit': |
| 24 | 'Marks given ebuilds as stable locally', |
| 25 | 'push': |
| 26 | 'Pushes previous marking of ebuilds to remote repo', |
| 27 | } |
| 28 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 29 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 30 | # ======================= Global Helper Functions ======================== |
| 31 | |
| 32 | |
David James | cc09c9b | 2012-01-26 22:10:13 -0800 | [diff] [blame] | 33 | def CleanStalePackages(boards, package_atoms): |
Chris Sosa | bf15387 | 2011-04-28 14:21:09 -0700 | [diff] [blame] | 34 | """Cleans up stale package info from a previous build. |
| 35 | Args: |
David James | cc09c9b | 2012-01-26 22:10:13 -0800 | [diff] [blame] | 36 | boards: Boards to clean the packages from. |
Chris Sosa | bf15387 | 2011-04-28 14:21:09 -0700 | [diff] [blame] | 37 | package_atoms: The actual package atom to unmerge. |
| 38 | """ |
| 39 | if package_atoms: |
Chris Sosa | c13bba5 | 2011-05-24 15:14:09 -0700 | [diff] [blame] | 40 | cros_build_lib.Info('Cleaning up stale packages %s.' % package_atoms) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 41 | |
Mike Frysinger | b7ab9b8 | 2012-04-04 16:22:43 -0400 | [diff] [blame] | 42 | # First unmerge all the packages for a board, then eclean it. |
| 43 | # We need these two steps to run in order (unmerge/eclean), |
| 44 | # but we can let all the boards run in parallel. |
| 45 | def _CleanStalePackages(board): |
| 46 | if board: |
| 47 | suffix = '-' + board |
| 48 | runcmd = cros_build_lib.RunCommand |
| 49 | else: |
| 50 | suffix = '' |
| 51 | runcmd = cros_build_lib.SudoRunCommand |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 52 | |
Mike Frysinger | b7ab9b8 | 2012-04-04 16:22:43 -0400 | [diff] [blame] | 53 | if package_atoms: |
Mike Frysinger | 0a647fc | 2012-08-06 14:36:05 -0400 | [diff] [blame] | 54 | runcmd(['emerge' + suffix, '-q', '--unmerge'] + package_atoms, |
| 55 | extra_env={'CLEAN_DELAY': '0'}) |
Mike Frysinger | b7ab9b8 | 2012-04-04 16:22:43 -0400 | [diff] [blame] | 56 | runcmd(['eclean' + suffix, '-d', 'packages'], |
| 57 | redirect_stdout=True, redirect_stderr=True) |
| 58 | |
| 59 | tasks = [] |
David James | cc09c9b | 2012-01-26 22:10:13 -0800 | [diff] [blame] | 60 | for board in boards: |
Mike Frysinger | b7ab9b8 | 2012-04-04 16:22:43 -0400 | [diff] [blame] | 61 | tasks.append([board]) |
| 62 | tasks.append([None]) |
| 63 | |
David James | 6450a0a | 2012-12-04 07:59:53 -0800 | [diff] [blame] | 64 | parallel.RunTasksInProcessPool(_CleanStalePackages, tasks) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 65 | |
| 66 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 67 | # TODO(build): This code needs to be gutted and rebased to cros_build_lib. |
| 68 | def _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 69 | """Returns true if there are local commits.""" |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 70 | current_branch = git.GetCurrentBranch(cwd) |
Brian Harring | 609dc4e | 2012-05-07 02:17:44 -0700 | [diff] [blame] | 71 | |
| 72 | if current_branch != stable_branch: |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 73 | return False |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 74 | output = git.RunGit( |
Brian Harring | 609dc4e | 2012-05-07 02:17:44 -0700 | [diff] [blame] | 75 | cwd, ['rev-parse', 'HEAD', tracking_branch]).output.split() |
Brian Harring | 5b86b5e | 2012-05-25 18:27:40 -0700 | [diff] [blame] | 76 | return output[0] != output[1] |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 77 | |
| 78 | |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 79 | def _CheckSaneArguments(command, options): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 80 | """Checks to make sure the flags are sane. Dies if arguments are not sane.""" |
| 81 | if not command in COMMAND_DICTIONARY.keys(): |
| 82 | _PrintUsageAndDie('%s is not a valid command' % command) |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 83 | if not options.packages and command == 'commit' and not options.all: |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 84 | _PrintUsageAndDie('Please specify at least one package') |
Mike Frysinger | 8fd67dc | 2012-12-03 23:51:18 -0500 | [diff] [blame] | 85 | if options.boards: |
| 86 | cros_build_lib.AssertInsideChroot() |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 87 | if not os.path.isdir(options.srcroot): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 88 | _PrintUsageAndDie('srcroot is not a valid path') |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 89 | options.srcroot = os.path.abspath(options.srcroot) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 90 | |
| 91 | |
| 92 | def _PrintUsageAndDie(error_message=''): |
| 93 | """Prints optional error_message the usage and returns an error exit code.""" |
| 94 | command_usage = 'Commands: \n' |
| 95 | # Add keys and usage information from dictionary. |
| 96 | commands = sorted(COMMAND_DICTIONARY.keys()) |
| 97 | for command in commands: |
| 98 | command_usage += ' %s: %s\n' % (command, COMMAND_DICTIONARY[command]) |
| 99 | commands_str = '|'.join(commands) |
Chris Sosa | c13bba5 | 2011-05-24 15:14:09 -0700 | [diff] [blame] | 100 | cros_build_lib.Warning('Usage: %s FLAGS [%s]\n\n%s' % ( |
| 101 | sys.argv[0], commands_str, command_usage)) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 102 | if error_message: |
Chris Sosa | c13bba5 | 2011-05-24 15:14:09 -0700 | [diff] [blame] | 103 | cros_build_lib.Die(error_message) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 104 | else: |
| 105 | sys.exit(1) |
| 106 | |
| 107 | |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 108 | # ======================= End Global Helper Functions ======================== |
| 109 | |
| 110 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 111 | def PushChange(stable_branch, tracking_branch, dryrun, cwd): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 112 | """Pushes commits in the stable_branch to the remote git repository. |
| 113 | |
David James | ee2da62 | 2012-02-23 09:32:16 -0800 | [diff] [blame] | 114 | Pushes local commits from calls to CommitChange to the remote git |
David James | 6600946 | 2012-03-25 10:08:38 -0700 | [diff] [blame] | 115 | repository specified by current working directory. If changes are |
| 116 | found to commit, they will be merged to the merge branch and pushed. |
| 117 | In that case, the local repository will be left on the merge branch. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 118 | |
| 119 | Args: |
| 120 | stable_branch: The local branch with commits we want to push. |
| 121 | tracking_branch: The tracking branch of the local branch. |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 122 | dryrun: Use git push --dryrun to emulate a push. |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 123 | cwd: The directory to run commands in. |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 124 | Raises: |
| 125 | OSError: Error occurred while pushing. |
| 126 | """ |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 127 | if not _DoWeHaveLocalCommits(stable_branch, tracking_branch, cwd): |
Brian Harring | 609dc4e | 2012-05-07 02:17:44 -0700 | [diff] [blame] | 128 | cros_build_lib.Info('No work found to push in %s. Exiting', cwd) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 129 | return |
| 130 | |
David James | 6600946 | 2012-03-25 10:08:38 -0700 | [diff] [blame] | 131 | # For the commit queue, our local branch may contain commits that were |
| 132 | # just tested and pushed during the CommitQueueCompletion stage. Sync |
| 133 | # and rebase our local branch on top of the remote commits. |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 134 | remote, push_branch = git.GetTrackingBranch(cwd, for_push=True) |
| 135 | git.SyncPushBranch(cwd, remote, push_branch) |
David James | 6600946 | 2012-03-25 10:08:38 -0700 | [diff] [blame] | 136 | |
| 137 | # Check whether any local changes remain after the sync. |
Brian Harring | 609dc4e | 2012-05-07 02:17:44 -0700 | [diff] [blame] | 138 | if not _DoWeHaveLocalCommits(stable_branch, push_branch, cwd): |
| 139 | cros_build_lib.Info('All changes already pushed for %s. Exiting', cwd) |
David James | 6600946 | 2012-03-25 10:08:38 -0700 | [diff] [blame] | 140 | return |
| 141 | |
Mike Frysinger | 7dafd0e | 2012-05-08 15:47:16 -0400 | [diff] [blame] | 142 | description = cros_build_lib.RunCommandCaptureOutput( |
Brian Harring | 609dc4e | 2012-05-07 02:17:44 -0700 | [diff] [blame] | 143 | ['git', 'log', '--format=format:%s%n%n%b', '%s..%s' % ( |
| 144 | push_branch, stable_branch)], cwd=cwd).output |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 145 | description = 'Marking set of ebuilds as stable\n\n%s' % description |
Brian Harring | 609dc4e | 2012-05-07 02:17:44 -0700 | [diff] [blame] | 146 | cros_build_lib.Info('For %s, using description %s', cwd, description) |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 147 | git.CreatePushBranch(constants.MERGE_BRANCH, cwd) |
| 148 | git.RunGit(cwd, ['merge', '--squash', stable_branch]) |
| 149 | git.RunGit(cwd, ['commit', '-m', description]) |
| 150 | git.RunGit(cwd, ['config', 'push.default', 'tracking']) |
| 151 | git.PushWithRetry(constants.MERGE_BRANCH, cwd, dryrun=dryrun) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 152 | |
| 153 | |
| 154 | class GitBranch(object): |
| 155 | """Wrapper class for a git branch.""" |
| 156 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 157 | def __init__(self, branch_name, tracking_branch, cwd): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 158 | """Sets up variables but does not create the branch.""" |
| 159 | self.branch_name = branch_name |
| 160 | self.tracking_branch = tracking_branch |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 161 | self.cwd = cwd |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 162 | |
| 163 | def CreateBranch(self): |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 164 | self.Checkout() |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 165 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 166 | def Checkout(self, branch=None): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 167 | """Function used to check out to another GitBranch.""" |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 168 | if not branch: |
| 169 | branch = self.branch_name |
| 170 | if branch == self.tracking_branch or self.Exists(branch): |
| 171 | git_cmd = ['git', 'checkout', '-f', branch] |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 172 | else: |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 173 | git_cmd = ['repo', 'start', branch, '.'] |
| 174 | cros_build_lib.RunCommandCaptureOutput(git_cmd, print_cmd=False, |
| 175 | cwd=self.cwd) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 176 | |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 177 | def Exists(self, branch=None): |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 178 | """Returns True if the branch exists.""" |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 179 | if not branch: |
| 180 | branch = self.branch_name |
Mike Frysinger | 7dafd0e | 2012-05-08 15:47:16 -0400 | [diff] [blame] | 181 | branches = cros_build_lib.RunCommandCaptureOutput(['git', 'branch'], |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 182 | print_cmd=False, |
| 183 | cwd=self.cwd).output |
| 184 | return branch in branches.split() |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 185 | |
| 186 | |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 187 | def main(_argv): |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 188 | parser = optparse.OptionParser('cros_mark_as_stable OPTIONS packages') |
| 189 | parser.add_option('--all', action='store_true', |
| 190 | help='Mark all packages as stable.') |
Mike Frysinger | 587bd56 | 2012-11-19 16:41:39 -0500 | [diff] [blame] | 191 | parser.add_option('-b', '--boards', default='', |
David James | cc09c9b | 2012-01-26 22:10:13 -0800 | [diff] [blame] | 192 | help='Colon-separated list of boards') |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 193 | parser.add_option('--drop_file', |
| 194 | help='File to list packages that were revved.') |
| 195 | parser.add_option('--dryrun', action='store_true', |
| 196 | help='Passes dry-run to git push if pushing a change.') |
| 197 | parser.add_option('-o', '--overlays', |
| 198 | help='Colon-separated list of overlays to modify.') |
| 199 | parser.add_option('-p', '--packages', |
| 200 | help='Colon separated list of packages to rev.') |
| 201 | parser.add_option('-r', '--srcroot', |
Mike Frysinger | fddaeb5 | 2012-11-20 11:17:31 -0500 | [diff] [blame] | 202 | default=os.path.join(constants.SOURCE_ROOT, 'src'), |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 203 | help='Path to root src directory.') |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 204 | parser.add_option('--verbose', action='store_true', |
| 205 | help='Prints out debug info.') |
| 206 | (options, args) = parser.parse_args() |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 207 | |
J. Richard Barnette | 2fa9fd6 | 2011-12-02 17:10:10 -0800 | [diff] [blame] | 208 | portage_utilities.EBuild.VERBOSE = options.verbose |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 209 | |
| 210 | if len(args) != 1: |
Ryan Cui | 05a31ba | 2011-05-31 17:47:37 -0700 | [diff] [blame] | 211 | _PrintUsageAndDie('Must specify a valid command [commit, push]') |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 212 | |
| 213 | command = args[0] |
| 214 | package_list = None |
| 215 | if options.packages: |
| 216 | package_list = options.packages.split(':') |
| 217 | |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 218 | _CheckSaneArguments(command, options) |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 219 | if options.overlays: |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 220 | overlays = {} |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 221 | for path in options.overlays.split(':'): |
Ryan Cui | 05a31ba | 2011-05-31 17:47:37 -0700 | [diff] [blame] | 222 | if not os.path.isdir(path): |
Chris Sosa | c13bba5 | 2011-05-24 15:14:09 -0700 | [diff] [blame] | 223 | cros_build_lib.Die('Cannot find overlay: %s' % path) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 224 | overlays[path] = [] |
| 225 | else: |
Chris Sosa | c13bba5 | 2011-05-24 15:14:09 -0700 | [diff] [blame] | 226 | cros_build_lib.Warning('Missing --overlays argument') |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 227 | overlays = { |
Chris Sosa | 62ad852 | 2011-03-08 17:46:17 -0800 | [diff] [blame] | 228 | '%s/private-overlays/chromeos-overlay' % options.srcroot: [], |
| 229 | '%s/third_party/chromiumos-overlay' % options.srcroot: [] |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 230 | } |
| 231 | |
| 232 | if command == 'commit': |
J. Richard Barnette | f6697cf | 2011-11-18 12:42:08 -0800 | [diff] [blame] | 233 | portage_utilities.BuildEBuildDictionary( |
J. Richard Barnette | d422f62 | 2011-11-17 09:39:46 -0800 | [diff] [blame] | 234 | overlays, options.all, package_list) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 235 | |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 236 | manifest = git.ManifestCheckout.Cached(options.srcroot) |
Ryan Cui | 4656a3c | 2011-05-24 12:30:30 -0700 | [diff] [blame] | 237 | |
David James | a8457b5 | 2011-05-28 00:03:20 -0700 | [diff] [blame] | 238 | # Contains the array of packages we actually revved. |
| 239 | revved_packages = [] |
| 240 | new_package_atoms = [] |
| 241 | |
Mike Frysinger | b9bd2f8 | 2012-05-08 14:55:23 -0400 | [diff] [blame] | 242 | # Slight optimization hack: process the chromiumos overlay before any other |
| 243 | # cros-workon overlay first so we can do background cache generation in it. |
| 244 | # A perfect solution would walk all the overlays, figure out any dependencies |
| 245 | # between them (with layout.conf), and then process them in dependency order. |
| 246 | # However, this operation isn't slow enough to warrant that level of |
| 247 | # complexity, so we'll just special case the main overlay. |
| 248 | # |
| 249 | # Similarly, generate the cache in the portage-stable tree asap. We know |
| 250 | # we won't have any cros-workon packages in there, so generating the cache |
| 251 | # is the only thing it'll be doing. The chromiumos overlay instead might |
| 252 | # have revbumping to do before it can generate the cache. |
Mike Frysinger | 110750a | 2012-03-26 14:19:20 -0400 | [diff] [blame] | 253 | keys = overlays.keys() |
Mike Frysinger | b9bd2f8 | 2012-05-08 14:55:23 -0400 | [diff] [blame] | 254 | for overlay in ('/third_party/chromiumos-overlay', |
| 255 | '/third_party/portage-stable'): |
| 256 | for k in keys: |
| 257 | if k.endswith(overlay): |
| 258 | keys.remove(k) |
| 259 | keys.insert(0, k) |
| 260 | break |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 261 | |
Brian Harring | 9fdd23d | 2012-12-07 12:09:08 -0800 | [diff] [blame] | 262 | with parallel.BackgroundTaskRunner(portage_utilities.RegenCache) as queue: |
Mike Frysinger | 110750a | 2012-03-26 14:19:20 -0400 | [diff] [blame] | 263 | for overlay in keys: |
| 264 | ebuilds = overlays[overlay] |
| 265 | if not os.path.isdir(overlay): |
| 266 | cros_build_lib.Warning("Skipping %s" % overlay) |
| 267 | continue |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 268 | |
Brian Harring | e08e442 | 2012-05-30 12:40:50 -0700 | [diff] [blame] | 269 | # Note we intentionally work from the non push tracking branch; |
| 270 | # everything built thus far has been against it (meaning, http mirrors), |
| 271 | # thus we should honor that. During the actual push, the code switches |
| 272 | # to the correct urls, and does an appropriate rebasing. |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 273 | tracking_branch = git.GetTrackingBranchViaManifest( |
Brian Harring | e08e442 | 2012-05-30 12:40:50 -0700 | [diff] [blame] | 274 | overlay, manifest=manifest)[1] |
Brian Harring | 609dc4e | 2012-05-07 02:17:44 -0700 | [diff] [blame] | 275 | |
Mike Frysinger | 110750a | 2012-03-26 14:19:20 -0400 | [diff] [blame] | 276 | if command == 'push': |
| 277 | PushChange(constants.STABLE_EBUILD_BRANCH, tracking_branch, |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 278 | options.dryrun, cwd=overlay) |
Mike Frysinger | 303083d | 2012-07-16 14:57:24 -0400 | [diff] [blame] | 279 | elif command == 'commit': |
David James | 97d9587 | 2012-11-16 15:09:56 -0800 | [diff] [blame] | 280 | existing_branch = git.GetCurrentBranch(overlay) |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 281 | work_branch = GitBranch(constants.STABLE_EBUILD_BRANCH, tracking_branch, |
| 282 | cwd=overlay) |
Mike Frysinger | 110750a | 2012-03-26 14:19:20 -0400 | [diff] [blame] | 283 | work_branch.CreateBranch() |
| 284 | if not work_branch.Exists(): |
| 285 | cros_build_lib.Die('Unable to create stabilizing branch in %s' % |
| 286 | overlay) |
Ryan Cui | f0d57b4 | 2011-07-27 17:43:42 -0700 | [diff] [blame] | 287 | |
Mike Frysinger | 110750a | 2012-03-26 14:19:20 -0400 | [diff] [blame] | 288 | # In the case of uprevving overlays that have patches applied to them, |
| 289 | # include the patched changes in the stabilizing branch. |
| 290 | if existing_branch: |
Mike Frysinger | 7dafd0e | 2012-05-08 15:47:16 -0400 | [diff] [blame] | 291 | cros_build_lib.RunCommand(['git', 'rebase', existing_branch], |
Mike Frysinger | 2ebe373 | 2012-05-08 17:04:12 -0400 | [diff] [blame] | 292 | print_cmd=False, cwd=overlay) |
Mike Frysinger | 110750a | 2012-03-26 14:19:20 -0400 | [diff] [blame] | 293 | |
| 294 | for ebuild in ebuilds: |
David James | 1b36358 | 2012-12-17 11:53:11 -0800 | [diff] [blame] | 295 | if options.verbose: |
| 296 | cros_build_lib.Info('Working on %s', ebuild.package) |
Mike Frysinger | 110750a | 2012-03-26 14:19:20 -0400 | [diff] [blame] | 297 | try: |
Mike Frysinger | 110750a | 2012-03-26 14:19:20 -0400 | [diff] [blame] | 298 | new_package = ebuild.RevWorkOnEBuild(options.srcroot) |
| 299 | if new_package: |
| 300 | revved_packages.append(ebuild.package) |
| 301 | new_package_atoms.append('=%s' % new_package) |
| 302 | except (OSError, IOError): |
| 303 | cros_build_lib.Warning('Cannot rev %s\n' % ebuild.package + |
| 304 | 'Note you will have to go into %s ' |
| 305 | 'and reset the git repo yourself.' % overlay) |
| 306 | raise |
| 307 | |
Mike Frysinger | fddaeb5 | 2012-11-20 11:17:31 -0500 | [diff] [blame] | 308 | if cros_build_lib.IsInsideChroot(): |
| 309 | # Regenerate caches if need be. We do this all the time to |
| 310 | # catch when users make changes without updating cache files. |
Brian Harring | 9fdd23d | 2012-12-07 12:09:08 -0800 | [diff] [blame] | 311 | queue.put([overlay]) |
Chris Sosa | dad0d32 | 2011-01-31 16:37:33 -0800 | [diff] [blame] | 312 | |
David James | a8457b5 | 2011-05-28 00:03:20 -0700 | [diff] [blame] | 313 | if command == 'commit': |
Mike Frysinger | fddaeb5 | 2012-11-20 11:17:31 -0500 | [diff] [blame] | 314 | if cros_build_lib.IsInsideChroot(): |
| 315 | CleanStalePackages(options.boards.split(':'), new_package_atoms) |
David James | a8457b5 | 2011-05-28 00:03:20 -0700 | [diff] [blame] | 316 | if options.drop_file: |
Mike Frysinger | fddaeb5 | 2012-11-20 11:17:31 -0500 | [diff] [blame] | 317 | osutils.WriteFile(options.drop_file, ' '.join(revved_packages)) |