From eb20e60c9cdcb5bf904a6f489d9971220697b5d6 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 12 Jan 2016 13:30:50 -0700 Subject: [PATCH] utils: Remove old license text from help & disclaimer file The license text that we decided to remove was removed from the headers of these files, but was still left in the help text. Remove it from those locations as well. Change-Id: I0e1b3b79f1afa35e632c4a4dd09a8bf2b02eaa6d Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/12913 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- util/cbmem/cbmem.c | 4 +--- util/ectool/ectool.c | 4 +--- util/ifdtool/ifdtool.c | 4 +--- util/inteltool/inteltool.c | 4 +--- util/nvramtool/DISCLAIMER | 4 ---- util/nvramtool/cli/nvramtool.8 | 3 --- util/viatool/viatool.c | 4 +--- 7 files changed, 5 insertions(+), 22 deletions(-) diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 7c210ba0f2..f63c9d4331 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -969,9 +969,7 @@ static void print_version(void) "This program is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program. If not, see .\n\n"); + "GNU General Public License for more details.\n\n"); } static void print_usage(const char *name) diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c index 4639c4ee67..c93eb256e7 100644 --- a/util/ectool/ectool.c +++ b/util/ectool/ectool.c @@ -35,9 +35,7 @@ void print_version(void) "This program is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program. If not, see .\n\n"); + "GNU General Public License for more details.\n\n"); } void print_usage(const char *name) diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c index 7921ef02dd..8a1272581c 100644 --- a/util/ifdtool/ifdtool.c +++ b/util/ifdtool/ifdtool.c @@ -1062,9 +1062,7 @@ static void print_version(void) "This program is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program. If not, see .\n\n"); + "GNU General Public License for more details.\n\n"); } static void print_usage(const char *name) diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 974db6fb71..113eb4d9a9 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -210,9 +210,7 @@ void print_version(void) "This program is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program. If not, see .\n\n"); + "GNU General Public License for more details.\n\n"); } void print_usage(const char *name) diff --git a/util/nvramtool/DISCLAIMER b/util/nvramtool/DISCLAIMER index 1e9d0d2bd7..290ab52249 100644 --- a/util/nvramtool/DISCLAIMER +++ b/util/nvramtool/DISCLAIMER @@ -21,10 +21,6 @@ WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and 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. - This work was produced at the University of California, Lawrence Livermore National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract 48) between the U.S. Department of Energy (DOE) and The Regents of the diff --git a/util/nvramtool/cli/nvramtool.8 b/util/nvramtool/cli/nvramtool.8 index a1e4a6c6e9..8c4e2dc634 100644 --- a/util/nvramtool/cli/nvramtool.8 +++ b/util/nvramtool/cli/nvramtool.8 @@ -22,9 +22,6 @@ .\" WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and .\" 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. .\"***************************************************************************/ .TH NVRAMTOOL 8 "September 2008" .SH NAME diff --git a/util/viatool/viatool.c b/util/viatool/viatool.c index c19647fd0c..328377ac09 100644 --- a/util/viatool/viatool.c +++ b/util/viatool/viatool.c @@ -82,9 +82,7 @@ void print_version(void) "This program is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program. If not, see .\n\n"); + "GNU General Public License for more details.\n\n"); } void print_usage(const char *name)