From 0003cc2879106439bb267999428a2a4c7a456f22 Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Thu, 3 Jun 2021 17:34:30 +0200 Subject: [PATCH] Drop kmod.attr Also move this file to kernel-srpm-macros. Note that we need to require a new kernel-srpm-macros release now, since that's where kmod.attr is going to end up. --- kmod.attr | 21 --------------------- redhat-rpm-config.spec | 6 +++--- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 kmod.attr diff --git a/kmod.attr b/kmod.attr deleted file mode 100644 index 44a8d56..0000000 --- a/kmod.attr +++ /dev/null @@ -1,21 +0,0 @@ -%__kmod_path ^/lib/modules/.*/(modules.builtin|.*ko) -%__kmod_provides() %{lua: - function basename(fn) - return string.gsub(fn, "(.*/)(.*)", "%2") - end - function printdep(mod) - print("kmod("..mod..")") - end - local fn = rpm.expand("%{1}") - local bn = basename(fn) - if bn == "modules.builtin" then - for l in io.lines(fn) do - printdep(basename(l)) - end - else - local mod = string.match(bn, "%g+.ko") - if mod then - printdep(mod) - end - end -} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 8cc850d..58eac1f 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -65,7 +65,6 @@ Source500: config.guess Source501: config.sub # Dependency generators & their rules -Source600: kmod.attr Source602: libsymlink.attr # BRPs @@ -87,7 +86,8 @@ Requires: efi-srpm-macros Requires: fonts-srpm-macros Requires: ghc-srpm-macros Requires: go-srpm-macros -Requires: kernel-srpm-macros +# ↓ Provides kmod.attr originally shipped by us +Requires: kernel-srpm-macros >= 1.0-12 Requires: lua-srpm-macros Requires: ocaml-srpm-macros Requires: openblas-srpm-macros @@ -191,7 +191,7 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %changelog * Thu Nov 18 2021 Michal Domonkos - 205-1 -- Drop kernel-rpm-macros subpackage (new home: kernel-srpm-macros) +- Drop kernel-rpm-macros subpackage & kmod.attr (new home: kernel-srpm-macros) * Tue Nov 16 2021 Miro Hrončok - 204-1 - Don't pull in Python to all buildroots