teknoraver / rpms / rpm

Forked from rpms/rpm 4 months ago
Clone

Blame rpm-4.11.1-kmod-find-provides.patch

Panu Matilainen 1d5cee
diff -up rpm-4.11.2-rc1/fileattrs/kmod.attr.kmod-provides rpm-4.11.2-rc1/fileattrs/kmod.attr
Panu Matilainen 1d5cee
--- rpm-4.11.2-rc1/fileattrs/kmod.attr.kmod-provides	2014-01-20 11:47:48.325409810 +0200
Panu Matilainen 1d5cee
+++ rpm-4.11.2-rc1/fileattrs/kmod.attr	2014-01-20 11:47:48.325409810 +0200
Panu Matilainen 3d4d53
@@ -0,0 +1,2 @@
Panu Matilainen 3d4d53
+%__kmod_provides       %{_rpmconfigdir}/kmod.prov
Panu Matilainen 3d4d53
+%__kmod_path           ^/lib/modules/.*$
Panu Matilainen 1d5cee
diff -up rpm-4.11.2-rc1/fileattrs/Makefile.am.kmod-provides rpm-4.11.2-rc1/fileattrs/Makefile.am
Panu Matilainen 1d5cee
--- rpm-4.11.2-rc1/fileattrs/Makefile.am.kmod-provides	2014-01-20 11:47:48.325409810 +0200
Panu Matilainen 1d5cee
+++ rpm-4.11.2-rc1/fileattrs/Makefile.am	2014-01-20 11:49:31.764544198 +0200
Panu Matilainen 1d5cee
@@ -7,6 +7,6 @@ fattrsdir = $(rpmconfigdir)/fileattrs
Panu Matilainen 3d4d53
 fattrs_DATA = \
Panu Matilainen 1d5cee
 	appdata.attr desktop.attr elf.attr font.attr libtool.attr perl.attr \
Panu Matilainen 1d5cee
 	perllib.attr pkgconfig.attr python.attr ocaml.attr script.attr \
Panu Matilainen 1d5cee
-	mono.attr
Panu Matilainen 1d5cee
+	mono.attr kmod.attr
Panu Matilainen 3d4d53
 
Panu Matilainen 3d4d53
 EXTRA_DIST = $(fattrs_DATA)
Panu Matilainen 1d5cee
diff -up rpm-4.11.2-rc1/scripts/kmod.prov.kmod-provides rpm-4.11.2-rc1/scripts/kmod.prov
Panu Matilainen 1d5cee
--- rpm-4.11.2-rc1/scripts/kmod.prov.kmod-provides	2014-01-20 11:47:48.325409810 +0200
Panu Matilainen 1d5cee
+++ rpm-4.11.2-rc1/scripts/kmod.prov	2014-01-20 11:47:48.325409810 +0200
Panu Matilainen 3d4d53
@@ -0,0 +1,17 @@
Panu Matilainen 3d4d53
+#!/bin/sh +x
Panu Matilainen 3d4d53
+
Panu Matilainen 3d4d53
+IFS=$'\n'
Panu Matilainen 3d4d53
+
Panu Matilainen 3d4d53
+for i in $(grep -E '(/lib/modules/.*\.ko|/lib/modules/.*/modules.builtin)');
Panu Matilainen 3d4d53
+do
Panu Matilainen 3d4d53
+	kmod=$(basename $i);
Panu Matilainen 3d4d53
+
Panu Matilainen 3d4d53
+	if [ $kmod == "modules.builtin" ]; then
Panu Matilainen 3d4d53
+		for j in $(cat $i); do
Panu Matilainen 3d4d53
+			j=$(basename $j);
Panu Matilainen 3d4d53
+			echo "kmod($j)"
Panu Matilainen 3d4d53
+		done
Panu Matilainen 3d4d53
+	else
Panu Matilainen 3d4d53
+		echo "kmod($kmod)"
Panu Matilainen 3d4d53
+	fi
Panu Matilainen 3d4d53
+done
Panu Matilainen 1d5cee
diff -up rpm-4.11.2-rc1/scripts/Makefile.am.kmod-provides rpm-4.11.2-rc1/scripts/Makefile.am
Panu Matilainen 1d5cee
--- rpm-4.11.2-rc1/scripts/Makefile.am.kmod-provides	2014-01-17 13:17:29.000000000 +0200
Panu Matilainen 1d5cee
+++ rpm-4.11.2-rc1/scripts/Makefile.am	2014-01-20 11:50:24.065601168 +0200
Panu Matilainen 1d5cee
@@ -20,7 +20,7 @@ EXTRA_DIST = \
Panu Matilainen 3d4d53
 	ocaml-find-requires.sh ocaml-find-provides.sh \
Panu Matilainen 1d5cee
 	pkgconfigdeps.sh libtooldeps.sh appdata.prov \
Panu Matilainen 3d4d53
 	fontconfig.prov desktop-file.prov script.req \
Panu Matilainen 3d4d53
-	macros.perl macros.php macros.python
Panu Matilainen 3d4d53
+	macros.perl macros.php macros.python kmod.prov
Panu Matilainen 3d4d53
 
Panu Matilainen 3d4d53
 rpmconfig_SCRIPTS = \
Panu Matilainen 3d4d53
 	brp-compress brp-python-bytecompile brp-java-gcjcompile \
Panu Matilainen 1d5cee
@@ -34,7 +34,7 @@ rpmconfig_SCRIPTS = \
Panu Matilainen 3d4d53
 	pkgconfigdeps.sh libtooldeps.sh \
Panu Matilainen 3d4d53
 	ocaml-find-requires.sh ocaml-find-provides.sh \
Panu Matilainen 3d4d53
 	fontconfig.prov desktop-file.prov script.req \
Panu Matilainen 3d4d53
-	rpmdb_loadcvt rpm2cpio.sh tcl.req tgpg 
Panu Matilainen 3d4d53
+	rpmdb_loadcvt rpm2cpio.sh tcl.req tgpg kmod.prov
Panu Matilainen 3d4d53
 
Panu Matilainen 3d4d53
 rpmconfig_DATA = \
Panu Matilainen 3d4d53
 	rpm.daily rpm.log rpm.supp \