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 --- util/nvramtool/Makefile | 2 +- util/nvramtool/Makefile.inc | 2 +- util/nvramtool/accessors/layout-bin.c | 3 +-- util/nvramtool/accessors/layout-common.c | 3 +-- util/nvramtool/accessors/layout-text.c | 3 +-- util/nvramtool/accessors/layout-text.h | 3 +-- util/nvramtool/cbfs.c | 2 +- util/nvramtool/cbfs.h | 2 +- util/nvramtool/cli/nvramtool.8 | 3 +-- util/nvramtool/cli/nvramtool.c | 3 +-- util/nvramtool/cli/opts.c | 3 +-- util/nvramtool/cli/opts.h | 3 +-- util/nvramtool/cmos_lowlevel.c | 3 +-- util/nvramtool/cmos_lowlevel.h | 3 +-- util/nvramtool/cmos_ops.c | 3 +-- util/nvramtool/cmos_ops.h | 3 +-- util/nvramtool/common.c | 3 +-- util/nvramtool/common.h | 3 +-- util/nvramtool/input_file.c | 3 +-- util/nvramtool/input_file.h | 3 +-- util/nvramtool/layout.c | 3 +-- util/nvramtool/layout.h | 3 +-- util/nvramtool/lbtable.c | 3 +-- util/nvramtool/lbtable.h | 3 +-- util/nvramtool/reg_expr.c | 3 +-- util/nvramtool/reg_expr.h | 3 +-- 26 files changed, 26 insertions(+), 48 deletions(-) (limited to 'util/nvramtool') diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile index 12f4a5c845..1f197334f1 100644 --- a/util/nvramtool/Makefile +++ b/util/nvramtool/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. ## PROGRAM = nvramtool diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.inc index dc33370ae8..dc45edec4b 100644 --- a/util/nvramtool/Makefile.inc +++ b/util/nvramtool/Makefile.inc @@ -16,7 +16,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. ## OS_ARCH = $(shell uname) diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c index 4b7f8d6558..dde3e27dd8 100644 --- a/util/nvramtool/accessors/layout-bin.c +++ b/util/nvramtool/accessors/layout-bin.c @@ -31,8 +31,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include diff --git a/util/nvramtool/accessors/layout-common.c b/util/nvramtool/accessors/layout-common.c index 0a99d3b89c..f8113b5743 100644 --- a/util/nvramtool/accessors/layout-common.c +++ b/util/nvramtool/accessors/layout-common.c @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include diff --git a/util/nvramtool/accessors/layout-text.c b/util/nvramtool/accessors/layout-text.c index a06f560cee..7e02768996 100644 --- a/util/nvramtool/accessors/layout-text.c +++ b/util/nvramtool/accessors/layout-text.c @@ -30,8 +30,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include "common.h" diff --git a/util/nvramtool/accessors/layout-text.h b/util/nvramtool/accessors/layout-text.h index 85628f7e5e..62286c2a04 100644 --- a/util/nvramtool/accessors/layout-text.h +++ b/util/nvramtool/accessors/layout-text.h @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #ifndef LAYOUT_FILE_H diff --git a/util/nvramtool/cbfs.c b/util/nvramtool/cbfs.c index abd40eec12..1d340b4fbe 100644 --- a/util/nvramtool/cbfs.c +++ b/util/nvramtool/cbfs.c @@ -16,7 +16,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. */ #ifdef __MINGW32__ diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h index bf5ca95dc5..8c02d9de8b 100644 --- a/util/nvramtool/cbfs.h +++ b/util/nvramtool/cbfs.h @@ -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. * --------------------------------------------------------------------------- * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/util/nvramtool/cli/nvramtool.8 b/util/nvramtool/cli/nvramtool.8 index 9159a2a6dd..a1e4a6c6e9 100644 --- a/util/nvramtool/cli/nvramtool.8 +++ b/util/nvramtool/cli/nvramtool.8 @@ -24,8 +24,7 @@ .\" conditions of the GNU General Public License for more details. .\" .\" 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. +.\" with this program; if not, write to the Free Software Foundation, Inc. .\"***************************************************************************/ .TH NVRAMTOOL 8 "September 2008" .SH NAME diff --git a/util/nvramtool/cli/nvramtool.c b/util/nvramtool/cli/nvramtool.c index bdfaaff26d..13d740f980 100644 --- a/util/nvramtool/cli/nvramtool.c +++ b/util/nvramtool/cli/nvramtool.c @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include diff --git a/util/nvramtool/cli/opts.c b/util/nvramtool/cli/opts.c index a128c0be31..c92b13594d 100644 --- a/util/nvramtool/cli/opts.c +++ b/util/nvramtool/cli/opts.c @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include "common.h" diff --git a/util/nvramtool/cli/opts.h b/util/nvramtool/cli/opts.h index a011ef1136..d6c31b91fa 100644 --- a/util/nvramtool/cli/opts.h +++ b/util/nvramtool/cli/opts.h @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #ifndef OPTS_H diff --git a/util/nvramtool/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c index 32f0e0a680..51b998ebbb 100644 --- a/util/nvramtool/cmos_lowlevel.c +++ b/util/nvramtool/cmos_lowlevel.c @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #if defined(__FreeBSD__) diff --git a/util/nvramtool/cmos_lowlevel.h b/util/nvramtool/cmos_lowlevel.h index 264bf85b66..fe6014726c 100644 --- a/util/nvramtool/cmos_lowlevel.h +++ b/util/nvramtool/cmos_lowlevel.h @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #ifndef NVRAMTOOL_CMOS_LOWLEVEL_H diff --git a/util/nvramtool/cmos_ops.c b/util/nvramtool/cmos_ops.c index cb6c37931d..49d11b17ed 100644 --- a/util/nvramtool/cmos_ops.c +++ b/util/nvramtool/cmos_ops.c @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include "common.h" diff --git a/util/nvramtool/cmos_ops.h b/util/nvramtool/cmos_ops.h index 3ef502311f..d9d2735a8d 100644 --- a/util/nvramtool/cmos_ops.h +++ b/util/nvramtool/cmos_ops.h @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #ifndef CMOS_OPS_H diff --git a/util/nvramtool/common.c b/util/nvramtool/common.c index 15f8b0d5d1..ad469d939d 100644 --- a/util/nvramtool/common.c +++ b/util/nvramtool/common.c @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include "common.h" diff --git a/util/nvramtool/common.h b/util/nvramtool/common.h index 0ca2829417..7f855c4040 100644 --- a/util/nvramtool/common.h +++ b/util/nvramtool/common.h @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #ifndef COMMON_H diff --git a/util/nvramtool/input_file.c b/util/nvramtool/input_file.c index 1520930175..55a6b9aefe 100644 --- a/util/nvramtool/input_file.c +++ b/util/nvramtool/input_file.c @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include "common.h" diff --git a/util/nvramtool/input_file.h b/util/nvramtool/input_file.h index 05d14de192..b4b80aab6a 100644 --- a/util/nvramtool/input_file.h +++ b/util/nvramtool/input_file.h @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #ifndef INPUT_FILE_H diff --git a/util/nvramtool/layout.c b/util/nvramtool/layout.c index f543d12b46..21698aee7d 100644 --- a/util/nvramtool/layout.c +++ b/util/nvramtool/layout.c @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include "common.h" diff --git a/util/nvramtool/layout.h b/util/nvramtool/layout.h index 082c31b47a..405c14a89d 100644 --- a/util/nvramtool/layout.h +++ b/util/nvramtool/layout.h @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #ifndef LAYOUT_H diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c index 5f1f22d90b..d6553c18b8 100644 --- a/util/nvramtool/lbtable.c +++ b/util/nvramtool/lbtable.c @@ -25,8 +25,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include diff --git a/util/nvramtool/lbtable.h b/util/nvramtool/lbtable.h index 9873ecb326..ddb7938788 100644 --- a/util/nvramtool/lbtable.h +++ b/util/nvramtool/lbtable.h @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #ifndef LBTABLE_H diff --git a/util/nvramtool/reg_expr.c b/util/nvramtool/reg_expr.c index 7d1adbe0a1..3875f592e4 100644 --- a/util/nvramtool/reg_expr.c +++ b/util/nvramtool/reg_expr.c @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #include diff --git a/util/nvramtool/reg_expr.h b/util/nvramtool/reg_expr.h index c93215b782..55f6b5d917 100644 --- a/util/nvramtool/reg_expr.h +++ b/util/nvramtool/reg_expr.h @@ -24,8 +24,7 @@ * conditions of the GNU General Public License for more details. * * 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. + * with this program; if not, write to the Free Software Foundation, Inc. \*****************************************************************************/ #ifndef REG_EXPR_H -- cgit v1.2.3