From b179da0111bf5734c60d07c110e8abae9cea300f Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Tue, 7 Aug 2018 13:46:06 +0000 Subject: [PATCH] libbe(3)/bectl(8): Standardize copyright headers - File names don't necessarily need to be repeated - Add SPDX tags - Add a missing copyright for Kyle Kneitinger in bectl.8, originally written by him in GSoC 2017; his standard copyright notice has been copied from other files within the same directory to remain consistent with how he clearly wished to portray it --- lib/libbe/be.c | 4 ++-- lib/libbe/be.h | 4 ++-- lib/libbe/be_access.c | 5 +++-- lib/libbe/be_error.c | 4 ++-- lib/libbe/be_impl.h | 4 ++-- lib/libbe/be_info.c | 5 +++-- lib/libbe/libbe.3 | 2 ++ sbin/bectl/bectl.8 | 5 ++++- sbin/bectl/bectl.c | 4 ++-- 9 files changed, 22 insertions(+), 15 deletions(-) diff --git a/lib/libbe/be.c b/lib/libbe/be.c index 42b450521816..abe1861bac04 100644 --- a/lib/libbe/be.c +++ b/lib/libbe/be.c @@ -1,5 +1,5 @@ -/* - * be.c +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2017 Kyle J. Kneitinger * All rights reserved. diff --git a/lib/libbe/be.h b/lib/libbe/be.h index dea934af1dad..b6525a7a1141 100644 --- a/lib/libbe/be.h +++ b/lib/libbe/be.h @@ -1,5 +1,5 @@ -/* - * be.h +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2017 Kyle J. Kneitinger * All rights reserved. diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c index c0acac215eb7..1d63df186b80 100644 --- a/lib/libbe/be_access.c +++ b/lib/libbe/be_access.c @@ -1,7 +1,8 @@ -/* - * be_access.c +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2017 Kyle J. Kneitinger + * Copyright (c) 2018 Kyle Evans * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libbe/be_error.c b/lib/libbe/be_error.c index 58df17ba4e20..becf4ecc13b9 100644 --- a/lib/libbe/be_error.c +++ b/lib/libbe/be_error.c @@ -1,5 +1,5 @@ -/* - * be_error.c +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2017 Kyle J. Kneitinger * All rights reserved. diff --git a/lib/libbe/be_impl.h b/lib/libbe/be_impl.h index f92d22f4d996..16a3fb9084b4 100644 --- a/lib/libbe/be_impl.h +++ b/lib/libbe/be_impl.h @@ -1,5 +1,5 @@ -/* - * be_impl.h +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2017 Kyle J. Kneitinger * All rights reserved. diff --git a/lib/libbe/be_info.c b/lib/libbe/be_info.c index 04bbd71c4f7b..ef4d19ceca3c 100644 --- a/lib/libbe/be_info.c +++ b/lib/libbe/be_info.c @@ -1,7 +1,8 @@ -/* - * be_info.c +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2017 Kyle J. Kneitinger + * Copyright (c) 2018 Kyle Evans * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libbe/libbe.3 b/lib/libbe/libbe.3 index be026a30e754..c93d74177f07 100644 --- a/lib/libbe/libbe.3 +++ b/lib/libbe/libbe.3 @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" .\" Copyright (c) 2017 Kyle Kneitinger .\" All rights reserved. .\" diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 22baa0574c0b..b00b59a50501 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -1,5 +1,8 @@ .\" -.\" be - Utility to manage Boot Environments on the ZFS filesystem +.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" +.\" Copyright (c) 2017 Kyle J. Kneitinger +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index da01840ed196..090ef6b657d2 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -1,5 +1,5 @@ -/* - * be.c +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2017 Kyle J. Kneitinger * All rights reserved.