Fix REUSE licensing/copyright issues in `src`

This patch makes `reuse lint` happy for the files in `src`.

Putting the info into a separate `.license` file for
`src/cpp-common/optional.hpp` to avoid modifying the original file which
comes from an external project.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I073afa1b5de0906f4f9f2a809ef387c05833ca17
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11384
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 0632a75422f4c90d2218da34e46f93f02cee8601..98b89b3309782d13a27715dbab94fe5e681d5523 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
+# SPDX-FileCopyrightText: 2019-2023 EfficiOS, Inc.
 # SPDX-License-Identifier: MIT
 
 # Build the current dir containing the library and plugins before the cli and
@@ -705,3 +706,5 @@ plugins_lttng_utils_babeltrace_plugin_lttng_utils_la_LIBADD += \
        plugins/common/param-validation/libparam-validation.la
 endif # !ENABLE_BUILT_IN_PLUGINS
 endif # ENABLE_DEBUG_INFO
+
+EXTRA_DIST = cpp-common/optional.hpp.license

diff --git a/src/babeltrace2-ctf-writer.pc.in b/src/babeltrace2-ctf-writer.pc.in
index 960f5b47ae239f70d9927ae940535845a79a0666..f3514f7af290ae4c3949cb2cf25bbbe1aa7512f7 100644 (file)
--- a/src/babeltrace2-ctf-writer.pc.in
+++ b/src/babeltrace2-ctf-writer.pc.in
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2019 EfficiOS, Inc.
+# SPDX-License-Identifier: MIT
+
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@

diff --git a/src/babeltrace2.pc.in b/src/babeltrace2.pc.in
index 8d812a5b0ad6672bc8da1aa2feeab992718ae477..0cdf11f849340126561089bb9ae4700de9c683ae 100644 (file)
--- a/src/babeltrace2.pc.in
+++ b/src/babeltrace2.pc.in
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2019 EfficiOS, Inc.
+# SPDX-License-Identifier: MIT
+
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@

diff --git a/src/bindings/python/bt2/.gitignore b/src/bindings/python/bt2/.gitignore
index ab27d64ea9e342a0efade928c838cb11b01f9330..fc7a23f158c10b3cda2590be643d0def06d205a3 100644 (file)
--- a/src/bindings/python/bt2/.gitignore
+++ b/src/bindings/python/bt2/.gitignore
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2019-2020 EfficiOS, Inc.
+# SPDX-License-Identifier: MIT
+
 bt2/native_bt.py
 bt2/native_bt.c
 bt2/native_bt.d

diff --git a/src/bindings/python/bt2/Makefile.am b/src/bindings/python/bt2/Makefile.am
index 570c551338edded63788ccb548b91f79b4b5b5ef..7d58b7324f13905ff37fa246dbb06abce0164092 100644 (file)
--- a/src/bindings/python/bt2/Makefile.am
+++ b/src/bindings/python/bt2/Makefile.am
@@ -1,3 +1,4 @@
+# SPDX-FileCopyrightText: 2019-2023 EfficiOS, Inc.
 # SPDX-License-Identifier: MIT
 
 # Since the shared object used by the python bindings is not built with

diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index d72ea16e9043a07c8a6fd9402e47da3dc409213b..80ffb85f6271058ded663dc5d4843aee74a1dc99 100644 (file)
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -1,3 +1,4 @@
+# SPDX-FileCopyrightText: 2019-2023 EfficiOS, Inc.
 # SPDX-License-Identifier: MIT
 
 PLUGINS_PATH = $(abs_top_builddir)/src/plugins

diff --git a/src/common/list.h b/src/common/list.h
index 193bf2d7063c3955daed255a8c61abc80465d316..fd1f471cbb210bd1870c59a0a09c26f60e4a86e3 100644 (file)
--- a/src/common/list.h
+++ b/src/common/list.h
@@ -1,7 +1,7 @@
 /*
+ * SPDX-FileCopyrightText: 2002 Free Software Foundation, Inc.
  * SPDX-License-Identifier: LGPL-2.1-only
  *
- * Copyright (C) 2002 Free Software Foundation, Inc.
  * This file is part of the GNU C Library.
  * Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
  */

diff --git a/src/cpp-common/optional.hpp.license b/src/cpp-common/optional.hpp.license
new file mode 100644 (file)
index 0000000..12b35c0
--- /dev/null
+++ b/src/cpp-common/optional.hpp.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2014-2021 Martin Moene
+SPDX-License-Identifier: BSL-1.0

diff --git a/src/cpp-common/uuid-view.hpp b/src/cpp-common/uuid-view.hpp
index c45c8ac348eb67389beffa0ad873dbd14e9b551b..70b6e031ff992e9e8e34f6f129b58c6459af1ee8 100644 (file)
--- a/src/cpp-common/uuid-view.hpp
+++ b/src/cpp-common/uuid-view.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Philippe Proulx <pproulx@efficios.com>
+ * SPDX-FileCopyrightText: 2020 Philippe Proulx <pproulx@efficios.com>
  *
  * SPDX-License-Identifier: MIT
  */

diff --git a/src/cpp-common/vector.hpp b/src/cpp-common/vector.hpp
index 0f0f202488c240bb5376ecb924f0148da60324ff..44adc6e0cd9ac11eb18d1f14a69c4ac02f4c7499 100644 (file)
--- a/src/cpp-common/vector.hpp
+++ b/src/cpp-common/vector.hpp
@@ -1,3 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Simon Marchi <simon.marchi@efficios.com>
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
 #ifndef SRC_CPP_COMMON_VECTOR_HPP
 #define SRC_CPP_COMMON_VECTOR_HPP
 

diff --git a/src/gen-version-i.sh b/src/gen-version-i.sh
index 0bb981fb8bf35b19f39190243e3dc4021b52d0d9..aea195945be517897aa36c0462fb90442cd87c2e 100755 (executable)
--- a/src/gen-version-i.sh
+++ b/src/gen-version-i.sh
@@ -1,8 +1,7 @@
 #!/usr/bin/env sh
 #
+# SPDX-FileCopyrightText: 2023 EfficiOS, Inc.
 # SPDX-License-Identifier: GPL-2.0-only
-#
-# Copyright (C) 2023 EfficiOS, Inc.
 
 # This file generates an include file that contains the git version
 # string of the current branch, it must be continuously updated when