X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2FRules.in;h=dcfa4928750b0e3d9cf8244fd27f6276f69734b2;hp=19862f2e73f1fc4315af2e31ae0a598cb96ea529;hb=1ba7eb520d6f50908985b45cb1aecad83bdf9c63;hpb=01fc8697ada2cf975205fa2b1dd16b6415ceea29

diff --git a/build/Rules.in b/build/Rules.in
index 19862f2..dcfa492 100644
--- a/build/Rules.in
+++ b/build/Rules.in
@@ -23,6 +23,31 @@ ifeq ($(PATCHLEVEL),)
 
 include autoMakefile
 
+# The kernel ABI files for the nonfree modules.
+KABIS := $(NONFREE_MODULES:%$(KMODEXT)=%.kabi)
+
+all: archive-nonfree-modules
+
+# Where to archive the nonfree modules for binary distribution.
+# If this directory has a colon in it, SSH/SCP are used to go out on the network.
+nonfreedir := $$HOME/nonfree
+#nonfreedir := moraine.clusterfs.com:/home/lustre-nonfree
+
+# Put the nonfree modules and corresponding KABI files into the binary
+# archive.  We assume that if the CVS subdirectory doesn't exist, we
+# don't want to archive.
+archive-nonfree-modules: $(KABIS) $(NONFREE_MODULES)
+	test -d CVS || exit 0; \
+	list="$(NONFREE_MODULES)"; for mod in $$list; do \
+	  perl $(top_srcdir)/build/kabi -v archive $(nonfreedir) $$mod || exit $$?; \
+	done
+
+# Generate the Kernel ABI files for the nonfree modules.
+$(KABIS): $(NONFREE_MODULES)
+	for mod in $(NONFREE_MODULES); do \
+	  CC="$(CC)" perl $(top_srcdir)/build/kabi --with-linux="$(LINUX)" module $$mod || exit $$?; \
+	done
+
 fix-kext-ownership:
 	@if test -d $(DESTDIR)$(kextdir) ; then \
 		echo chown -R root:wheel $(DESTDIR)$(kextdir) ; \
@@ -35,19 +60,9 @@ else
 include @LINUX_CONFIG@
 
 EXTRA_CFLAGS := $(EXTRA_PRE_CFLAGS)
-EXTRA_CFLAGS += @EXTRA_KCFLAGS@ @UML_CFLAGS@
+EXTRA_CFLAGS += @EXTRA_KCFLAGS@ @UML_CFLAGS@ @CFLAGS@
 EXTRA_CFLAGS += $(EXTRA_POST_CFLAGS)
 
 obj-m := $(patsubst %,%.o,$(MODULES))
 
-ifeq ($(PATCHLEVEL),4)
-# 2.4 rules
-O_TARGET := $(firstword $(obj-m))
-obj-y := $($(firstword $(MODULES))-objs)
-export-objs := $(obj-y) $(filter-out $(O_TARGET),$(obj-m))
-include $(TOPDIR)/Rules.make
-$(MODINCL)/%.ver: %.c
-	@true
 endif # PATCHLEVEL
-
-endif # KERNELRELEASE