[Buildroot] [git commit branch/2020.05.x] linux: run depmod only if modules directory exists

Peter Korsgaard peter at korsgaard.com
Sat Aug 29 17:42:17 UTC 2020


commit: https://git.buildroot.net/buildroot/commit/?id=9bc90b3d7878402a42840ab2beac20baff1264a3
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2020.05.x

If the modules directory that corresponds to the version of the kernel
being built has been deleted, don't try to run depmod, which will
obviously fail.

This can happen for instance when the modules are stripped from the main
root filesystem, and placed into a separate filesystem image, so that
the root filesystem and the kernel can be updated separately.

Signed-off-by: Paul Cercueil <paul at crapouillou.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
(cherry picked from commit 532fe9fb5788b0b2a2f25b2fd72e63f7c8c490d6)
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 linux/linux.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index bb4d511433..d51f06da0a 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -492,7 +492,8 @@ endef
 # Run depmod in a target-finalize hook, to encompass modules installed by
 # packages.
 define LINUX_RUN_DEPMOD
-	if grep -q "CONFIG_MODULES=y" $(LINUX_DIR)/.config; then \
+	if test -d $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED) \
+		&& grep -q "CONFIG_MODULES=y" $(LINUX_DIR)/.config; then \
 		$(HOST_DIR)/sbin/depmod -a -b $(TARGET_DIR) $(LINUX_VERSION_PROBED); \
 	fi
 endef


More information about the buildroot mailing list