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 <emil.l.velikov@gmail.com>
Reviewed-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/86
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>

diff --git a/Makefile.am b/Makefile.am
index 6423bc276f42481023d9da53817d29620195072a..4d8fa74aa2624e0d8b7089672d024111797d7914 100644 (file)
--- 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 31b32df9625e81e31828f15548ce26984aed578c..4f1feb78c9aec0df249fc6387f206e0dc0025321 100755 (executable)
--- 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