From eada66b37892bc75161fc3dc568db6f885849216 Mon Sep 17 00:00:00 2001 From: emaste Date: Tue, 20 Nov 2018 21:04:20 +0000 Subject: [PATCH] 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 --- lib/csu/amd64/reloc.c | 3 --- lib/csu/common/ignore_init.c | 5 +---- lib/csu/common/notes.h | 5 +---- lib/csu/i386/crt1_s.S | 3 --- lib/csu/i386/reloc.c | 3 --- 5 files changed, 2 insertions(+), 17 deletions(-) diff --git a/lib/csu/amd64/reloc.c b/lib/csu/amd64/reloc.c index cc4a7e73caba..adb52e42a32c 100644 --- a/lib/csu/amd64/reloc.c +++ b/lib/csu/amd64/reloc.c @@ -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 diff --git a/lib/csu/common/ignore_init.c b/lib/csu/common/ignore_init.c index 8712661b44f7..9bbe55d904fd 100644 --- a/lib/csu/common/ignore_init.c +++ b/lib/csu/common/ignore_init.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-1-Clause * * Copyright 2012 Konstantin Belousov * 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 diff --git a/lib/csu/common/notes.h b/lib/csu/common/notes.h index 44d2d95487cb..eb74260be585 100644 --- a/lib/csu/common/notes.h +++ b/lib/csu/common/notes.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-1-Clause * * Copyright 2012 Konstantin Belousov * 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 diff --git a/lib/csu/i386/crt1_s.S b/lib/csu/i386/crt1_s.S index 17ac0e392345..1bd9a4283987 100644 --- a/lib/csu/i386/crt1_s.S +++ b/lib/csu/i386/crt1_s.S @@ -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 diff --git a/lib/csu/i386/reloc.c b/lib/csu/i386/reloc.c index 46551ffc0c22..13438035841d 100644 --- a/lib/csu/i386/reloc.c +++ b/lib/csu/i386/reloc.c @@ -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