.ddiskit.metadata

@@ -1 +0,0 @@
-dd79ea8e15423eac54793ed027343a05fff932ff SOURCES/ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz

.gitignore

@@ -1 +1,2 @@
-SOURCES/ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz
+/ddiskit-3.6.tar.gz
+/ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz

SOURCES/0001-kabi-stablelists.patch

@@ -1,42 +0,0 @@
-Index: ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/templates/spec
-===================================================================
---- ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.orig/templates/spec	2019-07-11 06:00:36.000000000 +0200
-+++ ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/templates/spec	2022-02-15 01:18:40.875578229 +0100
-@@ -21,12 +21,19 @@
- %endif
- 
- %if "%{kmod_dist_build_deps}" == ""
-+%if (0%{?rhel} > 8) || (0%{?centos} > 8)
-+%define abi_list stablelist
-+%define kmod_dist_build_deps redhat-rpm-config kernel-abi-stablelists elfutils-libelf-devel kernel-rpm-macros kmod
-+%else
- %if (0%{?rhel} > 7) || (0%{?centos} > 7)
-+%define abi_list whitelist
- %define kmod_dist_build_deps redhat-rpm-config kernel-abi-whitelists elfutils-libelf-devel kernel-rpm-macros kmod
- %else
-+%define abi_list whitelist
- %define kmod_dist_build_deps redhat-rpm-config kernel-abi-whitelists
- %endif
- %endif
-+%endif
- 
- Source0:	%{kmod_name}-%{kmod_vendor}-%{kmod_driver_version}.tar.bz2
- %{SOURCE_PATCHES}
-@@ -210,7 +217,7 @@
- # mark modules executable so that strip-to-file can strip them
- find obj/%{kmod_kbuild_dir} -name "*.ko" -type f -exec chmod u+x '{}' +
- 
--whitelist="/lib/modules/kabi-current/kabi_whitelist_%{_target_cpu}"
-+kabilist="/lib/modules/kabi-current/kabi_%{abi_list}_%{_target_cpu}"
- for modules in $( find obj/%{kmod_kbuild_dir} -name "*.ko" -type f -printf "%{findpat}\n" | sed 's|\.ko$||' | sort -u ) ; do
- 	# update depmod.conf
- 	module_weak_path=$(echo "$modules" | sed 's/[\/]*[^\/]*$//')
-@@ -227,7 +234,7 @@
- 
- 	# update greylist
- 	nm -u obj/%{kmod_kbuild_dir}/$modules.ko | sed 's/.*U //' |  sed 's/^\.//' | sort -u | while read -r symbol; do
--		grep -q "^\s*$symbol\$" $whitelist || echo "$symbol" >> source/greylist
-+		grep -q "^\s*$symbol\$" $kabilist || echo "$symbol" >> source/greylist
- 	done
- done
- sort -u source/greylist | uniq > source/greylist.txt

SOURCES/0002-kernel-version-re-fix.patch

@@ -1,14 +0,0 @@
-Index: ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/ddiskit.config
-===================================================================
---- ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.orig/ddiskit.config	2022-07-12 02:04:24.700230196 +0200
-+++ ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/ddiskit.config	2022-07-12 02:07:27.444095264 +0200
-@@ -4,6 +4,9 @@
- major = 7
- minor = 0
- 
-+kernel_dist_re = (?P<rpm_dist>\.el([6-9]|[1-9][0-9])(_(0|[1-9][0-9]*))?)
-+kernel_flex_version_re = {kernel_nvr_re}(?P<rpm_release_aux>(\.[0-9]{1,3})*){kernel_dist_re}
-+
- [rpm_gpg_check]
- ## Some initial assumption about the keyring dir
- keyring_dir = {defaults.res_dir}/keyrings/{defaults.profile}

ddiskit.spec

@@ -11,16 +11,13 @@ Version:        3.6
 
 %forgemeta
 
-Release:        16%{?dist}
+Release:        26%{?dist}
 Summary:        Tool for Red Hat Enterprise Linux Driver Update Disk creation
 
-License:        GPLv3
+License:        GPL-3.0-only
 URL:            %{forgeurl}
 Source0:        %{forgesource}
 
-Patch0001:      0001-kabi-stablelists.patch
-Patch0002:      0002-kernel-version-re-fix.patch
-
 BuildArch:      noarch
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -38,9 +35,9 @@ kernel modules.
 
 %prep
 %forgesetup
-
-%patch0001 -p1
-%patch0002 -p1
+# Fix build with setuptools 62.1
+# https://github.com/orosp/ddiskit/issues/17
+sed -i "8i packages=[]," setup.py
 
 %build
 %py3_build
