scripts/setup-modules.sh: remove autotools w/a

With autotools one can do in and out of tree builds. Since we're meson
only these days, we can drop the in-tree path.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/356
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>

diff --git a/scripts/setup-modules.sh b/scripts/setup-modules.sh
index 62eee6f31f5b99bff7be78faca00d4a85b0e305c..7713cfd45fe546068ed3cceb819a8810863addf5 100755 (executable)
--- a/scripts/setup-modules.sh
+++ b/scripts/setup-modules.sh
@@ -3,14 +3,10 @@
 set -euo pipefail
 
 SRCDIR=$1
-BUILDDIR=$2
-MODULE_PLAYGROUND=$3
+MODULE_PLAYGROUND=$2
 
-# TODO: meson allows only out of tree builds
-if test "$SRCDIR" != "$BUILDDIR"; then
-    mkdir -p "$MODULE_PLAYGROUND"
-    cp --archive "$SRCDIR/$MODULE_PLAYGROUND/"* "$MODULE_PLAYGROUND/"
-fi
+mkdir -p "$MODULE_PLAYGROUND"
+cp --archive "$SRCDIR/$MODULE_PLAYGROUND/"* "$MODULE_PLAYGROUND/"
 
 export MAKEFLAGS=${MAKEFLAGS-"-j$(nproc)"}
 "${MAKE-make}" -C "$PWD/$MODULE_PLAYGROUND" modules

diff --git a/testsuite/meson.build b/testsuite/meson.build
index 6bc9186f60e4664b08284f113a9c93a8b65d2081..b4810aedd75800cf7ce6efd4267ae57e175d325d 100644 (file)
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -7,7 +7,6 @@ build_module_playground = custom_target(
   command : [
     setup_modules,
     meson.project_source_root(),
-    meson.project_build_root(),
     'testsuite/module-playground', # do not prepend source/build root
   ],
   # The command ensures we don't do extra work, so the missing output token file