X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2FRules.in;h=38f5e14e781e6399ceb2487def52179e3f291686;hp=dcfa4928750b0e3d9cf8244fd27f6276f69734b2;hb=0d27288609dbebca431d2be7c79397a14ab7d84c;hpb=8d04ff54e6fc1cf5cd4ea92097fadbe546910d17

diff --git a/build/Rules.in b/build/Rules.in
index dcfa492..38f5e14 100644
--- a/build/Rules.in
+++ b/build/Rules.in
@@ -8,10 +8,6 @@
 #
 # and autoMakefile.am:
 #
-# if LIBLUSTRE
-# <liblustre rules>
-# endif
-#
 # if MODULES
 # modulefs_DATA = <module-name>$(KMODEXT)
 # endif
@@ -23,31 +19,6 @@ 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) ; \
@@ -60,9 +31,11 @@ else
 include @LINUX_CONFIG@
 
 EXTRA_CFLAGS := $(EXTRA_PRE_CFLAGS)
-EXTRA_CFLAGS += @EXTRA_KCFLAGS@ @UML_CFLAGS@ @CFLAGS@
+EXTRA_CFLAGS += @EXTRA_KCFLAGS@ @CFLAGS@
 EXTRA_CFLAGS += $(EXTRA_POST_CFLAGS)
 
-obj-m := $(patsubst %,%.o,$(MODULES))
+KBUILD_EXTRA_SYMBOLS += @EXTRA_SYMBOLS@
+
+obj-m += $(patsubst %,%.o,$(MODULES))
 
 endif # PATCHLEVEL