aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-09-15 11:39:11 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-09-15 11:39:11 +0200
commit294df82f209c30c736907be119ff7b81e5b8b302 (patch)
tree1687863e09a3cd39b456b600ed78d6dc9e96b74b
parente1ae4707c2547f1940887453d268569c609c0b7b (diff)
downloadrpm-setup-294df82f209c30c736907be119ff7b81e5b8b302.tar
rpm-setup-294df82f209c30c736907be119ff7b81e5b8b302.tar.gz
rpm-setup-294df82f209c30c736907be119ff7b81e5b8b302.tar.bz2
rpm-setup-294df82f209c30c736907be119ff7b81e5b8b302.tar.xz
rpm-setup-294df82f209c30c736907be119ff7b81e5b8b302.zip
convert kmod provides to internal generator
-rw-r--r--Makefile.am1
-rw-r--r--NEWS1
-rwxr-xr-xfind-provides.in6
-rw-r--r--kmod.attr2
-rw-r--r--[-rwxr-xr-x]kmod.prov0
5 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index a65d83a..80abd3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,7 @@ pkg_scripts_in = $(pkg_gscripts:=.in)
pkg_attr_defs = \
devel.attr \
+ kmod.attr \
multiarch.attr \
perlapi_base.attr \
perlapi.attr \
diff --git a/NEWS b/NEWS
index 0d8f224..a9bc297 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- actually package php.attr
+- convert kmod provides to internal generator
- convert perl requires from meta to internal generator
Version 2.0 - 12 September 2014, by Thierry Vignaud
diff --git a/find-provides.in b/find-provides.in
index 11d3247..8c82209 100755
--- a/find-provides.in
+++ b/find-provides.in
@@ -8,10 +8,4 @@ filelist=`sed "s/['\"]/\\\&/g"`
# fix parsing output of objdump when localized (mga#7883):
export LC_ALL=C
-#
-# --- Kernel modules.
-[ -x @RPMVENDORDIR@/kmod.prov ] &&
- echo "$filelist" | tr '[:blank:]' \\n | @RPMVENDORDIR@/kmod.prov | sort -u \
- && test ${PIPESTATUS[2]} -ne 0 && echo 'error: @RPMVENDORDIR@/kmod.prov failed' >&2 && exit 1
-
exit 0
diff --git a/kmod.attr b/kmod.attr
new file mode 100644
index 0000000..316f8b5
--- /dev/null
+++ b/kmod.attr
@@ -0,0 +1,2 @@
+%__kmod_provides %{_rpmconfigdir}/mageia/kmod.prov
+%__kmod_path ^/lib/modules/.*$
diff --git a/kmod.prov b/kmod.prov
index 6ad60b6..6ad60b6 100755..100644
--- a/kmod.prov
+++ b/kmod.prov