From 5c7c0a33a48081a0ebcdc06c123a6ebe868f9d5f Mon Sep 17 00:00:00 2001 From: Timothy Day Date: Sat, 9 Dec 2023 21:54:41 +0000 Subject: [PATCH] LU-16751 build: remove symlinks and add SPDX Remove commit-msg and prepare-commit-msg links in the build/ directory. Add proper headers and SPDX to the remaining files in build/. Test-Parameters: trivial Fixes: 25c93758d6 ("LU-1199 build: Clean out the build directory") Signed-off-by: Timothy Day Change-Id: I649ed60f5541be2832555efa2e0cf64cd1a5c67c Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/53396 Reviewed-by: Oleg Drokin Reviewed-by: Arshad Hussain Reviewed-by: Andreas Dilger Tested-by: jenkins Tested-by: Maloo --- build/Makefile | 9 ++++++--- build/Rules.in | 17 +++++------------ build/autoMakefile.am | 11 ++++++++++- build/commit-msg | 1 - build/prepare-commit-msg | 1 - 5 files changed, 21 insertions(+), 18 deletions(-) delete mode 120000 build/commit-msg delete mode 120000 build/prepare-commit-msg diff --git a/build/Makefile b/build/Makefile index b5f2f69..2f767ae 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,12 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0 + # -# There are four ways this Makefile can be called: +# This file is part of Lustre, http://www.lustre.org/ # +# build/Makefile # -# 1. As a subdirectory from the toplevel, for automake +# There are four ways this Makefile can be called: # +# 1. As a subdirectory from the toplevel, for automake # 2. A wrapper around the kernel's makefile when building modules, to # possibly override the .config file -# # 3. At configure time, as the toplevel module dir for building # kernel tests # diff --git a/build/Rules.in b/build/Rules.in index 38f5e14..a7960c7 100644 --- a/build/Rules.in +++ b/build/Rules.in @@ -1,19 +1,12 @@ -# Directories building kernel modules should have two files: -# -# Makefile.in: +# SPDX-License-Identifier: GPL-2.0 + # -# MODULES := -# -objs := file1.o file2.o file3.o -# @INCLUDE_RULES@ +# This file is part of Lustre, http://www.lustre.org/ # -# and autoMakefile.am: +# build/Rules.in # -# if MODULES -# modulefs_DATA = $(KMODEXT) -# endif +# Rules file for the kernel-related autoconf tests. # -# DIST_SOURCES = $(-objs:.o=.c) -# MOSTLYCLEANFILES = *.o *.ko *.mod.c ifeq ($(PATCHLEVEL),) diff --git a/build/autoMakefile.am b/build/autoMakefile.am index 5863e26..9b24284 100644 --- a/build/autoMakefile.am +++ b/build/autoMakefile.am @@ -1,5 +1,14 @@ -MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ +# SPDX-License-Identifier: GPL-2.0 +# +# This file is part of Lustre, http://www.lustre.org/ +# +# build/autoMakefile.am +# # Override the default distclean, which removes Makefile +# + +MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ + distclean: distclean-recursive @true diff --git a/build/commit-msg b/build/commit-msg deleted file mode 120000 index 37bc6b0..0000000 --- a/build/commit-msg +++ /dev/null @@ -1 +0,0 @@ -../contrib/git-hooks/commit-msg \ No newline at end of file diff --git a/build/prepare-commit-msg b/build/prepare-commit-msg deleted file mode 120000 index 9526639..0000000 --- a/build/prepare-commit-msg +++ /dev/null @@ -1 +0,0 @@ -../contrib/git-hooks/prepare-commit-msg \ No newline at end of file -- 1.8.3.1