From 6297b07d897c33aa01e0e338bede728c95c0b8ee Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 22 Aug 2024 17:04:21 +0100 Subject: [PATCH] build: pass MODULE_DIRECTORY as arg to setup-rootfs.sh ... just like the other 5 args passed to the script. Signed-off-by: Emil Velikov Reviewed-by: Lucas De Marchi Link: https://github.com/kmod-project/kmod/pull/86 Signed-off-by: Lucas De Marchi --- Makefile.am | 2 +- testsuite/setup-rootfs.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 6423bc27..4d8fa74a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,7 +168,7 @@ EXTRA_DIST += testsuite/setup-rootfs.sh MODULE_PLAYGROUND = testsuite/module-playground ROOTFS = testsuite/rootfs ROOTFS_PRISTINE = $(top_srcdir)/testsuite/rootfs-pristine -CREATE_ROOTFS = $(AM_V_GEN) MODULE_DIRECTORY=$(module_directory) $(top_srcdir)/testsuite/setup-rootfs.sh $(ROOTFS_PRISTINE) $(ROOTFS) $(MODULE_PLAYGROUND) $(top_builddir)/config.h $(sysconfdir) +CREATE_ROOTFS = $(AM_V_GEN) $(top_srcdir)/testsuite/setup-rootfs.sh $(ROOTFS_PRISTINE) $(ROOTFS) $(MODULE_PLAYGROUND) $(top_builddir)/config.h $(sysconfdir) $(module_directory) build-module-playground: $(AM_V_GEN)if test "$(top_srcdir)" != "$(top_builddir)"; then \ diff --git a/testsuite/setup-rootfs.sh b/testsuite/setup-rootfs.sh index 31b32df9..4f1feb78 100755 --- a/testsuite/setup-rootfs.sh +++ b/testsuite/setup-rootfs.sh @@ -7,6 +7,7 @@ ROOTFS=$2 MODULE_PLAYGROUND=$3 CONFIG_H=$4 SYSCONFDIR=$5 +MODULE_DIRECTORY=$6 # create rootfs from rootfs-pristine -- 2.47.3