From c67c0afda9612ba504925f1e87761463d422907b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 7 Feb 2012 06:15:02 +0100 Subject: [PATCH] kmod: added a patch to unbreak modprobe --show-depends for some modules, revbump. --- srcpkgs/kmod/libkmod.template | 2 ++ .../kmod/patches/modprobe_show_depends.patch | 19 +++++++++++++++++++ srcpkgs/kmod/template | 1 + 3 files changed, 22 insertions(+) create mode 100644 srcpkgs/kmod/patches/modprobe_show_depends.patch diff --git a/srcpkgs/kmod/libkmod.template b/srcpkgs/kmod/libkmod.template index 13595a459b..4b4110b68d 100644 --- a/srcpkgs/kmod/libkmod.template +++ b/srcpkgs/kmod/libkmod.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package provides the libkmod runtime shared library." +revision=1 + do_install() { vmove "usr/lib/*.so*" usr/lib } diff --git a/srcpkgs/kmod/patches/modprobe_show_depends.patch b/srcpkgs/kmod/patches/modprobe_show_depends.patch new file mode 100644 index 0000000000..3e82971e41 --- /dev/null +++ b/srcpkgs/kmod/patches/modprobe_show_depends.patch @@ -0,0 +1,19 @@ +Fixes modprobe --show-depends for some modules i.e ahci +from dreisner@archlinux + +diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c +index 0af3e2e..14a0a3d 100644 +--- libkmod/libkmod-module.c ++++ libkmod/libkmod-module.c +@@ -1132,7 +1132,9 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod, + if (mod == NULL) + return -ENOENT; + +- if (module_is_inkernel(mod)) { ++ /* ignore module state if this is only for a dry run */ ++ if (!(flags & KMOD_PROBE_DRY_RUN) && print_action == NULL && ++ module_is_inkernel(mod)) { + if (flags & KMOD_PROBE_FAIL_ON_LOADED) + return -EEXIST; + else + diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template index 6560dfe8d1..96ca897116 100644 --- a/srcpkgs/kmod/template +++ b/srcpkgs/kmod/template @@ -1,6 +1,7 @@ # Template file for 'kmod' pkgname=kmod version=5 +revision=1 homepage="http://git.profusion.mobi/cgit.cgi/kmod.git" distfiles="http://packages.profusion.mobi//$pkgname/$pkgname-$version.tar.xz" build_style=gnu-configure