From d2147de319b33a51f0694fd008e2e6a4dfcb47b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dr=2E=20Christian=20Kohlsch=C3=BCtter?= Date: Sat, 8 Feb 2025 01:38:58 +0100 Subject: [PATCH] Fix "make install" with DESTDIR set (#16995) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "DESTDIR=/path/to/target/root/ make install" may fail when installing to a root that contains an existing lib/modules structure. When run as root we may even affect the wrong kernel (the build system's one, or, if running a different version, some other directory in /lib/modules, but not the desired one installed in DESTDIR). Add a missing reference to the INSTALL_MOD_PATH root when calling "depmod" during "make install" Also add a switch "DONT_DELETE_MODULES_FILES=1" that skips the removal of files named "modules.*" prior to running depmod. Signed-off-by: Christian Kohlschütter Closes #16994 Reviewed-by: Rob Norris Reviewed-by: Brian Behlendorf Reviewed-by: Tony Hutter --- module/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/Makefile.in b/module/Makefile.in index f76e94afa410..a65cbfce1a90 100644 --- a/module/Makefile.in +++ b/module/Makefile.in @@ -93,7 +93,7 @@ modules_install-Linux: modules_uninstall-Linux-legacy $(if @KERNEL_ARCH@,ARCH=@KERNEL_ARCH@) \ KERNELRELEASE=@LINUX_VERSION@ @# Remove extraneous build products when packaging - if [ -n "$(DESTDIR)" ]; then \ + if [ -n "$(DESTDIR)" ] && [ "$(DONT_DELETE_MODULES_FILES)" != "1" ]; then \ find $(KMODDIR) -name 'modules.*' -delete; \ fi @# Debian ships tiny fake System.map files that are @@ -106,7 +106,7 @@ modules_install-Linux: modules_uninstall-Linux-legacy { [ -f "$$sysmap" ] && [ $$(wc -l < "$$sysmap") -ge 100 ]; } || \ sysmap=$(INSTALL_MOD_PATH)/usr/lib/debug/boot/System.map-@LINUX_VERSION@; \ if [ -f $$sysmap ]; then \ - depmod -ae -F $$sysmap @LINUX_VERSION@; \ + depmod -ae -F $$sysmap @LINUX_VERSION@ -b $(INSTALL_MOD_PATH)/; \ fi modules_install-FreeBSD: