From b890a1228d22b2d48792575986d4750e88751c8b Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 26 Mar 2015 15:17:45 +0100 Subject: Remove address from GPLv2 headers As per discussion with lawyers[tm], it's not a good idea to shorten the license header too much - not for legal reasons but because there are tools that look for them, and giving them a standard pattern simplifies things. However, we got confirmation that we don't have to update every file ever added to coreboot whenever the FSF gets a new lease, but can drop the address instead. util/kconfig is excluded because that's imported code that we may want to synchronize every now and then. $ find * -type f -exec sed -i "s:Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, *MA[, ]*02110-1301[, ]*USA:Foundation, Inc.:" {} + $ find * -type f -exec sed -i "s:Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA:Foundation, Inc.:" {} + $ find * -type f -exec sed -i "s:Foundation, Inc., 59 Temple Place[-, ]*Suite 330, Boston, MA *02111-1307[, ]*USA:Foundation, Inc.:" {} + $ find * -type f -exec sed -i "s:Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.:Foundation, Inc.:" {} + $ find * -type f -a \! -name \*.patch \ -a \! -name \*_shipped \ -a \! -name LICENSE_GPL \ -a \! -name LGPL.txt \ -a \! -name COPYING \ -a \! -name DISCLAIMER \ -exec sed -i "/Foundation, Inc./ N;s:Foundation, Inc.* USA\.* *:Foundation, Inc. :;s:Foundation, Inc. $:Foundation, Inc.:" {} + Change-Id: Icc968a5a5f3a5df8d32b940f9cdb35350654bef9 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/9233 Tested-by: build bot (Jenkins) Reviewed-by: Vladimir Serbinenko --- payloads/libpayload/arch/arm/gdb.c | 2 +- payloads/libpayload/arch/arm64/gdb.c | 2 +- payloads/libpayload/arch/mips/Config.in | 3 +-- payloads/libpayload/arch/mips/Makefile.inc | 3 +-- payloads/libpayload/arch/mips/cache.c | 2 +- payloads/libpayload/arch/mips/coreboot.c | 2 +- payloads/libpayload/arch/mips/exception.c | 2 +- payloads/libpayload/arch/mips/exception_asm.S | 2 +- payloads/libpayload/arch/mips/gdb.c | 2 +- payloads/libpayload/arch/mips/head.S | 2 +- payloads/libpayload/arch/mips/libpayload.ldscript | 3 +-- payloads/libpayload/arch/mips/main.c | 2 +- payloads/libpayload/arch/mips/string.c | 2 +- payloads/libpayload/arch/mips/sysinfo.c | 2 +- payloads/libpayload/arch/mips/timer.c | 2 +- payloads/libpayload/arch/mips/util.S | 2 +- payloads/libpayload/arch/x86/gdb.c | 2 +- payloads/libpayload/arch/x86/string.c | 3 +-- 18 files changed, 18 insertions(+), 22 deletions(-) (limited to 'payloads/libpayload/arch') diff --git a/payloads/libpayload/arch/arm/gdb.c b/payloads/libpayload/arch/arm/gdb.c index faf9eb48f2..277641f194 100644 --- a/payloads/libpayload/arch/arm/gdb.c +++ b/payloads/libpayload/arch/arm/gdb.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/arm64/gdb.c b/payloads/libpayload/arch/arm64/gdb.c index c976483f04..c270fc4112 100644 --- a/payloads/libpayload/arch/arm64/gdb.c +++ b/payloads/libpayload/arch/arm64/gdb.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/mips/Config.in b/payloads/libpayload/arch/mips/Config.in index 8c53f7337b..8462218e4d 100644 --- a/payloads/libpayload/arch/mips/Config.in +++ b/payloads/libpayload/arch/mips/Config.in @@ -15,8 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301 USA +# Foundation, Inc. # diff --git a/payloads/libpayload/arch/mips/Makefile.inc b/payloads/libpayload/arch/mips/Makefile.inc index a6c4bd1c86..53b954b81b 100644 --- a/payloads/libpayload/arch/mips/Makefile.inc +++ b/payloads/libpayload/arch/mips/Makefile.inc @@ -15,8 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, -# MA 02110-1301 USA +# Foundation, Inc. # ############################################################################### diff --git a/payloads/libpayload/arch/mips/cache.c b/payloads/libpayload/arch/mips/cache.c index 01840fd8ef..df61846e34 100644 --- a/payloads/libpayload/arch/mips/cache.c +++ b/payloads/libpayload/arch/mips/cache.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/mips/coreboot.c b/payloads/libpayload/arch/mips/coreboot.c index 9b5f8c4203..cdd2fc0647 100644 --- a/payloads/libpayload/arch/mips/coreboot.c +++ b/payloads/libpayload/arch/mips/coreboot.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/mips/exception.c b/payloads/libpayload/arch/mips/exception.c index c910adae7d..1c06f853d9 100644 --- a/payloads/libpayload/arch/mips/exception.c +++ b/payloads/libpayload/arch/mips/exception.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/mips/exception_asm.S b/payloads/libpayload/arch/mips/exception_asm.S index 85386ac55c..36a1a05fcd 100644 --- a/payloads/libpayload/arch/mips/exception_asm.S +++ b/payloads/libpayload/arch/mips/exception_asm.S @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #define STATUS_REGISTER $12,0 diff --git a/payloads/libpayload/arch/mips/gdb.c b/payloads/libpayload/arch/mips/gdb.c index cea67ab084..63bfce2060 100644 --- a/payloads/libpayload/arch/mips/gdb.c +++ b/payloads/libpayload/arch/mips/gdb.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ diff --git a/payloads/libpayload/arch/mips/head.S b/payloads/libpayload/arch/mips/head.S index f25e77ac42..1927919329 100644 --- a/payloads/libpayload/arch/mips/head.S +++ b/payloads/libpayload/arch/mips/head.S @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/mips/libpayload.ldscript b/payloads/libpayload/arch/mips/libpayload.ldscript index e8d3f3960a..586cbdce3f 100644 --- a/payloads/libpayload/arch/mips/libpayload.ldscript +++ b/payloads/libpayload/arch/mips/libpayload.ldscript @@ -19,8 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA + * Foundation, Inc. */ OUTPUT_ARCH(mips) diff --git a/payloads/libpayload/arch/mips/main.c b/payloads/libpayload/arch/mips/main.c index d6f980a1f5..247aa6ca50 100644 --- a/payloads/libpayload/arch/mips/main.c +++ b/payloads/libpayload/arch/mips/main.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/mips/string.c b/payloads/libpayload/arch/mips/string.c index 6326d15994..fd78ac34e2 100644 --- a/payloads/libpayload/arch/mips/string.c +++ b/payloads/libpayload/arch/mips/string.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/mips/sysinfo.c b/payloads/libpayload/arch/mips/sysinfo.c index ab1db63bf0..75017cfcae 100644 --- a/payloads/libpayload/arch/mips/sysinfo.c +++ b/payloads/libpayload/arch/mips/sysinfo.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/mips/timer.c b/payloads/libpayload/arch/mips/timer.c index 782959b71a..1aa2179277 100644 --- a/payloads/libpayload/arch/mips/timer.c +++ b/payloads/libpayload/arch/mips/timer.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/mips/util.S b/payloads/libpayload/arch/mips/util.S index 09bfddc86c..2c7b91503d 100644 --- a/payloads/libpayload/arch/mips/util.S +++ b/payloads/libpayload/arch/mips/util.S @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ .global halt diff --git a/payloads/libpayload/arch/x86/gdb.c b/payloads/libpayload/arch/x86/gdb.c index 99db78f29b..521a798dd4 100644 --- a/payloads/libpayload/arch/x86/gdb.c +++ b/payloads/libpayload/arch/x86/gdb.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc. */ #include diff --git a/payloads/libpayload/arch/x86/string.c b/payloads/libpayload/arch/x86/string.c index 19047eee9e..60de8123a5 100644 --- a/payloads/libpayload/arch/x86/string.c +++ b/payloads/libpayload/arch/x86/string.c @@ -18,8 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Foundation, Inc. */ /* From glibc-2.14, sysdeps/i386/memset.c */ -- cgit v1.2.3