On 11. 07. 23, 17:34, Michal Suchanek wrote:
Some distributions aim at not shipping any files in / ustside of usr.
The path under which kernel modules are instaleld is hardcoded to /lib
which conflicts with this goal.
When kmod provides the config command use it to determine the correct
module installation prefix.
On kmod that does not provide the command / is used as before.
Signed-off-by: Michal Suchanek <msuchanek@xxxxxxx>
---
Makefile | 4 +++-
scripts/depmod.sh | 8 ++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 47690c28456a..b05d696f06bd 100644
--- a/Makefile
+++ b/Makefile
@@ -1165,7 +1165,9 @@ export INSTALL_DTBS_PATH ?= $(INSTALL_PATH)/dtbs/$(KERNELRELEASE)
# makefile but the argument can be passed to make if needed.
#
-MODLIB = $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
+export KERNEL_MODULE_PREFIX := $(shell kmod config | jq -r .module_prefix)
echo -e 'KERNEL_MODULE_PREFIX := $(shell kmod config | jq -r
.module_prefix)\nall:'|make -f -
invalid command 'config'
parse error: Invalid numeric literal at line 1, column 5
I think you should pipe kmod's 2> /dev/null to support older kmod. Ah,
but you'd need 2> /dev/null for jq too. That would not be good as jq
might not be installed and a user wouldn't see the error. So instead, I
would do:
$(shell kmod config &> /dev/null && kmod config | jq -r .module_prefix)
thanks,
--
js
suse labs
