DORMANTno replies

[PATCH] testsuite: add Clear's mkosi configuration

From: Caio Marcelo de Oliveira Filho <hidden>
Date: 2018-02-08 23:08:33
Subsystem: the rest · Maintainer: Linus Torvalds

Adapted the mkosi.build script to account for not building
test-modules in Clear. It doesn't have the headers available yet.
---
 testsuite/mkosi/mkosi.build |  9 +++++++--
 testsuite/mkosi/mkosi.clear | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 testsuite/mkosi/mkosi.clear
diff --git a/testsuite/mkosi/mkosi.build b/testsuite/mkosi/mkosi.build
index 53fc797..8ed54bb 100755
--- a/testsuite/mkosi/mkosi.build
+++ b/testsuite/mkosi/mkosi.build
@@ -29,8 +29,13 @@ rm -rf build
 mkdir build
 cd build
 
-kdir=$(find_kdir)
-IFS=/ read _ _ _ kver _ <<<"$kdir"
+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
 
 ../autogen.sh c
 make -j
diff --git a/testsuite/mkosi/mkosi.clear b/testsuite/mkosi/mkosi.clear
new file mode 100644
index 0000000..6d87514
--- /dev/null
+++ b/testsuite/mkosi/mkosi.clear
@@ -0,0 +1,19 @@
+[Distribution]
+Distribution=clear
+Release=latest
+
+[Output]
+Output = clear-image.raw
+
+[Packages]
+Packages=
+	os-core-update
+BuildPackages=
+	os-core-dev
+
+[Partitions]
+RootSize = 5G
+
+[Host]
+# This is where swupd-extract is usually installed.
+ExtraSearchPaths=$SUDO_HOME/go/bin
\ No newline at end of file
-- 
2.16.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help