diff options
| author | Brian Behlendorf <[email protected]> | 2011-07-19 21:44:07 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2011-07-20 09:38:51 -0700 |
| commit | fe0ed8f910c1e4288dc190546cfe98ecf545b547 (patch) | |
| tree | 453d1950c7044887431af52de1fdd147f657058d | |
| parent | cfc9a5c88f91f7b4d606fce89505e1f404691ea5 (diff) | |
Fix 'make install' overly broad 'rm'
When running 'make install' without DESTDIR set the module install
rules would mistakenly destroy the 'modules.*' files for ALL of
your installed kernels. This could lead to a non-functional system
for the alternate kernels because 'depmod -a' will only be run for
the kernel which was compiled against. This issue would not impact
anyone using the 'make <deb|rpm|pkg>' build targets to build and
install packages.
The fix for this issue is to only remove extraneous build products
when DESTDIR is set. This almost exclusively indicates we are
building packages and installed the build products in to a temporary
staging location. Additionally, limit the removal the unneeded
build products to the target kernel version.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #328
| -rw-r--r-- | module/Makefile.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/module/Makefile.in b/module/Makefile.in index d9f73c287..50cbb5891 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -37,7 +37,11 @@ modules_install: $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ INSTALL_MOD_PATH=$(DESTDIR) \ INSTALL_MOD_DIR=addon/zfs $@ - find $(DESTDIR)/lib/modules/ -name 'modules.*' | xargs $(RM) + @# Remove extraneous build products when packaging + if [ -n "$(DESTDIR)" ]; then \ + find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ + -name 'modules.*' | xargs $(RM); \ + fi sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ if [ -f $$sysmap ]; then \ depmod -ae -F $$sysmap @LINUX_VERSION@; \ |