From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Wed, 10 Oct 2018 20:47:50 +0000 (-0700)
Subject: mkosi: allow Clear to use test modules
X-Git-Tag: v26~24
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fkmod.git;a=commitdiff_plain;h=8353284d83b4c0fd0389601fbfba5cd2863a661d

mkosi: allow Clear to use test modules

Now Clear has a bundle for the kernel headers, let's use it.
---

diff --git a/testsuite/mkosi/mkosi.build b/testsuite/mkosi/mkosi.build
index 8ed54bb..53fc797 100755
--- a/testsuite/mkosi/mkosi.build
+++ b/testsuite/mkosi/mkosi.build
@@ -29,13 +29,8 @@ rm -rf build
 mkdir build
 cd build
 
-if grep clear-linux-os /usr/lib/os-release; then
-    # Clear Linux doesn't have the dependencies for those yet.
-    echo "--disable-test-modules" > ../../.config.args
-else
-    kdir=$(find_kdir)
-    IFS=/ read _ _ _ kver _ <<<"$kdir"
-fi
+kdir=$(find_kdir)
+IFS=/ read _ _ _ kver _ <<<"$kdir"
 
 ../autogen.sh c
 make -j
diff --git a/testsuite/mkosi/mkosi.clear b/testsuite/mkosi/mkosi.clear
index 6d87514..03ba2f0 100644
--- a/testsuite/mkosi/mkosi.clear
+++ b/testsuite/mkosi/mkosi.clear
@@ -10,6 +10,7 @@ Packages=
 	os-core-update
 BuildPackages=
 	os-core-dev
+	linux-dev
 
 [Partitions]
 RootSize = 5G