@@ -55,7 +52,7 @@ find %{buildroot} -size 0 -delete
 %files -n %{name}
 %doc README
 %license COPYING
-%{python3_sitelib}/*
+%{python3_sitelib}/ddiskit-*.egg-info
 %{_bindir}/ddiskit
 %{_mandir}/man1/ddiskit.1*
 %{_datadir}/bash-completion/completions/ddiskit
@@ -74,23 +71,53 @@ find %{buildroot} -size 0 -delete
 %config(noreplace) /etc/ddiskit.config
 
 %changelog
-* Mon Jul 11 2022 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-16
-- Update kernel version RE for RHEL 9 idiosyncrasies (#2101634).
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.6-26
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Mon Feb 14 2022 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-15
-- Support kernel-abi-stablelists package usage in RHEL 9 (#1990207).
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.6-25
+- Bump release for June 2024 mass rebuild
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.6-14.gitde1f684.gitde1f684
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Thu Apr 29 2021 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-13
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 04 2023 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-22
+- Migrated to SPDX license
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.6-20
+- Rebuilt for Python 3.12
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 21 2022 Lumír Balhar <lbalhar@redhat.com> - 3.6-17
+- Fix build with new setuptools
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.6-16
+- Rebuilt for Python 3.11
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.6-13
+- Rebuilt for Python 3.10
+
+* Thu Apr 29 2021 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-12
 - Change "Requires: genisoimage" dependency to "Requires: /usr/bin/mkisofs"
   to enable xorriso-provided drop-in replacement implementation usage.
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.6-12
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

sources

@@ -0,0 +1 @@
+SHA512 (ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz) = 1b3d7dc10ab85c4b3a876cf6afb530baf0d5dd260cfdb51a3ef3b2906f3f163f86c40f3c2d05114cf3fb0bf79120d446aff8c4589e321ac9b9fafc015104a006

tests/sanity/Makefile

@@ -0,0 +1,62 @@
+#!/bin/bash
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Description: Gating test for ddiskit
+#   Author: Ziqian SUN (Zamir) <zsun@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2022 Red Hat, Inc. All rights reserved.
+#
+#   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.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TOPLEVEL_NAMESPACE=kernel
+PACKAGE_NAME=ddiskit
+RELATIVE_PATH=general/ddiskit/gating
+
+export TESTVERSION=1.0
+export TEST=/$(TOPLEVEL_NAMESPACE)/$(RELATIVE_PATH)
+
+.PHONY: all install download clean
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x ./runtest.sh
+
+clean:
+	rm -f *~ *.rpm $(BUILT_FILES)
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@touch $(METADATA)
+	@echo "Owner:        Ziqian SUN (Zamir) <zsun@redhat.com>" > $(METADATA)
+	@echo "Name:         $(TEST)" >> $(METADATA)
+	@echo "Path:         $(TEST_DIR)"	>> $(METADATA)
+	@echo "License:      GPLv2" >> $(METADATA)
+	@echo "TestVersion:  $(TESTVERSION)"	>> $(METADATA)
+	@echo "Description:  ddiskit gating test">> $(METADATA)
+	@echo "TestTime:     90m" >> $(METADATA)
+	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)
+	@echo "Requires:     gcc kernel-devel ddiskit" >> $(METADATA)
+	@echo "RhtsRequires: " >> $(METADATA)

tests/sanity/PURPOSE

@@ -0,0 +1 @@
+Gating test for ddiskit

tests/sanity/metadata

@@ -0,0 +1,14 @@
+[General]
+name=ddiskit
+owner= Ziqian SUN (Zamir) <zsun@redhat.com>
+description=Gating test for ddiskit
+license=GPLv2
+confidential=no
+destructive=no
+
+[restraint]
+entry_point=make run
+max_time=90m
+dependencies=ddiskit
+softDependencies=kernel-devel
+repoRequires=

tests/sanity/runtest.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh for ddiskit gating test.
+#   Author: Ziqian SUN (Zamir) <zsun@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2022 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   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, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+rlJournalStart
+    rlPhaseStartTest "ddiskit prepare_sources"
+        mkdir ddiskit-tmp && pushd ddiskit-tmp
+        rlRun -l "ddiskit prepare_sources"
+        rlRun -l "grep module_name module.config"
+        popd
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rm ddiskit-tmp
+    rlPhaseEnd
+
+    rlJournalPrintText
+rlJournalEnd

tests/tests.yml

@@ -0,0 +1,10 @@
+- hosts: localhost
+  tags:
+  - classic
+  roles:
+  - role: standard-test-beakerlib
+    tests:
+    - sanity
+    required_packages:
+    - kernel-devel
+    - ddiskit