From f4455c4319b95a675f6284f5f43f3b5b3e0c6fbb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 4 Mar 2012 06:00:56 +0100 Subject: [PATCH] kmod: update to 6. --- srcpkgs/kmod/libkmod.template | 2 -- .../kmod/patches/modprobe_show_depends.patch | 19 ------------------- srcpkgs/kmod/template | 7 +++---- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/kmod/patches/modprobe_show_depends.patch diff --git a/srcpkgs/kmod/libkmod.template b/srcpkgs/kmod/libkmod.template index 4b4110b68d5..13595a459b4 100644 --- a/srcpkgs/kmod/libkmod.template +++ b/srcpkgs/kmod/libkmod.template @@ -5,8 +5,6 @@ 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 deleted file mode 100644 index 3e82971e410..00000000000 --- a/srcpkgs/kmod/patches/modprobe_show_depends.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 96ca897116b..f524e922d41 100644 --- a/srcpkgs/kmod/template +++ b/srcpkgs/kmod/template @@ -1,15 +1,14 @@ # Template file for 'kmod' pkgname=kmod -version=5 -revision=1 +version=6 homepage="http://git.profusion.mobi/cgit.cgi/kmod.git" -distfiles="http://packages.profusion.mobi//$pkgname/$pkgname-$version.tar.xz" +distfiles="${KERNEL_SITE}/utils/kernel/kmod/kmod-6.tar.xz" build_style=gnu-configure configure_args="--with-rootprefix= --with-zlib --with-xz" short_desc="Linux kernel module handling" maintainer="Juan RP " license="GPL-2" -checksum=2cb014f9f95575f1bc4b1f9babb6199a9b8c37fb1b38dc4340a2bcf230e66086 +checksum=6f1142519916d2dbe780693045a1b2d52d0b2212ec1bd23dd5a03134c3ba62b7 long_desc=" kmod is a set of tools to handle common tasks with Linux kernel modules like insert, remove, list, check properties, resolve dependencies and aliases.