From: Timothy Day Date: Tue, 21 Mar 2023 03:31:05 +0000 (+0000) Subject: LU-6142 build: add SPD/GPL license to build files X-Git-Tag: 2.15.55~19 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=59af6bbd329137398c7c195b2ae06b974ed77b92;p=fs%2Flustre-release.git LU-6142 build: add SPD/GPL license to build files Update the file header to have the SPDX license and use the standard format. Convert spaces to tabs. Test-Parameters: trivial Signed-off-by: Timothy Day Change-Id: Id02218aa5b435bc0de96a39d3daa53a83a51c857 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50347 Reviewed-by: James Simmons Reviewed-by: Oleg Drokin Reviewed-by: Andreas Dilger Reviewed-by: Shaun Tancheff Tested-by: jenkins Tested-by: Maloo --- diff --git a/LUSTRE-VERSION-GEN b/LUSTRE-VERSION-GEN index c261ea5..9696be8 100755 --- a/LUSTRE-VERSION-GEN +++ b/LUSTRE-VERSION-GEN @@ -1,4 +1,13 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# +# LUSTRE-VERSION-GEN +# +# Return lustre version string +# DEFAULT_VERSION=2.15.54 LVF=LUSTRE-VERSION-FILE @@ -7,31 +16,31 @@ LF=' ' if test -d ${GIT_DIR:-.git} -o -f .git && - VN=$(git describe --match "[0-9]*" --abbrev=7 HEAD 2>/dev/null) && - case "$VN" in - *$LF*) (exit 1) ;; - [0-9]*) - git update-index -q --refresh - test -z "$(git diff-index --name-only HEAD --)" || - VN="$VN-dirty" ;; - esac + VN=$(git describe --match "[0-9]*" --abbrev=7 HEAD 2>/dev/null) && + case "$VN" in + *$LF*) (exit 1) ;; + [0-9]*) + git update-index -q --refresh + test -z "$(git diff-index --name-only HEAD --)" || + VN="$VN-dirty" ;; + esac then - VN=$(echo "$VN" | sed -e 's/-/_/g'); + VN=$(echo "$VN" | sed -e 's/-/_/g'); elif test -r $LVF then - VN=$(sed -e 's/^LUSTRE_VERSION = //' <$LVF) + VN=$(sed -e 's/^LUSTRE_VERSION = //' <$LVF) else - VN="$DEFAULT_VERSION" + VN="$DEFAULT_VERSION" fi if test -r $LVF then - VC=$(sed -e 's/^LUSTRE_VERSION = //' <$LVF) + VC=$(sed -e 's/^LUSTRE_VERSION = //' <$LVF) else - VC=unset + VC=unset fi test "$VN" = "$VC" || { - echo "LUSTRE_VERSION = $VN" >$LVF + echo "LUSTRE_VERSION = $VN" >$LVF } echo $VN diff --git a/Makefile.in b/Makefile.in index 8644108..95650e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,3 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# +# Makefile.in +# +# Template to generate top-level Makefile +# + obj-m += @LDISKFS_SUBDIR@/ libcfs/ lnet/ obj-m += lustre/ diff --git a/autoMakefile.am b/autoMakefile.am index 8c2eeb7..7cfa53f 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -1,3 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# +# autoMakefile.am +# +# Used by automake to create the top-level autoMakefile.in, +# which is used by config.status to create the top-level +# autoMakefile +# + SUBDIRS := @LDISKFS_SUBDIR@ \ . \ @LUSTREIOKIT_SUBDIR@ \ diff --git a/autogen.sh b/autogen.sh index 40b05bf..e33c225 100644 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,15 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# +# autogen.sh +# +# Run various autotools, thereby creating the configure +# script and top-level make files +# + set -e pw="$PWD" for dir in libcfs lnet lustre snmp ; do diff --git a/configure.ac b/configure.ac index af63f99..7e26143 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# +# configure.ac +# +# Used by autoconf to create the configure script +# + AC_PREREQ([2.57]) AC_INIT([Lustre], m4_esyscmd_s([./LUSTRE-VERSION-GEN]), - [https://jira.whamcloud.com/], [lustre]) + [https://jira.whamcloud.com/], [lustre]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([config]) diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in index 9853707..77b01b8 100644 --- a/lustre-dkms.spec.in +++ b/lustre-dkms.spec.in @@ -1,3 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# +# lustre-dkms.spec.in +# +# spec file template for RHEL dkms package builds +# + %bcond_without servers %bcond_without zfs %bcond_with ldiskfs @@ -146,8 +156,8 @@ fi %post for POSTINST in /usr/lib/dkms/common.postinst; do if [ -f $POSTINST ]; then - $POSTINST %{module} %{version} - exit $? + $POSTINST %{module} %{version} + exit $? fi echo "WARNING: $POSTINST does not exist." done diff --git a/lustre-dkms_post-build.sh b/lustre-dkms_post-build.sh index 70c8302..a2f785d 100755 --- a/lustre-dkms_post-build.sh +++ b/lustre-dkms_post-build.sh @@ -1,4 +1,15 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# +# lustre-dkms_post-build.sh +# +# Script run after dkms build +# + +# # $1 : $module # $2 : $module_version # $3 : $kernelver @@ -15,11 +26,15 @@ # beginning of the DKMS build step when its content has to be on-target # customized during pre_build script. This can lead to incomplete list # of built Lustre kernel modules then to be saved for next DKMS install step. +# +# # Use this place to also save config.log that has been generated during # pre_build. # $7/$1/$2/$3/$5/log repository should have already been created to save # make.log and $kernel_config +# + mkdir -p "$7/$1/$2/$3/$5/log" cp -f "$7/$1/$2/build/config.log" "$7/$1/$2/$3/$5/log/config.log" 2>/dev/null cp -f "$7/$1/$2/build/config.h" \ diff --git a/lustre-dkms_pre-build.sh b/lustre-dkms_pre-build.sh index 11a1cb0..f75c567 100755 --- a/lustre-dkms_pre-build.sh +++ b/lustre-dkms_pre-build.sh @@ -1,4 +1,15 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# +# lustre-dkms_pre-build.sh +# +# Script run before dkms build +# + +# # $1 : $module # $2 : $module_version # $3 : $kernelver @@ -6,6 +17,7 @@ # $5 : $arch # $6 : $source_tree # $7 : $dkms_tree +# case $1 in lustre-client) diff --git a/lustre.spec.in b/lustre.spec.in index e21dc73..c7cd213 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -1,4 +1,12 @@ -# lustre.spec +# SPDX-License-Identifier: GPL-2.0 + +# +# This file is part of Lustre, http://www.lustre.org/ +# +# lustre.spec.in +# +# spec file template for RHEL package builds +# # Declare rpmbuild --with/--without parameters %bcond_without servers @@ -113,22 +121,22 @@ # Set the package name prefix %if %{undefined lustre_name} %if %{with servers} - %global lustre_name lustre + %global lustre_name lustre %else - %global lustre_name lustre-client + %global lustre_name lustre-client %endif %endif %if %{with lustre_modules} %if %{undefined kmoddir} %if %{defined kernel_module_package_moddir} - %global kmoddir %{kernel_module_package_moddir} + %global kmoddir %{kernel_module_package_moddir} %else - %if %{defined suse_kernel_module_package} - %global kmoddir updates - %else - %global kmoddir extra - %endif + %if %{defined suse_kernel_module_package} + %global kmoddir updates + %else + %global kmoddir extra + %endif %endif %endif