It's not being actively used, so drop it. Signed-off-by: Lucas De Marchi <lucas.de.marchi@xxxxxxxxx> --- Makefile.am | 10 ---------- configure.ac | 1 - testsuite/mkosi/.gitignore | 3 --- testsuite/mkosi/mkosi.arch | 26 ------------------------ testsuite/mkosi/mkosi.build | 38 ------------------------------------ testsuite/mkosi/mkosi.clear | 20 ------------------- testsuite/mkosi/mkosi.fedora | 28 -------------------------- 7 files changed, 126 deletions(-) delete mode 100644 testsuite/mkosi/.gitignore delete mode 100644 testsuite/mkosi/mkosi.arch delete mode 100755 testsuite/mkosi/mkosi.build delete mode 100644 testsuite/mkosi/mkosi.clear delete mode 100644 testsuite/mkosi/mkosi.fedora diff --git a/Makefile.am b/Makefile.am index 59dcaaf..6d21ad2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index 372819d..bfabbaa 100644 --- a/configure.ac +++ b/configure.ac @@ -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 index 0e0981a..0000000 --- a/testsuite/mkosi/.gitignore +++ /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 index ace5d95..0000000 --- a/testsuite/mkosi/mkosi.arch +++ /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 index 53fc797..0000000 --- a/testsuite/mkosi/mkosi.build +++ /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 index 03ba2f0..0000000 --- a/testsuite/mkosi/mkosi.clear +++ /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 index 7a2ee5e..0000000 --- a/testsuite/mkosi/mkosi.fedora +++ /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 -- 2.43.0