From 294df82f209c30c736907be119ff7b81e5b8b302 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 15 Sep 2014 11:39:11 +0200 Subject: convert kmod provides to internal generator --- Makefile.am | 1 + NEWS | 1 + find-provides.in | 6 ------ kmod.attr | 2 ++ kmod.prov | 0 5 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 kmod.attr mode change 100755 => 100644 kmod.prov 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 old mode 100755 new mode 100644 -- cgit v1.2.1