From 53118ba6001e522e8f33adf090167f9da13b1e5d Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 14 Nov 2023 11:07:26 -0500 Subject: [PATCH] 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 Change-Id: I073afa1b5de0906f4f9f2a809ef387c05833ca17 Reviewed-on: https://review.lttng.org/c/babeltrace/+/11384 Reviewed-by: Michael Jeanson --- src/Makefile.am | 3 +++ src/babeltrace2-ctf-writer.pc.in | 3 +++ src/babeltrace2.pc.in | 3 +++ src/bindings/python/bt2/.gitignore | 3 +++ src/bindings/python/bt2/Makefile.am | 1 + src/cli/Makefile.am | 1 + src/common/list.h | 2 +- src/cpp-common/optional.hpp.license | 2 ++ src/cpp-common/uuid-view.hpp | 2 +- src/cpp-common/vector.hpp | 6 ++++++ src/gen-version-i.sh | 3 +-- 11 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 src/cpp-common/optional.hpp.license diff --git a/src/Makefile.am b/src/Makefile.am index 0632a754..98b89b33 100644 --- 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 960f5b47..f3514f7a 100644 --- 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 8d812a5b..0cdf11f8 100644 --- 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 ab27d64e..fc7a23f1 100644 --- 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 570c5513..7d58b732 100644 --- 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 d72ea16e..80ffb85f 100644 --- 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 193bf2d7..fd1f471c 100644 --- 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 , 2002. */ diff --git a/src/cpp-common/optional.hpp.license b/src/cpp-common/optional.hpp.license new file mode 100644 index 00000000..12b35c05 --- /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 c45c8ac3..70b6e031 100644 --- a/src/cpp-common/uuid-view.hpp +++ b/src/cpp-common/uuid-view.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Philippe Proulx + * SPDX-FileCopyrightText: 2020 Philippe Proulx * * SPDX-License-Identifier: MIT */ diff --git a/src/cpp-common/vector.hpp b/src/cpp-common/vector.hpp index 0f0f2024..44adc6e0 100644 --- a/src/cpp-common/vector.hpp +++ b/src/cpp-common/vector.hpp @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2022 Simon Marchi + * + * 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 0bb981fb..aea19594 100755 --- 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 -- 2.34.1