.ddiskit.metadata

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

.gitignore

@@ -1 +1 @@
-/ddiskit-710308d70cec15b9a7d1a7b89e6c04aaeb90aeb3.tar.bz2
+SOURCES/ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz

0003-setup_py-fixes.patch

@@ -1,11 +0,0 @@
-Index: ddiskit-4f4b76080f65109188b937c192a23aa0766348cf/setup.py
-===================================================================
---- ddiskit-4f4b76080f65109188b937c192a23aa0766348cf.orig/setup.py	2025-01-13 18:52:40.000000000 +0100
-+++ ddiskit-4f4b76080f65109188b937c192a23aa0766348cf/setup.py	2025-01-14 12:07:53.034758080 +0100
-@@ -22,5 +22,6 @@
-                 ('/usr/share/man/man1', ['ddiskit.1']),
-                 ('/etc', ['etc/ddiskit.config']),
-                 ],
-+    packages=[],
-     scripts=['bin/ddiskit'],
- )

SOURCES/0001-kabi-stablelists.patch

@@ -0,0 +1,42 @@
+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

@@ -9,6 +9,6 @@ Index: ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3/ddiskit.config
 +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}
 +
- ## Path to the spec file
+ [rpm_gpg_check]
- spec_path = rpm/SPECS/{spec_file.rpm_name}.spec
+ ## Some initial assumption about the keyring dir
- 
+ keyring_dir = {defaults.res_dir}/keyrings/{defaults.profile}

SPECS/ddiskit.spec

@@ -1,25 +1,25 @@
 # Use the forge macros to simplify packaging.
 # See https://fedoraproject.org/wiki/Forge-hosted_projects_packaging_automation 
-%global forgeurl https://gitlab.com/redhat/centos-stream/src/dup/ddiskit
+%global forgeurl https://github.com/orosp/ddiskit
 # When we no longer need to build against a git commit, 
 # Simply remove the commit variable and update the Version
 # Then forge will pick up the release
-%global commit 710308d70cec15b9a7d1a7b89e6c04aaeb90aeb3
+%global commit de1f6847223085dcdd177e02a7298c835fae12a3
 
 Name:           ddiskit
 Version:        3.6
 
 %forgemeta
 
-Release:        27%{?dist}
+Release:        16%{?dist}
 Summary:        Tool for Red Hat Enterprise Linux Driver Update Disk creation
 
-License:        GPL-3.0-only
+License:        GPLv3
 URL:            %{forgeurl}
 Source0:        %{forgesource}
 
+Patch0001:      0001-kabi-stablelists.patch
 Patch0002:      0002-kernel-version-re-fix.patch
-Patch0003:      0003-setup_py-fixes.patch
 
 BuildArch:      noarch
 BuildRequires:  python3-devel
@@ -39,8 +39,8 @@ kernel modules.
 %prep
 %forgesetup
 
-%patch -P 0002 -p1
+%patch0001 -p1
-%patch -P 0003 -p1
+%patch0002 -p1
 
 %build
 %py3_build
@@ -49,10 +49,13 @@ kernel modules.
 %py3_install
 find %{buildroot} -size 0 -delete
 
+%check
+%{__python3} setup.py test
+
 %files -n %{name}
 %doc README
 %license COPYING
-%{python3_sitelib}/ddiskit-*.egg-info
+%{python3_sitelib}/*
 %{_bindir}/ddiskit
 %{_mandir}/man1/ddiskit.1*
 %{_datadir}/bash-completion/completions/ddiskit
@@ -71,56 +74,23 @@ find %{buildroot} -size 0 -delete
 %config(noreplace) /etc/ddiskit.config
 
 %changelog
-* Wed Jan 15 2025 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-27
+* Mon Jul 11 2022 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-16
-- Update to the latest version (RHEL-55716, RHEL-61716, RHEL-68669).
+- Update kernel version RE for RHEL 9 idiosyncrasies (#2101634).
 
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.6-26
+* Mon Feb 14 2022 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-15
-- Bump release for October 2024 mass rebuild:
+- Support kernel-abi-stablelists package usage in RHEL 9 (#1990207).
-  Resolves: RHEL-64018
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.6-25
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.6-14.gitde1f684.gitde1f684
-- Bump release for June 2024 mass rebuild
+- 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
+* Thu Apr 29 2021 Eugene Syromiatnikov <esyr@redhat.com> - 3.6-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* 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

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

sources

@@ -1 +0,0 @@
-SHA512 (ddiskit-710308d70cec15b9a7d1a7b89e6c04aaeb90aeb3.tar.bz2) = 8c2072c89372d8f50997396f709580f1d6dca348d183932b6fae760402d463e2bb222fab04939668618de1a7c221ffc1c154e4e4ad9b048f3b2e375add0ec88c

tests/sanity/PURPOSE

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

tests/sanity/metadata

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

tests/sanity/runtest.sh

@@ -1,43 +0,0 @@
-#!/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

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