Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11887
-gerrit
commit 48771dd82cbed6604f93d82ac8ab9713f0f1fb2a Author: Patrick Georgi pgeorgi@chromium.org Date: Tue Oct 13 22:11:13 2015 +0200
util/scripts/no-fsf-addresses.sh: Strip last paragraph
checkpatch.pl that we inherited from Linux checks for its absence, so it may be easiest to follow their style of not caring for the FSF's address anymore.
TEST=visual check that `git diff` and `git diff |grep "^[+-]" | \ grep -v "^--- " |grep -v "^+++ " |sort | uniq -c |sort -n` look reasonable (matching number of removed and added comment terminators */, etc.). Also, `git grep -A3 "You should have received a copy"` only returns license texts, imported files, patches and help strings in applications as remaining copies of that paragraph
Change-Id: I7c43860b6fd7ec526983c24b608994539128cfb9 Signed-off-by: Patrick Georgi pgeorgi@chromium.org --- util/scripts/no-fsf-addresses.sh | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/util/scripts/no-fsf-addresses.sh b/util/scripts/no-fsf-addresses.sh index 22a097c..e4200f6 100755 --- a/util/scripts/no-fsf-addresses.sh +++ b/util/scripts/no-fsf-addresses.sh @@ -13,12 +13,34 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+filelist=$(git ls-files $* | \ + grep -Ev "^($(git submodule status |cut -d' ' -f3 |tr '\012' '|' | sed "s,|$,,"))$" | \ + grep -Ev ".patch$|_shipped$|<LICENSE_GPL$|<LGPL.txt$|<COPYING$|<DISCLAIMER$|^util/kconfig/|<no-fsf-addresses.sh$") + sed -i \ -e "s:Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, *MA[, ]*02110-1301[, ]*USA:Foundation, Inc.:" \ + -e "s:Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, *MA[, ]*02110-1301[, ]*$$:Foundation, Inc.:" \ -e "s:Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA:Foundation, Inc.:" \ -e "s:Foundation, Inc., 59 Temple Place[-, ]*Suite 330, Boston, MA *02111-1307[, ]*USA:Foundation, Inc.:" \ -e "s:Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.:Foundation, Inc.:" \ - -e "/Foundation, Inc./ N;s:Foundation, Inc.* USA.* *:Foundation, Inc. :;s:Foundation, Inc. $:Foundation, Inc.:" \ - $(git ls-files $* | \ - grep -Ev "^($(git submodule status |cut -d' ' -f3 |tr '\012' '|' | sed "s,|$,,"))$" | \ - grep -Ev ".patch$|_shipped$|<LICENSE_GPL$|<LGPL.txt$|<COPYING$|<DISCLAIMER$|^util/kconfig/|<no-fsf-addresses.sh$") + -e "/Foundation, Inc./ {N;s:Foundation, Inc.* USA.* *:Foundation, Inc. :;s:Foundation, Inc. $:Foundation, Inc.:}" \ + $filelist + +sed -i \ + -e "/^[ \t*#/-]*$/ { + N + /You should have received a copy of the GNU/ { + N + /You should have received a copy of the GNU.*along with this program.[., ]*$/ d + /You should have received a copy of the GNU.*[iI]f not, write to[^[:alnum:]]*the Free.*Software[^[:alnum:]]*Foundation,[^[:alnum:]]*Inc.[., ]*$/ d + /You should have received a copy of the GNU.*[iI]f not, see.*http://www.gnu.org/licenses/>[. ]*$/ d + N + /You should have received a copy of the GNU.*[iI]f not, write to[^[:alnum:]]*the Free.*Software[^[:alnum:]]*Foundation,[^[:alnum:]]*Inc.[., ]*$/ d + /You should have received a copy of the GNU.*[iI]f not, write to[^[:alnum:]]*the Free.*Software[^[:alnum:]]*Foundation,[^[:alnum:]]*Inc.[., ]**// s:^.**/:*/: + /You should have received a copy of the GNU.*[iI]f not, write to[^[:alnum:]]*the Free.*Software[^[:alnum:]]*Foundation[., ]**// s:^.**/:*/: + /You should have received a copy of the GNU.*[iI]f not, see.*http://www.gnu.org/licenses/>[. ]*$/ d + N + /You should have received a copy of the GNU.*[iI]f not, see.*http://www.gnu.org/licenses/>[. ]*$/ d + /You should have received a copy of the GNU.*[iI]f not, see.*http://www.gnu.org/licenses/>[. ]**// s:^.**/:*/: + }}" \ + $filelist