From f2d7b53096009fccef555affc8adf453aa51920a Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 28 Feb 2022 16:50:31 -0500 Subject: [PATCH 1/1] Implement the REUSE specification for licensing and copyright See "https://reuse.software/tutorial/", running the linter now returns this : $ reuse lint * Bad licenses: * Deprecated licenses: * Licenses without file extension: * Missing licenses: * Unused licenses: * Used licenses: BSD-2-Clause, FSFAP, GPL-2.0-or-later, GPL-3.0-or-later, LicenseRef-Autoconf-exception-macro, Linux-man-pages-copyleft, Linux-syscall-note, MIT * Read errors: 0 * Files with copyright information: 52 / 52 * Files with license information: 52 / 52 Congratulations! Your project is compliant with version 3.0 of the REUSE Specification :-) Change-Id: Ifa9f7bc1cbdce204dd8bad4b8978d90b0d7bb90a Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 4 ++++ .gitreview | 4 ++++ LICENSE | 6 +++--- LICENSES/{BSD-2-Clause => BSD-2-Clause.txt} | 0 LICENSES/FSFAP.txt | 1 + LICENSES/{GPL-2.0 => GPL-2.0-or-later.txt} | 0 LICENSES/{GPL-3.0 => GPL-3.0-or-later.txt} | 0 .../LicenseRef-Autoconf-exception-macro.txt | 12 +++++++++++ LICENSES/Linux-man-pages-copyleft.txt | 21 +++++++++++++++++++ LICENSES/Linux-syscall-note.txt | 12 +++++++++++ LICENSES/{MIT => MIT.txt} | 0 Makefile.am | 15 ++++++------- README.md | 6 ++++++ bootstrap | 3 +++ configure.ac | 2 +- doc/Makefile.am | 1 + doc/man/Makefile.am | 1 + doc/man/rseq.2 | 2 +- include/Makefile.am | 4 +--- include/rseq/compiler.h | 4 ++-- include/rseq/rseq-abi.h | 10 ++++----- include/rseq/rseq-arm.h | 4 ++-- include/rseq/rseq-arm64.h | 6 +++--- include/rseq/rseq-generic-thread-pointer.h | 4 ++-- include/rseq/rseq-mips.h | 7 +++---- include/rseq/rseq-ppc-thread-pointer.h | 4 ++-- include/rseq/rseq-ppc.h | 6 +++--- include/rseq/rseq-riscv.h | 2 ++ include/rseq/rseq-s390.h | 1 + include/rseq/rseq-skip.h | 4 ++-- include/rseq/rseq-thread-pointer.h | 4 ++-- include/rseq/rseq-x86-thread-pointer.h | 4 ++-- include/rseq/rseq-x86.h | 4 ++-- include/rseq/rseq.h | 4 ++-- m4/ae_config_feature.m4 | 1 + m4/ax_append_compile_flags.m4 | 1 + m4/ax_append_flag.m4 | 1 + m4/ax_c___attribute__.m4 | 1 + m4/ax_check_compile_flag.m4 | 1 + m4/ax_cxx_compile_stdcxx.m4 | 1 + m4/ax_pthread.m4 | 1 + m4/ax_require_defined.m4 | 1 + m4/pprint.m4 | 2 ++ src/Makefile.am | 4 +--- src/librseq.pc.in | 4 +--- src/rseq.c | 7 ++----- tests/Makefile.am | 4 +--- tests/basic_percpu_ops_test.c | 1 + tests/basic_percpu_ops_test_cxx.cpp | 1 + tests/basic_test.c | 1 + tests/basic_test_cxx.cpp | 1 + tests/param_test.c | 1 + tests/param_test_cxx.cpp | 1 + tests/run_param_test.tap | 1 + tests/run_param_test_cxx.tap | 1 + tests/utils/Makefile.am | 1 + tests/utils/utils.sh | 2 +- 57 files changed, 139 insertions(+), 63 deletions(-) rename LICENSES/{BSD-2-Clause => BSD-2-Clause.txt} (100%) create mode 100644 LICENSES/FSFAP.txt rename LICENSES/{GPL-2.0 => GPL-2.0-or-later.txt} (100%) rename LICENSES/{GPL-3.0 => GPL-3.0-or-later.txt} (100%) create mode 100644 LICENSES/LicenseRef-Autoconf-exception-macro.txt create mode 100644 LICENSES/Linux-man-pages-copyleft.txt create mode 100644 LICENSES/Linux-syscall-note.txt rename LICENSES/{MIT => MIT.txt} (100%) diff --git a/.gitignore b/.gitignore index 9d59757..e3fc65e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. +# +# SPDX-License-Identifier: MIT + # Prerequisites *.d diff --git a/.gitreview b/.gitreview index 96a2e88..4ef59bf 100644 --- a/.gitreview +++ b/.gitreview @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. +# +# SPDX-License-Identifier: MIT + [gerrit] host=review.lttng.org port=29418 diff --git a/LICENSE b/LICENSE index 194494d..890bd5e 100644 --- a/LICENSE +++ b/LICENSE @@ -4,7 +4,7 @@ This library is provided under: According with: - LICENSES/MIT + LICENSES/MIT.txt The C TAP test libraries are provided under the terms of the BSD 2-Clause @@ -14,7 +14,7 @@ The C TAP test libraries are provided under the terms of the BSD 2-Clause According with: - LICENSES/BSD-2-Clause + LICENSES/BSD-2-Clause.txt They are only used when running the tests in the source tree. This applies to: @@ -30,7 +30,7 @@ License v3.0 or later: According with: - LICENSES/GPL-3.0 + LICENSES/GPL-3.0-or-later.txt It's only used when running the tests in the source tree. This applies to: diff --git a/LICENSES/BSD-2-Clause b/LICENSES/BSD-2-Clause.txt similarity index 100% rename from LICENSES/BSD-2-Clause rename to LICENSES/BSD-2-Clause.txt diff --git a/LICENSES/FSFAP.txt b/LICENSES/FSFAP.txt new file mode 100644 index 0000000..32bc8a8 --- /dev/null +++ b/LICENSES/FSFAP.txt @@ -0,0 +1 @@ +Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. This file is offered as-is, without any warranty. diff --git a/LICENSES/GPL-2.0 b/LICENSES/GPL-2.0-or-later.txt similarity index 100% rename from LICENSES/GPL-2.0 rename to LICENSES/GPL-2.0-or-later.txt diff --git a/LICENSES/GPL-3.0 b/LICENSES/GPL-3.0-or-later.txt similarity index 100% rename from LICENSES/GPL-3.0 rename to LICENSES/GPL-3.0-or-later.txt diff --git a/LICENSES/LicenseRef-Autoconf-exception-macro.txt b/LICENSES/LicenseRef-Autoconf-exception-macro.txt new file mode 100644 index 0000000..8b5b467 --- /dev/null +++ b/LICENSES/LicenseRef-Autoconf-exception-macro.txt @@ -0,0 +1,12 @@ +As a special exception, the respective Autoconf Macro's copyright owner +gives unlimited permission to copy, distribute and modify the configure +scripts that are the output of Autoconf when processing the Macro. You +need not follow the terms of the GNU General Public License when using +or distributing such scripts, even though portions of the text of the +Macro appear in them. The GNU General Public License (GPL) does govern +all other use of the material that constitutes the Autoconf Macro. + +This special exception to the GPL applies to versions of the Autoconf +Macro released by the Autoconf Archive. When you make and distribute a +modified version of the Autoconf Macro, you may extend this special +exception to the GPL to apply to your modified version as well. diff --git a/LICENSES/Linux-man-pages-copyleft.txt b/LICENSES/Linux-man-pages-copyleft.txt new file mode 100644 index 0000000..764635a --- /dev/null +++ b/LICENSES/Linux-man-pages-copyleft.txt @@ -0,0 +1,21 @@ +Copyright (c) All rights reserved. + +Permission is granted to make and distribute verbatim copies of this +manual provided the copyright notice and this permission notice are +preserved on all copies. + +Permission is granted to copy and distribute modified versions of +this manual under the conditions for verbatim copying, provided that +the entire resulting derived work is distributed under the terms of +a permission notice identical to this one. + +Since the Linux kernel and libraries are constantly changing, this +manual page may be incorrect or out-of-date. The author(s) assume +no responsibility for errors or omissions, or for damages resulting +from the use of the information contained herein. The author(s) may +not have taken the same level of care in the production of this +manual, which is licensed free of charge, as they might when working +professionally. + +Formatted or processed versions of this manual, if unaccompanied by +the source, must acknowledge the copyright and authors of this work. diff --git a/LICENSES/Linux-syscall-note.txt b/LICENSES/Linux-syscall-note.txt new file mode 100644 index 0000000..fcd0563 --- /dev/null +++ b/LICENSES/Linux-syscall-note.txt @@ -0,0 +1,12 @@ + NOTE! This copyright does *not* cover user programs that use kernel + services by normal system calls - this is merely considered normal use + of the kernel, and does *not* fall under the heading of "derived work". + Also note that the GPL below is copyrighted by the Free Software + Foundation, but the instance of code that it refers to (the Linux + kernel) is copyrighted by me and others who actually wrote it. + + Also note that the only valid version of the GPL as far as the kernel + is concerned is _this_ particular version of the license (ie v2, not + v2.2 or v3.x or whatever), unless explicitly otherwise stated. + + Linus Torvalds diff --git a/LICENSES/MIT b/LICENSES/MIT.txt similarity index 100% rename from LICENSES/MIT rename to LICENSES/MIT.txt diff --git a/Makefile.am b/Makefile.am index 66eee42..ebb2b6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ # SPDX-License-Identifier: MIT -# -# Copyright (C) 2019 Michael Jeanson -# +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. ACLOCAL_AMFLAGS = -I m4 @@ -15,7 +13,10 @@ dist_doc_DATA = README.md EXTRA_DIST = \ LICENSE \ - LICENSES/BSD-2-Clause \ - LICENSES/GPL-2.0 \ - LICENSES/GPL-3.0 \ - LICENSES/MIT + LICENSES/LicenseRef-Autoconf-exception-macro.txt \ + LICENSES/BSD-2-Clause.txt \ + LICENSES/FSFAP.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/GPL-3.0-or-later.txt \ + LICENSES/Linux-syscall-note.txt \ + LICENSES/MIT.txt diff --git a/README.md b/README.md index fd21f6a..4d2d3a0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + + Library for Restartable Sequences ================================= diff --git a/bootstrap b/bootstrap index f6a332b..1d91d6f 100755 --- a/bootstrap +++ b/bootstrap @@ -1,5 +1,8 @@ #!/bin/sh +# # SPDX-License-Identifier: MIT +# +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. set -x if [ ! -d "config" ]; then diff --git a/configure.ac b/configure.ac index 4ea9983..8606a0f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl SPDX-License-Identifier: MIT dnl -dnl Copyright (C) 2021 EfficiOS, Inc. +dnl SPDX-FileCopyrightText: 2021 EfficiOS, Inc. dnl dnl Process this file with autoconf to produce a configure script. diff --git a/doc/Makefile.am b/doc/Makefile.am index 4c2995c..150b080 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,4 @@ # SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. SUBDIRS = man diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 1d5d3aa..a14da1b 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,3 +1,4 @@ # SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. dist_man2_MANS = rseq.2 diff --git a/doc/man/rseq.2 b/doc/man/rseq.2 index ad3215d..940b47a 100644 --- a/doc/man/rseq.2 +++ b/doc/man/rseq.2 @@ -1,4 +1,4 @@ -.\" Copyright 2015-2023 Mathieu Desnoyers +.\" SPDX-FileCopyrightText: 2015-2023 Mathieu Desnoyers .\" .\" SPDX-License-Identifier: Linux-man-pages-copyleft .\" diff --git a/include/Makefile.am b/include/Makefile.am index 4b7b94a..178df12 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,7 +1,5 @@ # SPDX-License-Identifier: MIT -# -# Copyright (C) 2019 Michael Jeanson -# +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. nobase_include_HEADERS = \ rseq/compiler.h \ diff --git a/include/rseq/compiler.h b/include/rseq/compiler.h index ea964ed..d09e770 100644 --- a/include/rseq/compiler.h +++ b/include/rseq/compiler.h @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2021 Mathieu Desnoyers */ + /* * rseq/compiler.h * * Work-around asm goto compiler bugs. - * - * (C) Copyright 2021 - Mathieu Desnoyers */ #ifndef RSEQ_COMPILER_H diff --git a/include/rseq/rseq-abi.h b/include/rseq/rseq-abi.h index 9c375ef..17ae68e 100644 --- a/include/rseq/rseq-abi.h +++ b/include/rseq/rseq-abi.h @@ -1,15 +1,15 @@ -/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ -#ifndef _RSEQ_ABI_H -#define _RSEQ_ABI_H +/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */ +/* SPDX-FileCopyrightText: 2015-2022 Mathieu Desnoyers */ /* * rseq/rseq-abi.h * * Restartable sequences system call API - * - * Copyright (c) 2015-2022 Mathieu Desnoyers */ +#ifndef _RSEQ_ABI_H +#define _RSEQ_ABI_H + #include #include diff --git a/include/rseq/rseq-arm.h b/include/rseq/rseq-arm.h index 23ff857..e2804e9 100644 --- a/include/rseq/rseq-arm.h +++ b/include/rseq/rseq-arm.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2016-2018 Mathieu Desnoyers */ + /* * rseq-arm.h - * - * (C) Copyright 2016-2018 - Mathieu Desnoyers */ /* diff --git a/include/rseq/rseq-arm64.h b/include/rseq/rseq-arm64.h index ed69340..f7b080f 100644 --- a/include/rseq/rseq-arm64.h +++ b/include/rseq/rseq-arm64.h @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2016-2018 Mathieu Desnoyers */ +/* SPDX-FileCopyrightText: 2018 Will Deacon */ + /* * rseq-arm64.h - * - * (C) Copyright 2016-2018 - Mathieu Desnoyers - * (C) Copyright 2018 - Will Deacon */ /* diff --git a/include/rseq/rseq-generic-thread-pointer.h b/include/rseq/rseq-generic-thread-pointer.h index 99dae7f..e49bc7d 100644 --- a/include/rseq/rseq-generic-thread-pointer.h +++ b/include/rseq/rseq-generic-thread-pointer.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2021 Mathieu Desnoyers */ + /* * rseq-generic-thread-pointer.h - * - * (C) Copyright 2021 - Mathieu Desnoyers */ #ifndef _RSEQ_GENERIC_THREAD_POINTER diff --git a/include/rseq/rseq-mips.h b/include/rseq/rseq-mips.h index 9981371..e55baad 100644 --- a/include/rseq/rseq-mips.h +++ b/include/rseq/rseq-mips.h @@ -1,10 +1,9 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2018 MIPS Tech LLC */ +/* SPDX-FileCopyrightText: 2016-2018 Mathieu Desnoyers */ + /* * Author: Paul Burton - * (C) Copyright 2018 MIPS Tech LLC - * - * Based on rseq-arm.h: - * (C) Copyright 2016-2018 - Mathieu Desnoyers */ /* diff --git a/include/rseq/rseq-ppc-thread-pointer.h b/include/rseq/rseq-ppc-thread-pointer.h index ba473f0..da45930 100644 --- a/include/rseq/rseq-ppc-thread-pointer.h +++ b/include/rseq/rseq-ppc-thread-pointer.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2021 Mathieu Desnoyers */ + /* * rseq-ppc-thread-pointer.h - * - * (C) Copyright 2021 - Mathieu Desnoyers */ #ifndef _RSEQ_PPC_THREAD_POINTER diff --git a/include/rseq/rseq-ppc.h b/include/rseq/rseq-ppc.h index 923238f..02825a5 100644 --- a/include/rseq/rseq-ppc.h +++ b/include/rseq/rseq-ppc.h @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2016-2018 Mathieu Desnoyers */ +/* SPDX-FileCopyrightText: 2016-2018 Boqun Feng */ + /* * rseq-ppc.h - * - * (C) Copyright 2016-2018 - Mathieu Desnoyers - * (C) Copyright 2016-2018 - Boqun Feng */ /* diff --git a/include/rseq/rseq-riscv.h b/include/rseq/rseq-riscv.h index f43310e..46506cf 100644 --- a/include/rseq/rseq-riscv.h +++ b/include/rseq/rseq-riscv.h @@ -1,4 +1,6 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2022 Vincent Chen */ + /* * Select the instruction "csrw mhartid, x0" as the RSEQ_SIG. Unlike * other architectures, the ebreak instruction has no immediate field for diff --git a/include/rseq/rseq-s390.h b/include/rseq/rseq-s390.h index 4d77459..c948b1e 100644 --- a/include/rseq/rseq-s390.h +++ b/include/rseq/rseq-s390.h @@ -1,4 +1,5 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2018 Vasily Gorbik */ /* * RSEQ_SIG uses the trap4 instruction. As Linux does not make use of the diff --git a/include/rseq/rseq-skip.h b/include/rseq/rseq-skip.h index b2f2023..cbc82e4 100644 --- a/include/rseq/rseq-skip.h +++ b/include/rseq/rseq-skip.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2017-2018 Mathieu Desnoyers */ + /* * rseq-skip.h - * - * (C) Copyright 2017-2018 - Mathieu Desnoyers */ static inline __attribute__((always_inline)) diff --git a/include/rseq/rseq-thread-pointer.h b/include/rseq/rseq-thread-pointer.h index f611173..a64fb0f 100644 --- a/include/rseq/rseq-thread-pointer.h +++ b/include/rseq/rseq-thread-pointer.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2021 Mathieu Desnoyers */ + /* * rseq-thread-pointer.h - * - * (C) Copyright 2021 - Mathieu Desnoyers */ #ifndef _RSEQ_THREAD_POINTER diff --git a/include/rseq/rseq-x86-thread-pointer.h b/include/rseq/rseq-x86-thread-pointer.h index 24480d9..2b67f69 100644 --- a/include/rseq/rseq-x86-thread-pointer.h +++ b/include/rseq/rseq-x86-thread-pointer.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2021 Mathieu Desnoyers */ + /* * rseq-x86-thread-pointer.h - * - * (C) Copyright 2021 - Mathieu Desnoyers */ #ifndef _RSEQ_X86_THREAD_POINTER diff --git a/include/rseq/rseq-x86.h b/include/rseq/rseq-x86.h index 4e6b22e..545ab77 100644 --- a/include/rseq/rseq-x86.h +++ b/include/rseq/rseq-x86.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2016-2018 Mathieu Desnoyers */ + /* * rseq-x86.h - * - * (C) Copyright 2016-2018 - Mathieu Desnoyers */ #include diff --git a/include/rseq/rseq.h b/include/rseq/rseq.h index 402f795..08fb5d5 100644 --- a/include/rseq/rseq.h +++ b/include/rseq/rseq.h @@ -1,8 +1,8 @@ /* SPDX-License-Identifier: MIT */ +/* SPDX-FileCopyrightText: 2016-2022 Mathieu Desnoyers */ + /* * rseq.h - * - * (C) Copyright 2016-2022 - Mathieu Desnoyers */ #ifndef RSEQ_H diff --git a/m4/ae_config_feature.m4 b/m4/ae_config_feature.m4 index 1d7cd58..7c306fe 100644 --- a/m4/ae_config_feature.m4 +++ b/m4/ae_config_feature.m4 @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-Autoconf-exception-macro # # SYNOPSIS # diff --git a/m4/ax_append_compile_flags.m4 b/m4/ax_append_compile_flags.m4 index 9c85635..29d86e0 100644 --- a/m4/ax_append_compile_flags.m4 +++ b/m4/ax_append_compile_flags.m4 @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: FSFAP # ============================================================================ # https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html # ============================================================================ diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4 index dd6d8b6..e1ea0fc 100644 --- a/m4/ax_append_flag.m4 +++ b/m4/ax_append_flag.m4 @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: FSFAP # =========================================================================== # https://www.gnu.org/software/autoconf-archive/ax_append_flag.html # =========================================================================== diff --git a/m4/ax_c___attribute__.m4 b/m4/ax_c___attribute__.m4 index 6a1ede1..98999e1 100644 --- a/m4/ax_c___attribute__.m4 +++ b/m4/ax_c___attribute__.m4 @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-Autoconf-exception-macro # =========================================================================== # https://www.gnu.org/software/autoconf-archive/ax_c___attribute__.html # =========================================================================== diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 index bd753b3..8f62565 100644 --- a/m4/ax_check_compile_flag.m4 +++ b/m4/ax_check_compile_flag.m4 @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: FSFAP # =========================================================================== # https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html # =========================================================================== diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 index 43087b2..870766f 100644 --- a/m4/ax_cxx_compile_stdcxx.m4 +++ b/m4/ax_cxx_compile_stdcxx.m4 @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: FSFAP # =========================================================================== # https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html # =========================================================================== diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 index 507f182..058554a 100644 --- a/m4/ax_pthread.m4 +++ b/m4/ax_pthread.m4 @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-Autoconf-exception-macro # =========================================================================== # https://www.gnu.org/software/autoconf-archive/ax_pthread.html # =========================================================================== diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4 index 17c3eab..6de1b2a 100644 --- a/m4/ax_require_defined.m4 +++ b/m4/ax_require_defined.m4 @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: FSFAP # =========================================================================== # https://www.gnu.org/software/autoconf-archive/ax_require_defined.html # =========================================================================== diff --git a/m4/pprint.m4 b/m4/pprint.m4 index a7cfd94..1af5fa4 100644 --- a/m4/pprint.m4 +++ b/m4/pprint.m4 @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-Autoconf-exception-macro +# SPDX-FileCopyrightText: 2019 Philippe Proulx # Pretty printing macros. # # Author: Philippe Proulx diff --git a/src/Makefile.am b/src/Makefile.am index 2a98910..ee01bde 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,5 @@ # SPDX-License-Identifier: MIT -# -# Copyright (C) 2019 Michael Jeanson -# +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. lib_LTLIBRARIES = librseq.la diff --git a/src/librseq.pc.in b/src/librseq.pc.in index 4345317..8337756 100644 --- a/src/librseq.pc.in +++ b/src/librseq.pc.in @@ -1,7 +1,5 @@ # SPDX-License-Identifier: MIT -# -# Copyright (C) 2019 Michael Jeanson -# +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/src/rseq.c b/src/rseq.c index 44de001..b2a02d6 100644 --- a/src/rseq.c +++ b/src/rseq.c @@ -1,9 +1,6 @@ // SPDX-License-Identifier: MIT -/* - * rseq.c - * - * Copyright (C) 2016 Mathieu Desnoyers - */ +// SPDX-FileCopyrightText: 2016 Mathieu Desnoyers + #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif diff --git a/tests/Makefile.am b/tests/Makefile.am index 94f2cf0..a0842e3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,5 @@ # SPDX-License-Identifier: MIT -# -# Copyright (C) 2020 Michael Jeanson -# +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. AM_CPPFLAGS += -I$(top_srcdir)/tests/utils diff --git a/tests/basic_percpu_ops_test.c b/tests/basic_percpu_ops_test.c index 50d242b..634b6ee 100644 --- a/tests/basic_percpu_ops_test.c +++ b/tests/basic_percpu_ops_test.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// SPDX-FileCopyrightText: 2018-2022 Mathieu Desnoyers #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif diff --git a/tests/basic_percpu_ops_test_cxx.cpp b/tests/basic_percpu_ops_test_cxx.cpp index 4cf868b..c2ec684 100644 --- a/tests/basic_percpu_ops_test_cxx.cpp +++ b/tests/basic_percpu_ops_test_cxx.cpp @@ -1,3 +1,4 @@ /* SPDX-License-Identifier: MIT */ +// SPDX-FileCopyrightText: 2020 EfficiOS Inc. #include "basic_percpu_ops_test.c" diff --git a/tests/basic_test.c b/tests/basic_test.c index 26b99a9..b4567f6 100644 --- a/tests/basic_test.c +++ b/tests/basic_test.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// SPDX-FileCopyrightText: 2020 Mathieu Desnoyers /* * Basic test coverage for critical regions and rseq_current_cpu(). */ diff --git a/tests/basic_test_cxx.cpp b/tests/basic_test_cxx.cpp index e17a41a..0ff9920 100644 --- a/tests/basic_test_cxx.cpp +++ b/tests/basic_test_cxx.cpp @@ -1,3 +1,4 @@ /* SPDX-License-Identifier: MIT */ +// SPDX-FileCopyrightText: 2020 EfficiOS Inc. #include "basic_test.c" diff --git a/tests/param_test.c b/tests/param_test.c index 753eaf3..eaf4580 100644 --- a/tests/param_test.c +++ b/tests/param_test.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: MIT +// SPDX-FileCopyrightText: 2020-2022 Mathieu Desnoyers #ifndef _GNU_SOURCE #define _GNU_SOURCE #endif diff --git a/tests/param_test_cxx.cpp b/tests/param_test_cxx.cpp index fb67ea0..4f1a261 100644 --- a/tests/param_test_cxx.cpp +++ b/tests/param_test_cxx.cpp @@ -1,3 +1,4 @@ /* SPDX-License-Identifier: MIT */ +// SPDX-FileCopyrightText: 2020 EfficiOS Inc. #include "param_test.c" diff --git a/tests/run_param_test.tap b/tests/run_param_test.tap index 5846ff3..cd1e6e2 100755 --- a/tests/run_param_test.tap +++ b/tests/run_param_test.tap @@ -1,5 +1,6 @@ #!/bin/bash # SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2020 EfficiOS Inc. SH_TAP=1 diff --git a/tests/run_param_test_cxx.tap b/tests/run_param_test_cxx.tap index f449801..9f44251 100755 --- a/tests/run_param_test_cxx.tap +++ b/tests/run_param_test_cxx.tap @@ -1,5 +1,6 @@ #!/bin/bash # SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2020 EfficiOS Inc. SH_TAP=1 diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am index c3c372c..c94c65e 100644 --- a/tests/utils/Makefile.am +++ b/tests/utils/Makefile.am @@ -1,4 +1,5 @@ # SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: 2022 EfficiOS Inc. noinst_LTLIBRARIES = libtap.la libtap_la_SOURCES = tap.c tap.h diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index b2e82ca..182ec13 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: MIT # -# Copyright (c) 2020 Michael Jeanson +# SPDX-FileCopyrightText: 2020 Michael Jeanson # # This file is meant to be sourced at the start of shell script-based tests. -- 2.34.1