From 32ffd9e859c962202a0944838a34d165d953fa0d Mon Sep 17 00:00:00 2001
From: Turbo Fredriksson <turbo@bayour.com>
Date: Mon, 9 Jun 2014 22:03:52 +0200
Subject: [PATCH] 2376: turbo/issue-2033 - Remove the 'remove modules.* file(s)
 after modules installed.

Exclude the /lib/modules/*/modules.* files - they are regenerated
at module pkg install by depmod.
---
 module/Makefile.in | 8 +-------
 scripts/kmodtool   | 6 ++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/Makefile.in b/module/Makefile.in
index 686402b1fc4c..f1561eee6347 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -43,13 +43,7 @@ modules_install:
 	@# Install the kernel modules
 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
 		INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
-		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
-		KERNELRELEASE=@LINUX_VERSION@
-	@# Remove extraneous build products when packaging
-	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
-	if [ -n $$kmoddir ]; then \
-		find $$kmoddir -name 'modules.*' | xargs $(RM); \
-	fi
+		INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)
 	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
 	if [ -f $$sysmap ]; then \
 		depmod -ae -F $$sysmap @LINUX_VERSION@; \
diff --git a/scripts/kmodtool b/scripts/kmodtool
index ce3f042947a5..12deeb0afdb1 100755
--- a/scripts/kmodtool
+++ b/scripts/kmodtool
@@ -94,6 +94,7 @@ This package provides the akmod package for the ${kmodname} kernel modules.
 nohup ${prefix}/sbin/akmods --from-akmod-posttrans --akmod ${kmodname} &> /dev/null &
 
 %files -n akmod-${kmodname}
+%exclude /lib/modules/*/modules.*
 %defattr(-,root,root,-)
 %{_usrsrc}/akmods/*
 
@@ -126,6 +127,7 @@ ${kmodname} kernel module(s) for the newest kernel${dashvariant},
 to make sure you get it together with a new kernel.
 
 %files        -n kmod-${kmodname}${dashvariant}
+%exclude /lib/modules/*/modules.*
 %defattr(644,root,root,755)
 EOF
 }
@@ -191,6 +193,7 @@ EOF
 This package provides the ${kmodname} kernel modules built for the Linux
 kernel ${kernel_uname_r} for the %{_target_cpu} family of processors.
 %files        -n kmod-${kmodname}-${kernel_uname_r}
+%exclude /lib/modules/*/modules.*
 %defattr(644,root,root,755)
 %dir $prefix/lib/modules/${kernel_uname_r}/extra
 ${prefix}/lib/modules/${kernel_uname_r}/extra/${kmodname}/
@@ -234,6 +237,7 @@ which depend on the ${kmodname} kernel module.  It may optionally require
 the ${kmodname}-devel-<kernel> objects for the newest kernel.
 
 %files        -n kmod-${kmodname}-devel
+%exclude /lib/modules/*/modules.*
 %defattr(644,root,root,755)
 %{_usrsrc}/${kmodname}-%{version}
 EOF
@@ -293,6 +297,7 @@ This package provides objects and symbols required to build kernel modules
 which depend on the ${kmodname} kernel modules built for the Linux
 kernel ${kernel_uname_r} for the %{_target_cpu} family of processors.
 %files        -n kmod-${kmodname}-devel-${kernel_uname_r}
+%exclude /lib/modules/*/modules.*
 %defattr(644,root,root,755)
 %{_usrsrc}/${kmodname}-%{version}/${kernel_uname_r}
 
@@ -328,6 +333,7 @@ ${kmodname} kernel module(s) for the newest kernel${kernel_variant}.
 to make sure you get it together with a new kernel.
 
 %files        -n kmod-${kmodname}${kernel_variant}
+%exclude /lib/modules/*/modules.*
 %defattr(644,root,root,755)