svn commit: r340702 - in head/lib/csu: amd64 common i386

[Ed Maste]

Author: emaste
Date: Tue Nov 20 21:04:20 2018
New Revision: 340702
URL: https://svnweb.freebsd.org/changeset/base/340702

Log:
  csu: use BSD-1-clause license on csu files
  
  Copyright on these files is held by kib@ and/or the Foundation, and both
  agree to this change.
  
  Approved by:	kib

Modified:
  head/lib/csu/amd64/reloc.c
  head/lib/csu/common/ignore_init.c
  head/lib/csu/common/notes.h
  head/lib/csu/i386/crt1_s.S
  head/lib/csu/i386/reloc.c

Modified: head/lib/csu/amd64/reloc.c
==============================================================================
--- head/lib/csu/amd64/reloc.c	Tue Nov 20 20:59:49 2018	(r340701)
+++ head/lib/csu/amd64/reloc.c	Tue Nov 20 21:04:20 2018	(r340702)
@@ -9,9 +9,6 @@
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

Modified: head/lib/csu/common/ignore_init.c
==============================================================================
--- head/lib/csu/common/ignore_init.c	Tue Nov 20 20:59:49 2018	(r340701)
+++ head/lib/csu/common/ignore_init.c	Tue Nov 20 21:04:20 2018	(r340702)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-1-Clause
  *
  * Copyright 2012 Konstantin Belousov <kib at FreeBSD.org>
  * Copyright (c) 2018 The FreeBSD Foundation
@@ -12,9 +12,6 @@
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: head/lib/csu/common/notes.h
==============================================================================
--- head/lib/csu/common/notes.h	Tue Nov 20 20:59:49 2018	(r340701)
+++ head/lib/csu/common/notes.h	Tue Nov 20 21:04:20 2018	(r340702)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-1-Clause
  *
  * Copyright 2012 Konstantin Belousov <kib at FreeBSD.org>
  * All rights reserved.
@@ -9,9 +9,6 @@
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: head/lib/csu/i386/crt1_s.S
==============================================================================
--- head/lib/csu/i386/crt1_s.S	Tue Nov 20 20:59:49 2018	(r340701)
+++ head/lib/csu/i386/crt1_s.S	Tue Nov 20 21:04:20 2018	(r340702)
@@ -7,9 +7,6 @@
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: head/lib/csu/i386/reloc.c
==============================================================================
--- head/lib/csu/i386/reloc.c	Tue Nov 20 20:59:49 2018	(r340701)
+++ head/lib/csu/i386/reloc.c	Tue Nov 20 21:04:20 2018	(r340702)
@@ -9,9 +9,6 @@
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE