From c6eaf81e4cb61123c4ee84a7da4b64e9b8d5036c Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 24 Feb 2025 12:13:48 -0500 Subject: [PATCH 01/10] New upstream release --- kmod.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kmod.spec b/kmod.spec index 7a935b4..d88670a 100644 --- a/kmod.spec +++ b/kmod.spec @@ -15,8 +15,8 @@ %bcond_without zstd Name: kmod -Version: 33 -Release: 3%{?dist} +Version: 34 +Release: 1%{?dist} Summary: Linux kernel module management utilities # https://docs.fedoraproject.org/en-US/legal/license-field/#_no_effective_license_analysis @@ -79,7 +79,7 @@ BuildRequires: xz-devel %endif BuildRequires: scdoc BuildRequires: openssl-devel -BuildRequires: make automake +BuildRequires: make automake libtool %if %{with zstd} BuildRequires: libzstd-devel %endif @@ -203,6 +203,10 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf %{_libdir}/libkmod.so %changelog +* Mon Feb 24 2025 Josh Boyer +- New upstream v34 +- Resolves: rhbz#2347049 + * Fri Jan 17 2025 Fedora Release Engineering - 33-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 0c06f7c..b9ece1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kmod-33.tar.xz) = 32d79d0bb7e89012f18458d4e88325f8e19a7dba6e1d5cff01aec3e618d1757b0f7c119735bf38d02e0d056a14273fd7522fca7c61a4d12a3ea5854bb662fff8 +SHA512 (kmod-34.tar.xz) = 214ef8ea78da059a1dd8cce66267690f27ee47e22398e7b0e0b68834c42eb94f2b77cf99ef9c4bdb3f0aee103abda1d9bc9dfc414051e9ad47a72e063802fdbf From 46456317d7f14ae2ef2fd7b5142e800cd61b16b5 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 24 Feb 2025 12:26:43 -0500 Subject: [PATCH 02/10] Add gtk-doc BR --- kmod.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmod.spec b/kmod.spec index d88670a..5497eaf 100644 --- a/kmod.spec +++ b/kmod.spec @@ -77,7 +77,7 @@ BuildRequires: zlib-devel %if %{with xz} BuildRequires: xz-devel %endif -BuildRequires: scdoc +BuildRequires: scdoc gtk-doc BuildRequires: openssl-devel BuildRequires: make automake libtool %if %{with zstd} From 56b12983a2a52fcc2e8291af771b7bddf4f43f61 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 24 Feb 2025 13:16:51 -0500 Subject: [PATCH 03/10] Last changes for -34 --- kmod.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/kmod.spec b/kmod.spec index 5497eaf..9f22611 100644 --- a/kmod.spec +++ b/kmod.spec @@ -125,6 +125,7 @@ applications that wish to load or unload Linux kernel modules. %autosetup -p1 %build +autoreconf --install %configure \ --with-openssl \ %if %{with zlib} @@ -149,13 +150,6 @@ popd find %{buildroot} -type f -name "*.la" -delete -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -for i in modprobe modinfo insmod rmmod depmod lsmod; do - # kmod now installs the links into bindir by itself - rm $RPM_BUILD_ROOT%{_bindir}/$i - ln -sf --relative $RPM_BUILD_ROOT%{_bindir}/kmod $RPM_BUILD_ROOT%{_sbindir}/$i -done - 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 @@ -183,6 +177,8 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf %{_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 From bd7db8fb025ec5567a796bd2e1b9c734ee71b1bc Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Sat, 8 Mar 2025 13:05:24 -0500 Subject: [PATCH 04/10] New upstream v34.1 Resolves: rhbz#2350269 --- kmod.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kmod.spec b/kmod.spec index 9f22611..19192eb 100644 --- a/kmod.spec +++ b/kmod.spec @@ -15,7 +15,7 @@ %bcond_without zstd Name: kmod -Version: 34 +Version: 34.1 Release: 1%{?dist} Summary: Linux kernel module management utilities @@ -199,6 +199,10 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf %{_libdir}/libkmod.so %changelog +* Sat Mar 08 2025 Josh Boyer - 34.1-1 +- New upstream v34.1 +- Resolves: rhbz#2350269 + * Mon Feb 24 2025 Josh Boyer - New upstream v34 - Resolves: rhbz#2347049 diff --git a/sources b/sources index b9ece1c..eca3a3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kmod-34.tar.xz) = 214ef8ea78da059a1dd8cce66267690f27ee47e22398e7b0e0b68834c42eb94f2b77cf99ef9c4bdb3f0aee103abda1d9bc9dfc414051e9ad47a72e063802fdbf +SHA512 (kmod-34.1.tar.xz) = f1f5026f31747270aea8b65df9eca95cc253e48622bfdb87e016e272a79ad1e90c0026cdf83a947fd53d8cbc1be1c546a5116db9617b690ab1b80f9792b6f5b2 From c41da9ae87a643a5fbc77a9b67af2d543371353b Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 31 Mar 2025 07:41:52 -0400 Subject: [PATCH 05/10] New upstream v34.2 Resolves: rhbz#2355680 --- kmod.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kmod.spec b/kmod.spec index 19192eb..bc28ee9 100644 --- a/kmod.spec +++ b/kmod.spec @@ -15,7 +15,7 @@ %bcond_without zstd Name: kmod -Version: 34.1 +Version: 34.2 Release: 1%{?dist} Summary: Linux kernel module management utilities @@ -199,6 +199,10 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf %{_libdir}/libkmod.so %changelog +* Mon Mar 31 2025 Josh Boyer - 34.2-1 +- New upstream v34.2 +- Resolves: rhbz#2355680 + * Sat Mar 08 2025 Josh Boyer - 34.1-1 - New upstream v34.1 - Resolves: rhbz#2350269 diff --git a/sources b/sources index eca3a3b..0390a92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kmod-34.1.tar.xz) = f1f5026f31747270aea8b65df9eca95cc253e48622bfdb87e016e272a79ad1e90c0026cdf83a947fd53d8cbc1be1c546a5116db9617b690ab1b80f9792b6f5b2 +SHA512 (kmod-34.2.tar.xz) = 0e095c45ad61a6c61ce1ad61b9aa10cf5040e688b749f9a933b0e7d12de493c58027a5068b459cbbce05576fc564a22b83a3dbef1e6511b2a3e27034c88afd33 From d1dc8b58a874162dd3d0e0004d0f6172ac090f4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:50:59 +0000 Subject: [PATCH 06/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- kmod.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kmod.spec b/kmod.spec index bc28ee9..ce3b8be 100644 --- a/kmod.spec +++ b/kmod.spec @@ -16,7 +16,7 @@ Name: kmod Version: 34.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Linux kernel module management utilities # https://docs.fedoraproject.org/en-US/legal/license-field/#_no_effective_license_analysis @@ -199,6 +199,9 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf %{_libdir}/libkmod.so %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 34.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Mar 31 2025 Josh Boyer - 34.2-1 - New upstream v34.2 - Resolves: rhbz#2355680 From b64bf8be07c2fe54ca79009218e72161de636a89 Mon Sep 17 00:00:00 2001 From: "Ziqian SUN (Zamir)" Date: Thu, 20 Mar 2025 16:50:10 +0800 Subject: [PATCH 07/10] Convert gating to restraint and tmt Signed-off-by: Ziqian SUN (Zamir) --- .fmf/version | 1 + tests/libkmod/Makefile | 46 ----------------------- tests/libkmod/libkmod.fmf | 6 +++ tests/libkmod/metadata | 14 +++++++ tests/libkmod/runtest.sh | 1 + tests/plan.fmf | 4 ++ tests/sanity/Makefile | 79 --------------------------------------- tests/sanity/metadata | 12 ++++++ tests/sanity/sanity.fmf | 1 + tests/tests.yml | 2 +- 10 files changed, 40 insertions(+), 126 deletions(-) create mode 100644 .fmf/version delete mode 100644 tests/libkmod/Makefile create mode 100644 tests/libkmod/libkmod.fmf create mode 100644 tests/libkmod/metadata create mode 100644 tests/plan.fmf delete mode 100644 tests/sanity/Makefile create mode 100644 tests/sanity/metadata create mode 100644 tests/sanity/sanity.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/libkmod/Makefile b/tests/libkmod/Makefile deleted file mode 100644 index cc53a81..0000000 --- a/tests/libkmod/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1+ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/libkmod -# Description: Test if libkmod working ok -# Author: Susant Sahani -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -export TEST=/CoreOS/libkmod -export TESTVERSION=1.0 - -OBJS = test-libkmod.c -CFLAG = -Wall -g3 -CC = gcc -LIBS = -lkmod -lcmocka - -test-libkmod:${OBJ} - ${CC} ${CFLAGS} ${INCLUDES} -o $@ ${OBJS} ${LIBS} - -run: test-libkmod - ./runtest.sh -clean: - -rm -f test-libkmod - -.c.o: - ${CC} ${CFLAGS} ${INCLUDES} -c $< - -CC = gcc - -include /usr/share/rhts/lib/rhts-make.include -$(METADATA): Makefile - @echo "Owner: Susant Sahani" > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test libkmod works ok" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: libkmod" >> $(METADATA) - @echo "Requires: libkmod libkmod-devel" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -Fedora 29" >> $(METADATA) - rhts-lint $(METADATA) diff --git a/tests/libkmod/libkmod.fmf b/tests/libkmod/libkmod.fmf new file mode 100644 index 0000000..d796b57 --- /dev/null +++ b/tests/libkmod/libkmod.fmf @@ -0,0 +1,6 @@ +test: bash ./runtest.sh +require: + - libcmocka-devel + - kmod-devel + - make + - gcc diff --git a/tests/libkmod/metadata b/tests/libkmod/metadata new file mode 100644 index 0000000..455987a --- /dev/null +++ b/tests/libkmod/metadata @@ -0,0 +1,14 @@ +[General] +name=libkmod gating test +owner=Susant Sahani +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 + diff --git a/tests/libkmod/runtest.sh b/tests/libkmod/runtest.sh index 1ef013c..d86b2e2 100755 --- a/tests/libkmod/runtest.sh +++ b/tests/libkmod/runtest.sh @@ -18,6 +18,7 @@ rlJournalStart rlPhaseStartSetup rlAssertRpm $PACKAGE rlAssertExists "$IPIP" + rlRun "gcc -o test-libkmod test-libkmod.c -lkmod -lcmocka" rlRun "cp test-libkmod /usr/bin/" rlPhaseEnd diff --git a/tests/plan.fmf b/tests/plan.fmf new file mode 100644 index 0000000..e6427de --- /dev/null +++ b/tests/plan.fmf @@ -0,0 +1,4 @@ +discover: + how: fmf +execute: + how: tmt diff --git a/tests/sanity/Makefile b/tests/sanity/Makefile deleted file mode 100644 index e422f7f..0000000 --- a/tests/sanity/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of general/kmod/sanity -# Description: kmod test -# -# 2016-07-31 -# Author: Chunyu Hu -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# 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 " > $(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) - rhts-lint $(METADATA) diff --git a/tests/sanity/metadata b/tests/sanity/metadata new file mode 100644 index 0000000..6c68b4b --- /dev/null +++ b/tests/sanity/metadata @@ -0,0 +1,12 @@ +[General] +name=kmod gating test +owner=Ziqian SUN +description=kmod gating test +license=GPLv2 +confidential=no +destructive=no + +[restraint] +entry_point=./runtest.sh +max_time=15m +use_pty=false diff --git a/tests/sanity/sanity.fmf b/tests/sanity/sanity.fmf new file mode 100644 index 0000000..e9c6959 --- /dev/null +++ b/tests/sanity/sanity.fmf @@ -0,0 +1 @@ +test: bash ./runtest.sh diff --git a/tests/tests.yml b/tests/tests.yml index 828a27a..c8bd0fd 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -2,7 +2,7 @@ tags: - classic roles: - - role: standard-test-beakerlib + - role: standard-test-basic tests: - sanity - libkmod From b4bcf63353f3da600ec5a48b0cf60873f9d313ea Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Wed, 13 Aug 2025 15:11:26 +0800 Subject: [PATCH 08/10] Tests: Fix fmf files for gating Signed-off-by: Zamir SUN --- tests/libkmod/libkmod.fmf | 7 ++----- tests/plan.fmf | 6 ++++++ tests/sanity/sanity.fmf | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/libkmod/libkmod.fmf b/tests/libkmod/libkmod.fmf index d796b57..8733518 100644 --- a/tests/libkmod/libkmod.fmf +++ b/tests/libkmod/libkmod.fmf @@ -1,6 +1,3 @@ test: bash ./runtest.sh -require: - - libcmocka-devel - - kmod-devel - - make - - gcc +framework: beakerlib +duration: 15m diff --git a/tests/plan.fmf b/tests/plan.fmf index e6427de..160239c 100644 --- a/tests/plan.fmf +++ b/tests/plan.fmf @@ -1,3 +1,9 @@ +prepare: + how: install + package: + - libcmocka-devel + - make + - gcc discover: how: fmf execute: diff --git a/tests/sanity/sanity.fmf b/tests/sanity/sanity.fmf index e9c6959..8733518 100644 --- a/tests/sanity/sanity.fmf +++ b/tests/sanity/sanity.fmf @@ -1 +1,3 @@ test: bash ./runtest.sh +framework: beakerlib +duration: 15m From 91014e42d6e32377371d118a529f2295357f552c Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Wed, 13 Aug 2025 15:11:51 +0800 Subject: [PATCH 09/10] Tests: Remove tests.yml STI entrypoint to make tmt work Signed-off-by: Zamir SUN --- tests/tests.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 tests/tests.yml diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index c8bd0fd..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,18 +0,0 @@ -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-basic - tests: - - sanity - - libkmod - required_packages: - - kernel - - perf - - sysstat - - trace-cmd - - kmod - - kmod-devel - - gcc - - libcmocka - - libcmocka-devel From 2ce6b84eca9864e2d1286ffa184c728bd2ecc75f Mon Sep 17 00:00:00 2001 From: Zamir SUN Date: Wed, 13 Aug 2025 15:14:36 +0800 Subject: [PATCH 10/10] Bump to 34.2-3 to build and run new gating Signed-off-by: Zamir SUN --- kmod.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kmod.spec b/kmod.spec index ce3b8be..8d0b67b 100644 --- a/kmod.spec +++ b/kmod.spec @@ -16,7 +16,7 @@ Name: kmod Version: 34.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Linux kernel module management utilities # https://docs.fedoraproject.org/en-US/legal/license-field/#_no_effective_license_analysis @@ -199,6 +199,10 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d/dist.conf %{_libdir}/libkmod.so %changelog +* Wed Aug 13 2025 Zamir SUN - 34.2-3 +- Rebuild to switch gating to TMT. +- Resolves: rhbz#2382934 + * Thu Jul 24 2025 Fedora Release Engineering - 34.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild