16 changed files with 378 additions and 1398 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,19 @@
-/kmod-*.tar.xz
+/kmod-7.tar.xz
+/kmod-8.tar.xz
+/kmod-9.tar.xz
+/kmod-10.tar.xz
+/kmod-11.tar.xz
+/kmod-12.tar.xz
+/kmod-13.tar.xz
+/kmod-14.tar.xz
+/kmod-15.tar.xz
+/kmod-16.tar.xz
+/kmod-17.tar.xz
+/kmod-18.tar.xz
+/kmod-19.tar.xz
+/kmod-20.tar.xz
+/kmod-21.tar.xz
+/kmod-22.tar.xz
+/kmod-23.tar.xz
+/kmod-24.tar.xz
+/kmod-25.tar.xz
--- a/depmod.conf.dist
+++ b/depmod.conf.dist
@ -1,6 +0,0 @@
-#
-# depmod.conf
-#
-
-# override default search ordering for kmod packaging
-search updates extra built-in weak-updates
--- a/kmod.spec
+++ b/kmod.spec
@ -1,105 +1,25 @@
-# Fedora does not support CONFIG_MODVERSIONS. Without kabi support
-# weak-modules is useless at best, and can be actively harmful.
-# Since RHEL *does* support this and offers kabi support,
-# turn it on there by default.
-%if 0%{?rhel}
-%bcond_without weak_modules
-%bcond_without dist_conf
-%else
-%bcond_with weak_modules
-%bcond_with dist_conf
-%endif
-
-%bcond_without zlib
-%bcond_without xz
-%bcond_without zstd
-
 Name:		kmod
-Version:	34.2
-Release:	3%{?dist}
+Version:	25
+Release:	1%{?dist}
 Summary:	Linux kernel module management utilities

-# https://docs.fedoraproject.org/en-US/legal/license-field/#_no_effective_license_analysis
-# GPL-2.0-or-later:
-#   build-aux/compile
-#   build-aux/depcomp
-#   build-aux/ltmain.sh
-#   build-aux/ltmain.sh
-#   build-aux/missing
-#   build-aux/py-compile
-#   build-aux/test-driver
-#   m4/attributes.m4
-#   m4/features.m4
-#   tools
-# GPL-3.0-or-later:
-#   build-aux/config.guess
-#   build-aux/config.sub
-#   build-aux/git-version-gen
-#   libkmod/docs/gtk-doc.make
-#   m4/gtk-doc.m4
-# FSFUL:
-#   configure
-# FSFULLRWD:
-#   aclocal.m4
-#   libkmod/docs/Makefile.in
-#   m4/libtool.m4
-#   m4/lt~obsolete.m4
-#   m4/ltoptions.m4
-#   m4/ltsugar.m4
-#   m4/ltversion.m4
-#   Makefile.in
-# LGPL-2.1-only:
-#   libkmod/python/kmod/error.py
-#   libkmod/python/kmod/__init__.py
-#   libkmod/python/kmod/version.py
-#   libkmod/python/kmod/version.py.in
-# LGPL-2.1-or-later:
-#   config.h.in (no explicit license, the one in COPYING is assumed)
-#   libkmod
-#   man (no explicit license, the one in COPYING is assumed)
-#   shared
-#   shell-completion/bash/kmod
-#   testsuite
-# X11:
-#   build-aux/install-sh
-License:	GPL-2.0-or-later AND GPL-3.0-or-later AND FSFUL AND FSFULLRWD AND LGPL-2.1-only AND LGPL-2.1-or-later AND X11
-URL:		https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
+Group:		System Environment/Kernel
+License:	GPLv2+
+URL:		http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
 Source0:	https://www.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz
 Source1:	weak-modules
-Source2:	depmod.conf.dist
 Exclusiveos:	Linux

-BuildRequires:  gcc
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	chrpath
-%if %{with zlib}
 BuildRequires:	zlib-devel
-%endif
-%if %{with xz}
 BuildRequires:	xz-devel
-%endif
-BuildRequires:  scdoc gtk-doc
-BuildRequires:  openssl-devel
-BuildRequires:  make automake libtool
-%if %{with zstd}
-BuildRequires:  libzstd-devel
-%endif
+BuildRequires:  libxslt

 Provides:	module-init-tools = 4.0-1
 Obsoletes:	module-init-tools < 4.0-1
 Provides:	/sbin/modprobe

-%if "%{_sbindir}" == "%{_bindir}"
-# Compat symlinks for Requires in other packages.
-# We rely on filesystem to create the symlinks for us.
-Requires:       filesystem(unmerged-sbin-symlinks)
-Provides:       /usr/sbin/modprobe
-Provides:       /usr/sbin/modinfo
-Provides:       /usr/sbin/insmod
-Provides:       /usr/sbin/rmmod
-Provides:       /usr/sbin/lsmod
-Provides:       /usr/sbin/depmod
-%endif
-
 %description
 The kmod package provides various programs needed for automatic
 loading and unloading of modules under 2.6, 3.x, and later kernels, as well
@ -108,6 +28,8 @@ examples of loaded and unloaded modules.

 %package libs
 Summary:	Libraries to handle kernel module loading and unloading
+License:	LGPLv2+
+Group:		System Environment/Libraries

 %description libs
 The kmod-libs package provides runtime libraries for any application that
@ -115,6 +37,7 @@ wishes to load or unload Linux kernel modules from the running system.

 %package devel
 Summary:	Header files for kmod development
+Group:		Development/Libraries
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}

 %description devel
@ -122,47 +45,43 @@ The kmod-devel package provides header files used for development of
 applications that wish to load or unload Linux kernel modules.

 %prep
-%autosetup -p1
+%setup -q

 %build
-autoreconf --install
+export V=1
 %configure \
-  --with-openssl \
-%if %{with zlib}
  --with-zlib \
-%endif
-%if %{with xz}
-  --with-xz \
-%endif
-%if %{with zstd}
-  --with-zstd \
-%endif
-  --enable-debug
-
-%{make_build} V=1
+  --with-xz
+make %{?_smp_mflags}

 %install
-%{make_install}
-
-pushd $RPM_BUILD_ROOT%{_mandir}/man5
+make install DESTDIR=$RPM_BUILD_ROOT
+pushd $RPM_BUILD_ROOT/%{_mandir}/man5
 ln -s modprobe.d.5.gz modprobe.conf.5.gz
 popd

-find %{buildroot} -type f -name "*.la" -delete
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/modprobe
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/modinfo
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/insmod
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/rmmod
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/depmod
+ln -sf ../bin/kmod $RPM_BUILD_ROOT%{_sbindir}/lsmod

 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d

-%if %{with weak_modules}
-install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/weak-modules
-%endif
+mkdir -p $RPM_BUILD_ROOT/sbin
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/weak-modules

-%if %{with dist_conf}
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf
-%endif
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig

 %files
+%defattr(-,root,root,-)
 %dir %{_sysconfdir}/depmod.d
 %dir %{_sysconfdir}/modprobe.d
 %dir %{_prefix}/lib/modprobe.d
@ -173,23 +92,14 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf
 %{_sbindir}/rmmod
 %{_sbindir}/lsmod
 %{_sbindir}/depmod
-%if %{with weak_modules}
 %{_sbindir}/weak-modules
-%endif
 %{_datadir}/bash-completion/
-%{_datadir}/fish/vendor_functions.d/*
-%{_datadir}/zsh/site-functions/*
-%if %{with dist_conf}
-%{_sysconfdir}/depmod.d/dist.conf
-%endif
-%{_datadir}/pkgconfig/kmod.pc
-%attr(0644,root,root) %{_mandir}/man5/mod*.d*.5*
-%attr(0644,root,root) %{_mandir}/man5/depmod.d.5*
-%{_mandir}/man5/modprobe.conf.5*
+%attr(0644,root,root) %{_mandir}/man5/*.5*
 %attr(0644,root,root) %{_mandir}/man8/*.8*
-%doc NEWS README.md
+%doc NEWS README TODO

 %files libs
+%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_libdir}/libkmod.so.*

@ -199,150 +109,6 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf
 %{_libdir}/libkmod.so

 %changelog
-* Wed Aug 13 2025 Zamir SUN <zsun@fedoraproject.org> - 34.2-3
- Rebuild to switch gating to TMT.
- Resolves: rhbz#2382934
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 34.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Mar 31 2025 Josh Boyer <jwboyer@fedoraproject.org> - 34.2-1
- New upstream v34.2
- Resolves: rhbz#2355680
-
-* Sat Mar 08 2025 Josh Boyer <jwboyer@fedoraproject.org> - 34.1-1
- New upstream v34.1
- Resolves: rhbz#2350269
-
-* Mon Feb 24 2025 Josh Boyer <jwboyer@fedoraproject.org>
- New upstream v34
- Resolves: rhbz#2347049
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 33-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 33-2
- Rebuilt for the bin-sbin merge (2nd attempt)
-
-* Thu Aug 15 2024 Eugene Syromiatnikov <esyr@redhat.com> - 33-1
- New upstream v33
- Resolves: rhbz#2268030
-
-* Mon Aug 12 2024 Eugene Syromiatnikov <esyr@redhat.com> - 31-8
- weak-modules: use either zcat or xzcat based on symvers file extension
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 31-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Apr 11 2024 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 31-6
- Prepare for %%_bindir==%%_sbindir
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 31-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 31-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Dec 01 2023 Eugene Syromiatnikov <esyr@redhat.com> - 31-3
- migrated to SPDX license
-
-* Thu Nov 09 2023 Josh Boyer <jwboyer@fedoraproject.org> - 31-2
- Add upstream patches to enable SHA3 support
- New upstream v31
- Resolves: rhbz#2241394
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 30-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue May 09 2023 Eugene Syromiatnikov <esyr@redhat.com> - 30-5
- Add symvers.xz support to weak-modules
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 30-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Dec 17 2022 Florian Weimer <fweimer@redhat.com> - 30-3
- Port configure script to C99
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 30-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jul  4 2022 Yauheni Kaliuta <ykaliuta@redhat.com> - 30-1
- New upstream v30
- Resolves: rhbz#2102796
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 29-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 29-6
- Rebuilt with OpenSSL 3.0.0
-
-* Tue Aug 10 2021 Yauheni Kaliuta <ykaliuta@redhat.com> - 29-5
- kmod.spec: enable debug
- weak-modules: compare_initramfs_modules: exit on pushd/popd failures
- weak-modules: split modules into array with read -a
- Add default config file, /etc/depmod.d/dist.conf
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 29-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 08 2021 Neal Gompa <ngompa13@gmail.com> - 29-3
- Fix conditional to only install weak-modules for RHEL
-
-* Tue May 25 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 29-2
- Rebuild for weak-modules drop in Fedora
-
-* Mon May 24 2021 Justin M. Forbes <jforbes@fedoraproject.org>
- Remove weak-modules for Fedora as it causes problems.
-
-* Fri May 14 2021 Josh Boyer <jwboyer@fedoraproject.org> - 29-1
- New upstream v29
- Resolves: rhbz#1962980
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 28-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 07 2021 Josh Boyer <jwboyer@fedoraproject.org> - 28-1
- New upstream v28
- Enable zstd support
- Resolves: rhbz#1913949
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 27-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Mar 25 2020 Yauheni Kaliuta <ykaliuta@fedoraproject.org> - 27-2
- add 0001-depmod-do-not-output-.bin-to-stdout.patch
-  Resolves: rhbz#1808430
-
-* Thu Feb 20 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 27-1
- New upstream v27
-
-* Mon Jan 20 2020 Yauheni Kaliuta <ykaliuta@fedoraproject.org> - 26-5
- weak-modules: sync with RHEL
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 26-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Feb 25 2019 Yauheni Kaliuta <yauheni.kaliuta@redhat.com> - 26-3
- weak-modules: sync with RHEL
-
-* Sun Feb 24 2019 Yauheni Kaliuta <ykaliuta@fedoraproject.org> - 26-2
- add PKCS7/openssl support (rhbz 1320921)
-
-* Sun Feb 24 2019 Yauheni Kaliuta <ykaliuta@fedoraproject.org> - 26-1
- Update to version 26 (rhbz 1673749)
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 25-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Oct 29 2018 James Antill <james.antill@redhat.com> - 25-4
- Remove ldconfig scriptlet, now done via. transfiletrigger in glibc (rhbz 1644063)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 25-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 25-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
 * Tue Jan 09 2018 Josh Boyer <jwboyer@fedoraproject.org> - 25-1
 - Update to version 25 (rhbz 1532597)

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (kmod-34.2.tar.xz) = 0e095c45ad61a6c61ce1ad61b9aa10cf5040e688b749f9a933b0e7d12de493c58027a5068b459cbbce05576fc564a22b83a3dbef1e6511b2a3e27034c88afd33
+SHA512 (kmod-25.tar.xz) = d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
--- a/tests/libkmod/libkmod.fmf
+++ b/tests/libkmod/libkmod.fmf
@ -1,3 +0,0 @@
-test: bash ./runtest.sh
-framework: beakerlib
-duration: 15m
--- a/tests/libkmod/metadata
+++ b/tests/libkmod/metadata
@ -1,14 +0,0 @@
-[General]
-name=libkmod gating test
-owner=Susant Sahani <susant@redhat.com>
-description=libkmod gating test
-license=GPLv2
-confidential=no
-destructive=no
-
-[restraint]
-entry_point=./runtest.sh
-max_time=15m
-use_pty=false
-dependencies=gcc,make,libcmocka-devel,kmod-devel
-
--- a/tests/libkmod/runtest.sh
+++ b/tests/libkmod/runtest.sh
@ -1,37 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: LGPL-2.1+
-# ~~~
-#   runtest.sh of libkmod
-#   Description: Tests for libkmod.
-#
-#   Author: Susant Sahani <susant@redhat.com>
-#   Copyright (c) 2018 Red Hat, Inc.
-# ~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="kmod-devel"
-IPIP="/usr/lib/modules/$(uname -r)/kernel/net/ipv4/ipip.ko.xz"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlAssertRpm $PACKAGE
-        rlAssertExists "$IPIP"
-        rlRun "gcc -o test-libkmod test-libkmod.c -lkmod -lcmocka"
-        rlRun "cp test-libkmod /usr/bin/"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlLog "Starting libkmod tests ..."
-        rlRun "/usr/bin/test-libkmod"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "rm /usr/bin/test-libkmod"
-        rlLog "libkmod tests done"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
-
-rlGetTestState
--- a/tests/libkmod/test-libkmod.c
+++ b/tests/libkmod/test-libkmod.c
@ -1,79 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1+
-# ~~~
-#   Description: Tests libkmod
-#
-#   Author: Susant Sahani <susant@redhat.com>
-#   Copyright (c) 2018 Red Hat, Inc.
-# ~~~
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <libkmod.h>
-#include <setjmp.h>
-#include <inttypes.h>
-#include <cmocka.h>
-
-static int load_module(void **state) {
-        struct kmod_list *list = NULL;
-        struct kmod_ctx *ctx = NULL;
-        struct kmod_list *l;
-        int r;
-
-        assert_non_null((ctx = kmod_new(NULL, NULL)));
-        assert_return_code(kmod_module_new_from_lookup(ctx, "ipip", &list), 0);
-
-        kmod_list_foreach(l, list) {
-                struct kmod_module *mod = NULL;
-
-                mod = kmod_module_get_module(l);
-                assert_non_null(mod);
-
-                assert_return_code(kmod_module_probe_insert_module(mod, 0, NULL, NULL, NULL, NULL), 0);
-        }
-
-        free(ctx);
-
-        return 0;
-}
-
-static int remove_module(void **state) {
-        struct kmod_list *list = NULL;
-        struct kmod_ctx *ctx = NULL;
-        struct kmod_list *l;
-        int r;
-
-        assert_non_null((ctx = kmod_new(NULL, NULL)));
-        assert_return_code(kmod_module_new_from_lookup(ctx, "ipip", &list), 0);
-
-        kmod_list_foreach(l, list) {
-                struct kmod_module *mod = NULL;
-
-                mod = kmod_module_get_module(l);
-                assert_non_null(mod);
-
-                assert_return_code(kmod_module_remove_module(mod, 0), 0);
-        }
-
-        free(ctx);
-
-        return 0;
-}
-
-void test_load_module(void **state) {
-        load_module(NULL);
-}
-
-void test_remove_module(void **state) {
-        remove_module(NULL);
-}
-
-int main(int argc, char *argv[]) {
-        const struct CMUnitTest libmod_tests[] = {
-                                                  cmocka_unit_test_teardown(test_load_module, remove_module),
-                                                  cmocka_unit_test_setup(test_remove_module, load_module),
-        };
-
-        return cmocka_run_group_tests(libmod_tests, NULL, NULL);
-}
--- a/tests/plan.fmf
+++ b/tests/plan.fmf
@ -1,10 +0,0 @@
-prepare:
-    how: install
-    package:
-      - libcmocka-devel
-      - make
-      - gcc
-discover:
-    how: fmf
-execute:
-    how: tmt
--- a/tests/sanity/Makefile
+++ b/tests/sanity/Makefile
@ -0,0 +1,81 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of general/kmod/sanity
+#	Description: kmod test
+#
+#   2016-07-31
+#   Author: Chunyu Hu <chuhu@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2016 Red Hat, Inc.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TENV=_env
+ifeq ($(PKG_TOP_DIR),)
+	export PKG_TOP_DIR := $(shell p=$$PWD; while :; do \
+		[ -e $$p/env.mk -o -z "$$p" ] && { echo $$p; break; }; p=$${p%/*}; done)
+	export _TOP_DIR := $(shell p=$$PWD; while :; do \
+		[ -d $$p/.git -o -z "$$p" ] && { echo $$p; break; }; p=$${p%/*}; done)
+	-include $(PKG_TOP_DIR)/env.mk
+endif
+include $(TENV)
+ifeq ($(_TOP_DIR),)
+	_TOP_DIR=/mnt/tests/$(TOPLEVEL_NAMESPACE)
+endif
+
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(TENV) $(METADATA) _env  runtest.sh Makefile PURPOSE lib.sh
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	( set +o posix; . /usr/bin/rhts_environment.sh; \
+		. /usr/share/beakerlib/beakerlib.sh; \
+		. runtest.sh )
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -fr *~ $(BUILT_FILES)
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Chunyu Hu <chuhu@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     kmod kernel module check from kernel modules tools">> $(METADATA)
+	@echo "Type:            Regression" >> $(METADATA)
+	@echo "TestTime:        1h" >> $(METADATA)
+	@echo "RunFor:          kernel" >> $(METADATA)
+	@echo "Requires:        kernel" >> $(METADATA)
+	@echo "Requires:        sysstat perf trace-cmd" >> $(METADATA)
+	@echo "Requires:        $(PACKAGE_NAME) python rpm wget" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "RhtsRequires:    kernel-kernel-general-include" >> $(METADATA)
+	rhts-lint $(METADATA)
+
--- a/tests/sanity/metadata
+++ b/tests/sanity/metadata
@ -1,12 +0,0 @@
-[General]
-name=kmod gating test
-owner=Ziqian SUN <zsun@redhat.com>
-description=kmod gating test
-license=GPLv2
-confidential=no
-destructive=no
-
-[restraint]
-entry_point=./runtest.sh
-max_time=15m
-use_pty=false
--- a/tests/sanity/runtest.sh
+++ b/tests/sanity/runtest.sh
@ -28,6 +28,7 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 # Include Beaker environment
+. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 . lib.sh

@ -132,3 +133,4 @@ rlJournalStart

    rlJournalPrintText
 rlJournalEnd
+
--- a/tests/sanity/sanity.fmf
+++ b/tests/sanity/sanity.fmf
@ -1,3 +0,0 @@
-test: bash ./runtest.sh
-framework: beakerlib
-duration: 15m
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,13 @@
+- hosts: localhost
+  tags:
+  - classic
+  roles:
+  - role: standard-test-beakerlib
+    tests:
+    - sanity
+    required_packages:
+    - kernel
+    - perf
+    - sysstat
+    - trace-cmd
+
--- a/1193
+++ b/1193