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.
This commit is contained in:
Michal Domonkos 2021-06-03 17:34:30 +02:00 committed by Miro Hrončok
parent f2493e3700
commit 0003cc2879
2 changed files with 3 additions and 24 deletions

View File

@ -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
}

View File

@ -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 <mdomonko@redhat.com> - 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 <mhroncok@redhat.com> - 204-1
- Don't pull in Python to all buildroots