Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3367 test: some fixes for lfsck test
[fs/lustre-release.git]
/
build
/
Makefile
diff --git
a/build/Makefile
b/build/Makefile
index
db3bd45
..
d00981f
100644
(file)
--- a/
build/Makefile
+++ b/
build/Makefile
@@
-1,15
+1,17
@@
#
#
-# There are three ways this Makefile can be called:
+# There are four ways this Makefile can be called:
+#
#
#
-#
# 1. As a subdirectory from the toplevel, for automake
#
# 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
+# 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
#
#
# 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),)
ifeq ($(PATCHLEVEL),)
@@
-21,6
+23,8
@@
include autoMakefile
else
# case #2
else
# case #2
+# Note that this comes from make -C $LINUX -f $LUSTRE/build/Makefile
+# so "include Makefile" below includes $LINUX/Makefile, not this file
include $(LUSTRE_LINUX_CONFIG)
include Makefile
include $(LUSTRE_LINUX_CONFIG)
include Makefile
@@
-31,17
+35,14
@@
else # PATCHLEVEL
# case 3
ifneq ($(LUSTRE_KERNEL_TEST),)
# case 3
ifneq ($(LUSTRE_KERNEL_TEST),)
-ifeq ($(PATCHLEVEL),4)
-all: $(LUSTRE_KERNEL_TEST)
-else
extra-y = $(LUSTRE_KERNEL_TEST)
endif
extra-y = $(LUSTRE_KERNEL_TEST)
endif
-endif
obj-m := conftest.o
obj-m := conftest.o
-ifeq ($(PATCHLEVEL),4)
-include $(TOPDIR)/Rules.make
-endif
-
endif # PATCHLEVEL
endif # PATCHLEVEL
+
+# case 4
+
+echoarch:
+ echo $(ARCH) >$(ARCHFILE)