Skip to content

Commit

Permalink
2376: turbo/issue-2033 - Remove the 'remove modules.* file(s) after m…
Browse files Browse the repository at this point in the history
…odules installed.

Exclude the /lib/modules/*/modules.* files - they are regenerated
at module pkg install by depmod.
  • Loading branch information
FransUrbo committed Mar 30, 2015
1 parent bbb83b5 commit 28f7f3d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 1 addition & 7 deletions module/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@; \
Expand Down
6 changes: 6 additions & 0 deletions scripts/kmodtool
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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}/
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 28f7f3d

Please sign in to comment.