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