[coreboot-gerrit] New patch to review for coreboot: util/scripts/no-fsf-addresses.sh: Also strip the proposal to write to the FSF

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11887

-gerrit

commit 5d3a18436de195a34fa86fd4d037af6b7b03764a
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Tue Oct 13 22:11:13 2015 +0200

    util/scripts/no-fsf-addresses.sh: Also strip the proposal to write to
    the FSF
    
    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.
    
    While at it, correctly scope the other multi-line rule.
    
    Change-Id: I7c43860b6fd7ec526983c24b608994539128cfb9
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 util/scripts/no-fsf-addresses.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/scripts/no-fsf-addresses.sh b/util/scripts/no-fsf-addresses.sh
index 22a097c..17751fd 100755
--- a/util/scripts/no-fsf-addresses.sh
+++ b/util/scripts/no-fsf-addresses.sh
@@ -18,7 +18,8 @@ sed -i \
 	-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.:" \
+	-e "/Foundation, Inc./ {N;s:Foundation, Inc.* USA\.* *:Foundation, Inc. :;s:Foundation, Inc. $:Foundation, Inc.:}" \
+	-e "/write to the Free/ {N;s:\(program\|[lL]ibrary\).*if not, write to the Free.*Inc\.:\1.:}" \
 	$(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$")