From caa41f641755c935b036e17440a3b49329c904ed Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 10 May 2023 09:40:58 -0600 Subject: spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch up to that fact and revert to their recommended match of BSD-2-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix (cherry picked from commit 4d846d260e2b9a3d4d0a701462568268cbfe7a5b) --- usr.sbin/iscsid/discovery.c | 2 +- usr.sbin/iscsid/iscsid.c | 2 +- usr.sbin/iscsid/iscsid.h | 2 +- usr.sbin/iscsid/login.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'usr.sbin/iscsid') diff --git a/usr.sbin/iscsid/discovery.c b/usr.sbin/iscsid/discovery.c index 942d4a4bc408..590490542b62 100644 --- a/usr.sbin/iscsid/discovery.c +++ b/usr.sbin/iscsid/discovery.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 The FreeBSD Foundation * diff --git a/usr.sbin/iscsid/iscsid.c b/usr.sbin/iscsid/iscsid.c index 0c1967e0a595..72770b675731 100644 --- a/usr.sbin/iscsid/iscsid.c +++ b/usr.sbin/iscsid/iscsid.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 The FreeBSD Foundation * diff --git a/usr.sbin/iscsid/iscsid.h b/usr.sbin/iscsid/iscsid.h index 42343c0556ae..caac34e1c1dd 100644 --- a/usr.sbin/iscsid/iscsid.h +++ b/usr.sbin/iscsid/iscsid.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 The FreeBSD Foundation * diff --git a/usr.sbin/iscsid/login.c b/usr.sbin/iscsid/login.c index 264bcb48104b..dc69f00fbaa7 100644 --- a/usr.sbin/iscsid/login.c +++ b/usr.sbin/iscsid/login.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 The FreeBSD Foundation * -- cgit v1.2.3