3d4d53
- generate kmod(module.ko) provides for kernel (#1025513)
@@ -0,0 +1,59 @@
|
|
1
|
+
diff -Nur rpm-4.11.1/fileattrs/kmod.attr rpm-4.11.1.new/fileattrs/kmod.attr
|
2
|
+
--- rpm-4.11.1/fileattrs/kmod.attr 1969-12-31 19:00:00.000000000 -0500
|
3
|
+
+++ rpm-4.11.1.new/fileattrs/kmod.attr 2013-10-31 16:33:57.919845171 -0400
|
4
|
+
|
5
|
+
+%__kmod_provides %{_rpmconfigdir}/kmod.prov
|
6
|
+
+%__kmod_path ^/lib/modules/.*$
|
7
|
+
diff -Nur rpm-4.11.1/fileattrs/Makefile.am rpm-4.11.1.new/fileattrs/Makefile.am
|
8
|
+
--- rpm-4.11.1/fileattrs/Makefile.am 2012-11-18 03:21:06.000000000 -0500
|
9
|
+
+++ rpm-4.11.1.new/fileattrs/Makefile.am 2013-10-31 16:35:16.443641444 -0400
|
10
|
+
|
11
|
+
|
12
|
+
fattrs_DATA = \
|
13
|
+
desktop.attr elf.attr font.attr libtool.attr perl.attr perllib.attr \
|
14
|
+
- pkgconfig.attr python.attr ocaml.attr script.attr mono.attr
|
15
|
+
+ pkgconfig.attr python.attr ocaml.attr script.attr mono.attr kmod.attr
|
16
|
+
|
17
|
+
EXTRA_DIST = $(fattrs_DATA)
|
18
|
+
diff -Nur rpm-4.11.1/scripts/kmod.prov rpm-4.11.1.new/scripts/kmod.prov
|
19
|
+
--- rpm-4.11.1/scripts/kmod.prov 1969-12-31 19:00:00.000000000 -0500
|
20
|
+
+++ rpm-4.11.1.new/scripts/kmod.prov 2013-10-31 16:33:57.919845171 -0400
|
21
|
+
|
22
|
+
+#!/bin/sh +x
|
23
|
+
+
|
24
|
+
+IFS=$'\n'
|
25
|
+
+
|
26
|
+
+for i in $(grep -E '(/lib/modules/.*\.ko|/lib/modules/.*/modules.builtin)');
|
27
|
+
+do
|
28
|
+
+ kmod=$(basename $i);
|
29
|
+
+
|
30
|
+
+ if [ $kmod == "modules.builtin" ]; then
|
31
|
+
+ for j in $(cat $i); do
|
32
|
+
+ j=$(basename $j);
|
33
|
+
+ echo "kmod($j)"
|
34
|
+
+ done
|
35
|
+
+ else
|
36
|
+
+ echo "kmod($kmod)"
|
37
|
+
+ fi
|
38
|
+
+done
|
39
|
+
diff -Nur rpm-4.11.1/scripts/Makefile.am rpm-4.11.1.new/scripts/Makefile.am
|
40
|
+
--- rpm-4.11.1/scripts/Makefile.am 2012-11-18 03:21:06.000000000 -0500
|
41
|
+
+++ rpm-4.11.1.new/scripts/Makefile.am 2013-10-31 16:35:53.990543808 -0400
|
42
|
+
|
43
|
+
ocaml-find-requires.sh ocaml-find-provides.sh \
|
44
|
+
pkgconfigdeps.sh libtooldeps.sh \
|
45
|
+
fontconfig.prov desktop-file.prov script.req \
|
46
|
+
- macros.perl macros.php macros.python
|
47
|
+
+ macros.perl macros.php macros.python kmod.prov
|
48
|
+
|
49
|
+
rpmconfig_SCRIPTS = \
|
50
|
+
brp-compress brp-python-bytecompile brp-java-gcjcompile \
|
51
|
+
|
52
|
+
pkgconfigdeps.sh libtooldeps.sh \
|
53
|
+
ocaml-find-requires.sh ocaml-find-provides.sh \
|
54
|
+
fontconfig.prov desktop-file.prov script.req \
|
55
|
+
- rpmdb_loadcvt rpm2cpio.sh tcl.req tgpg
|
56
|
+
+ rpmdb_loadcvt rpm2cpio.sh tcl.req tgpg kmod.prov
|
57
|
+
|
58
|
+
rpmconfig_DATA = \
|
59
|
+
rpm.daily rpm.log rpm.supp \
|
@@ -21,7 +21,7 @@
|
|
21
21
|
Summary: The RPM package management system
|
22
22
|
Name: rpm
|
23
23
|
Version: %{rpmver}
|
24
|
-
Release: %{?snapver:0.%{snapver}.}
|
24
|
+
Release: %{?snapver:0.%{snapver}.}11%{?dist}
|
25
25
|
Group: System Environment/Base
|
26
26
|
Url: http://www.rpm.org/
|
27
27
|
Source0: http://rpm.org/releases/rpm-4.11.x/%{name}-%{srcver}.tar.bz2
|
@@ -44,6 +44,8 @@ Patch4: rpm-4.8.1-use-gpg2.patch
|
|
44
44
|
Patch5: rpm-4.9.90-armhfp.patch
|
45
45
|
#conditionally applied patch for arm hardware floating point
|
46
46
|
Patch6: rpm-4.9.0-armhfp-logic.patch
|
47
|
+
# Generate kmod(basename.ko) provides for kernel
|
48
|
+
Patch7: rpm-4.11.1-kmod-find-provides.patch
|
47
49
|
|
48
50
|
# Patches already in upstream
|
49
51
|
# Filter soname dependencies by name
|
@@ -253,6 +255,7 @@ packages on a system.
|
|
253
255
|
%patch2 -p1 -b .fedora-specspo
|
254
256
|
%patch3 -p1 -b .no-man-dirs
|
255
257
|
%patch4 -p1 -b .use-gpg2
|
258
|
+
%patch7 -p1 -b .kmod-provides
|
256
259
|
|
257
260
|
%patch100 -p1 -b .filter-soname-deps
|
258
261
|
%patch101 -p1 -b .instprefix
|
@@ -519,6 +522,9 @@ exit 0
|
|
519
522
|
%doc COPYING doc/librpm/html/*
|
520
523
|
|
521
524
|
%changelog
|
525
|
+
* Tue Dec 03 2013 Panu Matilainen <pmatilai@redhat.com> - 4.11.1-11
|
526
|
+
- generate kmod(module.ko) provides for kernel (#1025513)
|
527
|
+
|
522
528
|
* Mon Nov 18 2013 Panu Matilainen <pmatilai@redhat.com> - 4.11.1-10
|
523
529
|
- python 3 string and file compatibility fixes
|
524
530
|
|