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. Related: #1959924
This commit is contained in:
parent
0d1a3f47d9
commit
16bbde78a3
21
kmod.attr
21
kmod.attr
|
@ -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
|
|
||||||
}
|
|
|
@ -69,7 +69,6 @@ Source500: config.guess
|
||||||
Source501: config.sub
|
Source501: config.sub
|
||||||
|
|
||||||
# Dependency generators & their rules
|
# Dependency generators & their rules
|
||||||
Source600: kmod.attr
|
|
||||||
Source602: libsymlink.attr
|
Source602: libsymlink.attr
|
||||||
|
|
||||||
# BRPs
|
# BRPs
|
||||||
|
@ -91,7 +90,8 @@ Requires: efi-srpm-macros
|
||||||
Requires: fonts-srpm-macros
|
Requires: fonts-srpm-macros
|
||||||
Requires: ghc-srpm-macros
|
Requires: ghc-srpm-macros
|
||||||
Requires: go-srpm-macros
|
Requires: go-srpm-macros
|
||||||
Requires: kernel-srpm-macros
|
# ↓ Provides kmod.attr originally shipped by us
|
||||||
|
Requires: kernel-srpm-macros >= 1.0-6
|
||||||
Requires: lua-srpm-macros
|
Requires: lua-srpm-macros
|
||||||
Requires: ocaml-srpm-macros
|
Requires: ocaml-srpm-macros
|
||||||
Requires: openblas-srpm-macros
|
Requires: openblas-srpm-macros
|
||||||
|
@ -190,7 +190,7 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed May 12 2021 Michal Domonkos <mdomonko@redhat.com> - 185-1
|
* Wed May 12 2021 Michal Domonkos <mdomonko@redhat.com> - 185-1
|
||||||
- Drop kernel-rpm-macros subpackage
|
- Drop kernel-rpm-macros subpackage & kmod.attr
|
||||||
- Resolves: #1959924
|
- Resolves: #1959924
|
||||||
|
|
||||||
* Wed Apr 21 2021 Michal Domonkos <mdomonko@redhat.com> - 184-1
|
* Wed Apr 21 2021 Michal Domonkos <mdomonko@redhat.com> - 184-1
|
||||||
|
|
Loading…
Reference in New Issue