* [LTP] [PATCH v2 5/5] configure: make: Add SPDX, update copyright
2025-02-06 15:34 [LTP] [PATCH v2 0/5] configure.ac and make cleanup Petr Vorel
` (3 preceding siblings ...)
2025-02-06 15:34 ` [LTP] [PATCH v2 4/5] .github: ci-sphinx-doc: Run autotools and configure Petr Vorel
@ 2025-02-06 15:34 ` Petr Vorel
2025-02-06 15:46 ` [LTP] [PATCH v2 0/5] configure.ac and make cleanup Andrea Cervesato via ltp
5 siblings, 0 replies; 9+ messages in thread
From: Petr Vorel @ 2025-02-06 15:34 UTC (permalink / raw)
To: ltp
Add SPDX and copyright to few missing places or update copyright.
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
configure.ac | 3 +++
doc/Makefile | 3 +++
include/mk/automake.mk | 24 ++++--------------------
include/mk/config-openposix.mk.in | 2 ++
include/mk/config.mk.in | 23 +++--------------------
include/mk/env_post.mk | 25 ++++---------------------
include/mk/env_pre.mk | 26 ++++----------------------
include/mk/features.mk.in | 22 ++--------------------
include/mk/functions.mk | 25 ++++---------------------
include/mk/generic_leaf_target.inc | 24 ++++--------------------
include/mk/generic_leaf_target.mk | 24 ++++--------------------
include/mk/generic_trunk_target.inc | 24 ++++--------------------
include/mk/generic_trunk_target.mk | 24 ++++--------------------
include/mk/lib.mk | 27 ++++-----------------------
include/mk/man.mk | 23 +++--------------------
include/mk/module.mk | 18 ++----------------
include/mk/rules.mk | 3 +++
include/mk/sparse.mk | 2 ++
include/mk/testcases.mk | 22 ++--------------------
19 files changed, 61 insertions(+), 283 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6992d75ca3..672880bfc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,6 @@
+# Copyright (c) Linux Test Project, 2008-2025
+# SPDX-License-Identifier: GPL-2.0-or-later
+
AC_PREREQ(2.64)
AC_INIT([ltp], [LTP_VERSION], [ltp@lists.linux.it])
AC_CONFIG_AUX_DIR([.])
diff --git a/doc/Makefile b/doc/Makefile
index f5757eadc6..a07df04d5c 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,3 +1,6 @@
+# Copyright (c) Linux Test Project, 2024-2025
+# SPDX-License-Identifier: GPL-2.0-or-later
+
top_srcdir ?= ..
include $(top_srcdir)/include/mk/env_pre.mk
diff --git a/include/mk/automake.mk b/include/mk/automake.mk
index 0fa059f117..79f83a5a2e 100644
--- a/include/mk/automake.mk
+++ b/include/mk/automake.mk
@@ -1,24 +1,8 @@
-#
-# Autotools include Makefile.
-#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Autotools include Makefile.
+# Copyright (c) Linux Test Project, 2010-2024
+# Copyright (C) 2009, Cisco Systems Inc.
# Ngie Cooper, July 2009
-#
# Override these variables to use non-system available tools.
ACLOCAL ?= aclocal
diff --git a/include/mk/config-openposix.mk.in b/include/mk/config-openposix.mk.in
index 9a91dcb7ee..54422aec1b 100644
--- a/include/mk/config-openposix.mk.in
+++ b/include/mk/config-openposix.mk.in
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Linux Test Project, 2016
# Parameters from the top level configure
CC= @CC@
CFLAGS+= @CFLAGS@
diff --git a/include/mk/config.mk.in b/include/mk/config.mk.in
index f6e02eaeba..baf1b414ec 100644
--- a/include/mk/config.mk.in
+++ b/include/mk/config.mk.in
@@ -1,24 +1,7 @@
-#
-# config.mk.in.
-#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Linux Test Project, 2009-2024
+# Copyright (C) 2009, Cisco Systems Inc.
# Ngie Cooper, July 2009
-#
# See this page for more info about LEX*:
# http://www.gnu.org/software/hello/manual/autoconf/Particular-Programs.html
diff --git a/include/mk/env_post.mk b/include/mk/env_post.mk
index 4dd3f1e2d7..ab31da73af 100644
--- a/include/mk/env_post.mk
+++ b/include/mk/env_post.mk
@@ -1,25 +1,8 @@
-#
-# Environment post-setup Makefile.
-#
-# Copyright (c) Linux Test Project, 2009-2020
-# Copyright (c) Cisco Systems Inc., 2009
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Environment post-setup Makefile.
+# Copyright (c) Linux Test Project, 2009-2025
+# Copyright (c) Cisco Systems Inc., 2009
# Ngie Cooper, July 2009
-#
ENV_PRE_LOADED ?= $(error You must load env_pre.mk before including this file)
diff --git a/include/mk/env_pre.mk b/include/mk/env_pre.mk
index f362151675..46d6abecfb 100644
--- a/include/mk/env_pre.mk
+++ b/include/mk/env_pre.mk
@@ -1,29 +1,11 @@
-#
-# Make pre-include environment Makefile.
-#
-# Copyright (c) Linux Test Project, 2009-2020
-# Copyright (c) Cisco Systems Inc., 2009
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Make pre-include environment Makefile.
+# Copyright (c) Linux Test Project, 2009-2020
+# Copyright (c) Cisco Systems Inc., 2009
# Ngie Cooper, September 2009
#
# This Makefile must be included first. NO IF'S, AND'S, OR BUT'S.
-#
# This sets the stage for all operations required within Makefiles.
-#
ifndef ENV_PRE_LOADED
ENV_PRE_LOADED = 1
diff --git a/include/mk/features.mk.in b/include/mk/features.mk.in
index 2fc5230d49..fd93dc3763 100644
--- a/include/mk/features.mk.in
+++ b/include/mk/features.mk.in
@@ -1,24 +1,6 @@
-#
-# features.mk.in - feature tuning include Makefile.
-#
-# Copyright (C) 2010, Linux Test Project.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# Copyright (c) Linux Test Project, 2008-2025
+# SPDX-License-Identifier: GPL-2.0-or-later
# Ngie Cooper, October 2010
-#
# Tools enable knobs
WITH_EXPECT := @WITH_EXPECT@
diff --git a/include/mk/functions.mk b/include/mk/functions.mk
index e86dbccdc0..60dbed395e 100644
--- a/include/mk/functions.mk
+++ b/include/mk/functions.mk
@@ -1,25 +1,8 @@
-#
-# A Makefile with a collection of reusable functions.
-#
-# Copyright (c) Linux Test Project, 2009-2020
-# Copyright (c) Cisco Systems Inc., 2009
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# A Makefile with a collection of reusable functions.
+# Copyright (c) Linux Test Project, 2009-2020
+# Copyright (c) Cisco Systems Inc., 2009
# Ngie Cooper, July 2009
-#
# Generate an install rule which also creates the install directory if needed
# to avoid unnecessary bourne shell based for-loops and install errors, as well
diff --git a/include/mk/generic_leaf_target.inc b/include/mk/generic_leaf_target.inc
index 565a282bb3..7c685fea76 100644
--- a/include/mk/generic_leaf_target.inc
+++ b/include/mk/generic_leaf_target.inc
@@ -1,24 +1,8 @@
-#
-# Generic leaf rules include Makefile.
-#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Generic leaf rules include Makefile.
+# Copyright (c) Linux Test Project, 2017-2022
+# Copyright (C) 2009, Cisco Systems Inc.
# Ngie Cooper, July 2009
-#
#
# generic_leaf_target
diff --git a/include/mk/generic_leaf_target.mk b/include/mk/generic_leaf_target.mk
index 908d0b0004..c200803b55 100644
--- a/include/mk/generic_leaf_target.mk
+++ b/include/mk/generic_leaf_target.mk
@@ -1,24 +1,8 @@
-#
-# Generic leaf include Makefile.
-#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Generic leaf include Makefile.
+# Copyright (c) Linux Test Project, 2017
+# Copyright (C) 2009, Cisco Systems Inc.
# Ngie Cooper, July 2009
-#
include $(top_srcdir)/include/mk/env_post.mk
include $(top_srcdir)/include/mk/generic_leaf_target.inc
diff --git a/include/mk/generic_trunk_target.inc b/include/mk/generic_trunk_target.inc
index 82aece7c02..f9db7896a9 100644
--- a/include/mk/generic_trunk_target.inc
+++ b/include/mk/generic_trunk_target.inc
@@ -1,24 +1,8 @@
-#
-# Generic trunk rules include Makefile.
-#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Linux Test Project, 2010-2021
+# Generic trunk rules include Makefile.
+# Copyright (C) 2009, Cisco Systems Inc.
# Ngie Cooper, July 2009
-#
#
# generic_trunk_target
diff --git a/include/mk/generic_trunk_target.mk b/include/mk/generic_trunk_target.mk
index 576b32db39..e25f7bce24 100644
--- a/include/mk/generic_trunk_target.mk
+++ b/include/mk/generic_trunk_target.mk
@@ -1,24 +1,8 @@
-#
-# Generic trunk include Makefile.
-#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Generic trunk include Makefile.
+# Copyright (c) Linux Test Project, 2017
+# Copyright (C) 2009, Cisco Systems Inc.
# Ngie Cooper, July 2009
-#
include $(top_srcdir)/include/mk/env_post.mk
include $(top_srcdir)/include/mk/generic_trunk_target.inc
diff --git a/include/mk/lib.mk b/include/mk/lib.mk
index 3bf63bf9e8..cefb28c25d 100644
--- a/include/mk/lib.mk
+++ b/include/mk/lib.mk
@@ -1,27 +1,8 @@
-#
-# library include Makefile.
-#
-# Copyright (c) Linux Test Project, 2009-2020
-# Copyright (c) Cisco Systems Inc., 2009
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Ngie Cooper, July 2009
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Linux Test Project, 2009-2019
# Copyright (C) Cyril Hrubis <chrubis@suse.cz> 2012
-#
+# Copyright (c) Cisco Systems Inc., 2009
+# Ngie Cooper, July 2009
# Makefile to include for libraries.
diff --git a/include/mk/man.mk b/include/mk/man.mk
index c94af61b11..a642dfb35d 100644
--- a/include/mk/man.mk
+++ b/include/mk/man.mk
@@ -1,24 +1,7 @@
-#
-# Manpage include Makefile.
-#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Linux Test Project, 2010-2017
+# Copyright (C) 2009, Cisco Systems Inc.
# Ngie Cooper, July 2009
-#
ifeq ($(strip $(MANPREFIX)),)
$(error $$(MANPREFIX) not defined)
diff --git a/include/mk/module.mk b/include/mk/module.mk
index 3bb7350f1e..10914084cf 100644
--- a/include/mk/module.mk
+++ b/include/mk/module.mk
@@ -1,24 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
+# Copyright (c) Linux Test Project, 2014-2021
# Author: Alexey Kodanev <alexey.kodanev@oracle.com>
#
# Include it to build kernel modules.
# REQ_VERSION_MAJOR and REQ_VERSION_PATCH must be defined beforehand.
-#
$(if $(REQ_VERSION_MAJOR),,$(error You must define REQ_VERSION_MAJOR))
$(if $(REQ_VERSION_PATCH),,$(error You must define REQ_VERSION_MINOR))
diff --git a/include/mk/rules.mk b/include/mk/rules.mk
index 517863c04b..c7da6d37f9 100644
--- a/include/mk/rules.mk
+++ b/include/mk/rules.mk
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Linux Test Project, 2020-2022
+
target_rel_dir := $(if $(cwd_rel_from_top),$(cwd_rel_from_top)/,)
%.o: %.S
diff --git a/include/mk/sparse.mk b/include/mk/sparse.mk
index a86928393a..3390672c15 100644
--- a/include/mk/sparse.mk
+++ b/include/mk/sparse.mk
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Linux Test Project, 2021
# Rules to make sparse tool(s) for inclusion in lib and testcases Makefiles
SPARSE_DIR:= $(abs_top_builddir)/tools/sparse
diff --git a/include/mk/testcases.mk b/include/mk/testcases.mk
index bec8d8cc47..2609535ce7 100644
--- a/include/mk/testcases.mk
+++ b/include/mk/testcases.mk
@@ -1,24 +1,6 @@
-#
-# testcases include Makefile.
-#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Linux Test Project, 2009-2024
# Ngie Cooper, July 2009
-#
include $(top_srcdir)/include/mk/env_pre.mk
include $(top_srcdir)/include/mk/functions.mk
--
2.47.2
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 9+ messages in thread