commit 3af30a4b9469e02690570c7fbd51f6c02ce96ce6
Author: Elan Ruusamäe <[email protected]>
Date: Wed Nov 13 18:06:03 2013 +0200
switch to kmod, as if built with kmod, files created by module-init-tools
are not created
refs
68184a5af355df3c4bd8aead86f2aa53db3cf0a4 - explicit BR kmod to remove
legacy *map files from package
6a2eb388f2f2e62560073423e684dedddbd8e966 - require kmod, it has all needed
bits from our module-init-tools, and module-init-tools are obsolete and
unmaintained
621dfa8bc6eadc71e572ae659614a8710a4dbf51 - versioned kmod deps
kernel.spec | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 788f545..301cf47 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -308,32 +308,32 @@ BuildRequires: gcc >= 5:3.2
BuildRequires: xz >= 1:4.999.7
AutoReqProv: no
BuildRequires: hostname
-BuildRequires: virtual(module-tools)
+BuildRequires: kmod
BuildRequires: perl-base
BuildRequires: rpm-build >= 4.5-24
BuildRequires: rpmbuild(macros) >= 1.652
Requires(post): coreutils
Requires(post): geninitrd >= 10000-3
-Requires(post): virtual(module-tools)
+Requires(post): kmod >= 12-2
Requires: /sbin/depmod
Requires: coreutils
Requires: geninitrd >= 10000-3
-Requires: virtual(module-tools)
+Requires: kmod >= 12-2
%if %{with pae}
%ifarch i686 athlon pentium3 pentium4
Requires: cpuinfo(pae)
%endif
%endif
-Suggests: keyutils
Suggests: dracut
+Suggests: keyutils
Provides: %{name}(netfilter) = 20070806
Provides: %{name}(vermagic) = %{kernel_release}
-Obsoletes: kernel%{_alt_kernel}-isdn-mISDN
Obsoletes: kernel%{_alt_kernel}-char-lirc-ene0100
Obsoletes: kernel%{_alt_kernel}-char-lirc-it87
Obsoletes: kernel%{_alt_kernel}-char-lirc-ite8709
Obsoletes: kernel%{_alt_kernel}-char-lirc-mceusb
Obsoletes: kernel%{_alt_kernel}-char-lirc-streamzap
+Obsoletes: kernel%{_alt_kernel}-isdn-mISDN
Obsoletes: kernel-firmware
Obsoletes: kernel-misc-acer_acpi
Obsoletes: kernel-misc-fuse
@@ -349,7 +349,6 @@ Conflicts: e2fsprogs < 1.29
Conflicts: isdn4k-utils < 3.1pre1
Conflicts: jfsutils < 1.1.3
Conflicts: lvm2 < 2.02.40
-Conflicts: module-init-tools < 3.16
Conflicts: nfs-utils < 1.0.5
Conflicts: oprofile < 0.9
Conflicts: ppp < 1:2.4.0
@@ -1059,7 +1058,6 @@ for a in \
devname \
softdep \
symbols{,.bin} \
- {pci,usb,ccw,isapnp,input,ieee1394,serio,of}map \
; do
test -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/modules.$a
> $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/modules.$a
@@ -1329,20 +1327,12 @@ fi
# rest modules.* are ghost (regenerated by post depmod -a invocation)
%ghost /lib/modules/%{kernel_release}/modules.alias
%ghost /lib/modules/%{kernel_release}/modules.alias.bin
-%ghost /lib/modules/%{kernel_release}/modules.ccwmap
%ghost /lib/modules/%{kernel_release}/modules.dep
%ghost /lib/modules/%{kernel_release}/modules.dep.bin
%ghost /lib/modules/%{kernel_release}/modules.devname
-%ghost /lib/modules/%{kernel_release}/modules.ieee1394map
-%ghost /lib/modules/%{kernel_release}/modules.inputmap
-%ghost /lib/modules/%{kernel_release}/modules.isapnpmap
-%ghost /lib/modules/%{kernel_release}/modules.ofmap
-%ghost /lib/modules/%{kernel_release}/modules.pcimap
-%ghost /lib/modules/%{kernel_release}/modules.seriomap
%ghost /lib/modules/%{kernel_release}/modules.softdep
%ghost /lib/modules/%{kernel_release}/modules.symbols
%ghost /lib/modules/%{kernel_release}/modules.symbols.bin
-%ghost /lib/modules/%{kernel_release}/modules.usbmap
# symlinks pointing to kernelsrcdir
%ghost /lib/modules/%{kernel_release}/build
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/3af30a4b9469e02690570c7fbd51f6c02ce96ce6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
