]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
testsuite: drop mkosi
authorLucas De Marchi <lucas.de.marchi@gmail.com>
Fri, 2 Feb 2024 18:36:28 +0000 (12:36 -0600)
committerLucas De Marchi <lucas.de.marchi@gmail.com>
Fri, 2 Feb 2024 18:54:04 +0000 (12:54 -0600)
It's not being actively used, so drop it.

Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Makefile.am
configure.ac
testsuite/mkosi/.gitignore [deleted file]
testsuite/mkosi/mkosi.arch [deleted file]
testsuite/mkosi/mkosi.build [deleted file]
testsuite/mkosi/mkosi.clear [deleted file]
testsuite/mkosi/mkosi.fedora [deleted file]

index 59dcaaf1ccf981e3a1fad98c6ffe9792abf43c9d..6d21ad2146185b3d6a6656208e3ef024819e6543 100644 (file)
@@ -416,13 +416,3 @@ tar: kmod-$(VERSION).tar.xz kmod-$(VERSION).tar.sign
 
 tar-sync: kmod-$(VERSION).tar.xz kmod-$(VERSION).tar.sign
        kup put kmod-$(VERSION).tar.xz  kmod-$(VERSION).tar.sign /pub/linux/utils/kernel/kmod/
-
-# ------------------------------------------------------------------------------
-# mkosi
-# ------------------------------------------------------------------------------
-
-DISTRO ?= "arch"
-
-mkosi:
-       -$(MKDIR_P) $(top_srcdir)/testsuite/mkosi/mkosi.cache
-       $(MKOSI) -C $(top_srcdir)/testsuite/mkosi --build-sources ../../ --default mkosi.${DISTRO} -fi
index 372819debf5881a7de88d55ea734f613b193b4cf..bfabbaa880888a3897eacbfb91d22a1311b27806 100644 (file)
@@ -33,7 +33,6 @@ AC_PROG_MKDIR_P
 AC_PROG_LN_S
 PKG_PROG_PKG_CONFIG
 AC_PATH_PROG([XSLTPROC], [xsltproc])
-AC_PATH_PROG([MKOSI], [mkosi])
 
 AC_PROG_CC_C99
 
diff --git a/testsuite/mkosi/.gitignore b/testsuite/mkosi/.gitignore
deleted file mode 100644 (file)
index 0e0981a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/*-image.raw*
-/.mkosi-*
-/mkosi.cache
diff --git a/testsuite/mkosi/mkosi.arch b/testsuite/mkosi/mkosi.arch
deleted file mode 100644 (file)
index ace5d95..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-[Distribution]
-Distribution=arch
-Release=(rolling)
-
-[Output]
-Output = arch-image.raw
-
-[Packages]
-Packages = valgrind
-BuildPackages =
-       automake
-       gcc
-       git
-       make
-       pkg-config
-       python2
-       python2-future
-       autoconf
-       gtk-doc
-       docbook-xml
-       docbook-xsl
-       linux-headers
-       openssl
-
-[Partitions]
-RootSize = 3G
diff --git a/testsuite/mkosi/mkosi.build b/testsuite/mkosi/mkosi.build
deleted file mode 100755 (executable)
index 53fc797..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash -ex
-
-function find_kdir() {
-    local kdirs=(/usr/lib/modules/*/build/Makefile /usr/src/kernels/*/Makefile)
-    local kdir=""
-
-    for f in "${kdirs[@]}"; do
-        if [ -f "$f" ]; then
-            kdir=$f
-            break
-        fi
-    done
-
-    if [ -z "$kdir" ]; then
-        printf '==> Unable to find kernel headers to build modules for tests\n' >&2
-        exit 1
-    fi
-
-    kdir=${kdir%/Makefile}
-
-    echo $kdir
-}
-
-if [ -f configure ]; then
-    make distclean
-fi
-
-rm -rf build
-mkdir build
-cd build
-
-kdir=$(find_kdir)
-IFS=/ read _ _ _ kver _ <<<"$kdir"
-
-../autogen.sh c
-make -j
-make check KDIR="$kdir" KVER="$kver"
-make install
diff --git a/testsuite/mkosi/mkosi.clear b/testsuite/mkosi/mkosi.clear
deleted file mode 100644 (file)
index 03ba2f0..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-[Distribution]
-Distribution=clear
-Release=latest
-
-[Output]
-Output = clear-image.raw
-
-[Packages]
-Packages=
-       os-core-update
-BuildPackages=
-       os-core-dev
-       linux-dev
-
-[Partitions]
-RootSize = 5G
-
-[Host]
-# This is where swupd-extract is usually installed.
-ExtraSearchPaths=$SUDO_HOME/go/bin
\ No newline at end of file
diff --git a/testsuite/mkosi/mkosi.fedora b/testsuite/mkosi/mkosi.fedora
deleted file mode 100644 (file)
index 7a2ee5e..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-[Distribution]
-Distribution=fedora
-Release=29
-
-[Output]
-Output = fedora-image.raw
-
-[Packages]
-Packages = valgrind
-BuildPackages =
-       autoconf
-       automake
-       gcc
-       git
-       gtk-doc
-       kernel-devel
-       libtool
-       libxslt
-       make
-       pkgconf-pkg-config
-       xml-common
-       libzstd-devel
-       xz-devel
-       zlib-devel
-       openssl-devel
-
-[Partitions]
-RootSize = 2G