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/bayou/Makefile | 2 +- payloads/bayou/bayou.h | 2 +- payloads/bayou/bayou.xml.example | 2 +- payloads/bayou/config.c | 2 +- payloads/bayou/main.c | 2 +- payloads/bayou/menu.c | 2 +- payloads/bayou/payload.c | 2 +- payloads/bayou/self.c | 2 +- payloads/bayou/self.h | 2 +- payloads/bayou/util/pbuilder/Makefile | 2 +- payloads/bayou/util/pbuilder/config.c | 2 +- payloads/bayou/util/pbuilder/create.c | 2 +- payloads/bayou/util/pbuilder/liblar/Makefile | 2 +- payloads/bayou/util/pbuilder/liblar/elf.h | 3 +-- payloads/bayou/util/pbuilder/liblar/lar.h | 2 +- payloads/bayou/util/pbuilder/liblar/lib.c | 2 +- payloads/bayou/util/pbuilder/liblar/liblar.h | 2 +- payloads/bayou/util/pbuilder/liblar/self.h | 2 +- payloads/bayou/util/pbuilder/lzma/Makefile | 2 +- payloads/bayou/util/pbuilder/lzma/minilzma.cc | 2 +- payloads/bayou/util/pbuilder/main.c | 2 +- payloads/bayou/util/pbuilder/pbuilder.h | 2 +- payloads/bayou/util/pbuilder/show.c | 2 +- 23 files changed, 23 insertions(+), 24 deletions(-) (limited to 'payloads/bayou') diff --git a/payloads/bayou/Makefile b/payloads/bayou/Makefile index 0280ef5243..598e30e512 100644 --- a/payloads/bayou/Makefile +++ b/payloads/bayou/Makefile @@ -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. ## CONFIG_LZMA=y diff --git a/payloads/bayou/bayou.h b/payloads/bayou/bayou.h index e3df08c932..56cd61354c 100644 --- a/payloads/bayou/bayou.h +++ b/payloads/bayou/bayou.h @@ -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. */ #ifndef BAYOU_H_ diff --git a/payloads/bayou/bayou.xml.example b/payloads/bayou/bayou.xml.example index 53dfd52fa9..06d4091143 100644 --- a/payloads/bayou/bayou.xml.example +++ b/payloads/bayou/bayou.xml.example @@ -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/bayou/config.c b/payloads/bayou/config.c index 3b69c4c8de..719fcbd994 100644 --- a/payloads/bayou/config.c +++ b/payloads/bayou/config.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 "bayou.h" diff --git a/payloads/bayou/main.c b/payloads/bayou/main.c index f7bcceff9c..a99537e9ca 100644 --- a/payloads/bayou/main.c +++ b/payloads/bayou/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 "bayou.h" diff --git a/payloads/bayou/menu.c b/payloads/bayou/menu.c index 7e0e72962d..0502634798 100644 --- a/payloads/bayou/menu.c +++ b/payloads/bayou/menu.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/bayou/payload.c b/payloads/bayou/payload.c index 6b031bab83..6ade5c946e 100644 --- a/payloads/bayou/payload.c +++ b/payloads/bayou/payload.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 "bayou.h" diff --git a/payloads/bayou/self.c b/payloads/bayou/self.c index 94b4623494..04db3f672f 100644 --- a/payloads/bayou/self.c +++ b/payloads/bayou/self.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 "bayou.h" diff --git a/payloads/bayou/self.h b/payloads/bayou/self.h index f329381c39..521035762f 100644 --- a/payloads/bayou/self.h +++ b/payloads/bayou/self.h @@ -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. */ #ifndef SELF_H_ diff --git a/payloads/bayou/util/pbuilder/Makefile b/payloads/bayou/util/pbuilder/Makefile index fe850ba0f8..9c417aa18d 100644 --- a/payloads/bayou/util/pbuilder/Makefile +++ b/payloads/bayou/util/pbuilder/Makefile @@ -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. ## PBUILDOBJS := config.o create.o show.o main.o diff --git a/payloads/bayou/util/pbuilder/config.c b/payloads/bayou/util/pbuilder/config.c index b815d808bf..b26168f67e 100644 --- a/payloads/bayou/util/pbuilder/config.c +++ b/payloads/bayou/util/pbuilder/config.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. */ #define _GNU_SOURCE diff --git a/payloads/bayou/util/pbuilder/create.c b/payloads/bayou/util/pbuilder/create.c index 24b972db0c..c866079ebf 100644 --- a/payloads/bayou/util/pbuilder/create.c +++ b/payloads/bayou/util/pbuilder/create.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/bayou/util/pbuilder/liblar/Makefile b/payloads/bayou/util/pbuilder/liblar/Makefile index 9bb4b683ad..a72dc8d632 100644 --- a/payloads/bayou/util/pbuilder/liblar/Makefile +++ b/payloads/bayou/util/pbuilder/liblar/Makefile @@ -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. ## HOSTCC = gcc diff --git a/payloads/bayou/util/pbuilder/liblar/elf.h b/payloads/bayou/util/pbuilder/liblar/elf.h index 01af81988a..48415bda99 100644 --- a/payloads/bayou/util/pbuilder/liblar/elf.h +++ b/payloads/bayou/util/pbuilder/liblar/elf.h @@ -14,8 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA. */ + Software Foundation, Inc. */ #ifndef _ELF_H #define _ELF_H 1 diff --git a/payloads/bayou/util/pbuilder/liblar/lar.h b/payloads/bayou/util/pbuilder/liblar/lar.h index 9ef827d0e0..e82f5f0174 100644 --- a/payloads/bayou/util/pbuilder/liblar/lar.h +++ b/payloads/bayou/util/pbuilder/liblar/lar.h @@ -21,7 +21,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. * --------------------------------------------------------------------------- * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/payloads/bayou/util/pbuilder/liblar/lib.c b/payloads/bayou/util/pbuilder/liblar/lib.c index fd34d851c1..1ad452f943 100644 --- a/payloads/bayou/util/pbuilder/liblar/lib.c +++ b/payloads/bayou/util/pbuilder/liblar/lib.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/bayou/util/pbuilder/liblar/liblar.h b/payloads/bayou/util/pbuilder/liblar/liblar.h index 93a6eee52f..c0e8a9c8f9 100644 --- a/payloads/bayou/util/pbuilder/liblar/liblar.h +++ b/payloads/bayou/util/pbuilder/liblar/liblar.h @@ -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. */ #ifndef _LIBLAR_H_ diff --git a/payloads/bayou/util/pbuilder/liblar/self.h b/payloads/bayou/util/pbuilder/liblar/self.h index fd0c4903bb..c24a125384 100644 --- a/payloads/bayou/util/pbuilder/liblar/self.h +++ b/payloads/bayou/util/pbuilder/liblar/self.h @@ -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. */ #ifndef SELF_H_ diff --git a/payloads/bayou/util/pbuilder/lzma/Makefile b/payloads/bayou/util/pbuilder/lzma/Makefile index 6c2ecd715e..638672bfd9 100644 --- a/payloads/bayou/util/pbuilder/lzma/Makefile +++ b/payloads/bayou/util/pbuilder/lzma/Makefile @@ -15,7 +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. ## LZMA_OBJ := $(obj)/util/lzma/LZMAEncoder.o $(obj)/util/lzma/LZInWindow.o diff --git a/payloads/bayou/util/pbuilder/lzma/minilzma.cc b/payloads/bayou/util/pbuilder/lzma/minilzma.cc index 441c28835f..f0f321a0fa 100644 --- a/payloads/bayou/util/pbuilder/lzma/minilzma.cc +++ b/payloads/bayou/util/pbuilder/lzma/minilzma.cc @@ -19,7 +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. */ #include "C/Common/MyInitGuid.h" diff --git a/payloads/bayou/util/pbuilder/main.c b/payloads/bayou/util/pbuilder/main.c index a678157c6c..b1d79433a3 100644 --- a/payloads/bayou/util/pbuilder/main.c +++ b/payloads/bayou/util/pbuilder/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/bayou/util/pbuilder/pbuilder.h b/payloads/bayou/util/pbuilder/pbuilder.h index e903bd165d..00393e02f9 100644 --- a/payloads/bayou/util/pbuilder/pbuilder.h +++ b/payloads/bayou/util/pbuilder/pbuilder.h @@ -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/bayou/util/pbuilder/show.c b/payloads/bayou/util/pbuilder/show.c index f06fb95812..a74dfddf9b 100644 --- a/payloads/bayou/util/pbuilder/show.c +++ b/payloads/bayou/util/pbuilder/show.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 -- cgit v1.2.3