From: Emil Velikov Date: Mon, 2 Sep 2024 17:58:35 +0000 (+0100) Subject: testsuite: correct the default KDIR X-Git-Tag: v34~472 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27ff727326663730215c9b039812f1eb216f5e9a;p=thirdparty%2Fkmod.git testsuite: correct the default KDIR Honor the user-provided module directory. At the moment things work, because distros have compatibility /lib -> /usr/lib symlink. While in there, avoid the use of deprecated backtick (shell) notation. Signed-off-by: Emil Velikov Link: https://github.com/kmod-project/kmod/pull/86 Signed-off-by: Lucas De Marchi --- diff --git a/Makefile.am b/Makefile.am index cc23aaa3..543c74f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -176,7 +176,7 @@ build-module-playground: mkdir -p testsuite/ && \ cp -r $(top_srcdir)/$(MODULE_PLAYGROUND) $(top_builddir)/$(MODULE_PLAYGROUND); \ fi - $(MAKE) -C $(MODULE_PLAYGROUND) + MODULE_DIRECTORY=$(module_directory) $(MAKE) -C $(MODULE_PLAYGROUND) rootfs: build-module-playground diff --git a/testsuite/module-playground/Makefile b/testsuite/module-playground/Makefile index 4469c97c..b9d9e1f4 100644 --- a/testsuite/module-playground/Makefile +++ b/testsuite/module-playground/Makefile @@ -1,4 +1,4 @@ -KDIR ?= $(module_prefix)/lib/modules/`uname -r`/build +KDIR ?= $(MODULE_DIRECTORY)/$$(uname -r)/build ARCH_SPECIFIC_MODULES := mod-simple-x86_64.ko mod-simple-i386.ko mod-simple-sparc64.ko