X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=build%2FMakefile;h=5304d7a2f9c13f951f2ecc63b4f58fc5cdb669b1;hb=4de9793654ec1b2f08d93f74f7391c4245ab8769;hp=5efb738e51113ed2f9715138d0e7b30b7fa31550;hpb=8d04ff54e6fc1cf5cd4ea92097fadbe546910d17;p=fs%2Flustre-release.git diff --git a/build/Makefile b/build/Makefile index 5efb738..5304d7a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,7 +1,7 @@ # # 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 @@ -10,8 +10,6 @@ # 3. At configure time, as the toplevel module dir for building # kernel tests # -# 4. At configure time, to determine the kernel's idea of $(ARCH) -# ifeq ($(PATCHLEVEL),) @@ -32,24 +30,14 @@ endif # LUSTRE_LINUX_CONFIG else # PATCHLEVEL -# case 3 - +# case #3 ifneq ($(LUSTRE_KERNEL_TEST),) +# extra-y works prior to 5.10 extra-y = $(LUSTRE_KERNEL_TEST) +# always-y works since 5.6 +always-y = $(LUSTRE_KERNEL_TEST) endif obj-m := conftest.o endif # PATCHLEVEL - -# case 4 - -echoarch: - echo $(ARCH) >$(ARCHFILE) - -TESTS := $(wildcard commit.*) -check-commit: - SHELL="$(SHELL)" $(SHELL) test-commit-msg.sh $(TESTS) - -check: check-commit -.PHONY: check-commit