commit 9ec1ae6e86c01c1c49c4adc386b130b3b2af95fe
author Vadim Bendebury <vbendeb@chromium.org> Mon Apr 07 16:05:25 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Apr 08 21:52:41 2014 +0000
tree e66829b6aea74c3cdccdec865388be71d043496d
parent 33a458d9f66484369388445b7ced1a60b6dfe717

Do not require 'Google Copyright' in coreboot headers

It should be possible to add non Google originated files to the
coreboot repo. Remove the check function, as coreboot was the last
repo using it.

BUG=none
TEST=with this change submitting coreboot files without Google
     copyright does not trigger presubmit warnings anymore.

Change-Id: I176f03a77202fbb216987822dd07204a213f7488
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/193506
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Vadim Bendebury <vbendeb@google.com>

pre-upload.py

diff --git a/pre-upload.py b/pre-upload.py
index d892155..9e2b896 100755
--- a/pre-upload.py
+++ b/pre-upload.py
@@ -16,7 +16,6 @@
 import optparse
 import os
 import re
-import socket
 import sys
 import subprocess
 
@@ -706,21 +705,6 @@
   return _verify_header_content(commit, LICENSE_HEADER, FAIL_MSG)
 
 
-def _check_google_copyright(_project, commit):
-  """Verifies Google Inc. as copyright holder."""
-  LICENSE_HEADER = (
-     r".* Copyright 20[-0-9]{2,7} Google Inc\."
-  )
-  FAIL_MSG = "Copyright must match"
-
-  # Avoid blocking partners and external contributors.
-  fqdn = socket.getfqdn()
-  if not fqdn.endswith(".corp.google.com"):
-    return None
-
-  return _verify_header_content(commit, LICENSE_HEADER, FAIL_MSG)
-
-
 # Project-specific hooks
 
 
@@ -875,8 +859,7 @@
     "chromiumos/platform/mosys": [_check_change_has_branch_field],
     "chromiumos/platform/vboot_reference": [_check_change_has_branch_field],
     "chromiumos/third_party/coreboot": [_check_change_has_branch_field,
-                                        _check_change_has_signoff_field,
-                                        _check_google_copyright],
+                                        _check_change_has_signoff_field],
     "chromiumos/third_party/flashrom": [_check_change_has_branch_field],
     "chromiumos/third_party/kernel": [_run_checkpatch, _kernel_configcheck],
     "chromiumos/third_party/kernel-next": [_run_checkpatch,