From cfceb92e73d7f6a32494f0ba258b98748af43f34 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 11 Feb 2012 23:14:54 +0000
Subject: Sat Feb 11 23:14:53 UTC 2012

---
 ...ule-probe-Fix-ignore-loaded-flag-not-bein.patch | 28 ++++++++++++++++++++++
 testing/kmod/PKGBUILD                              | 27 +++++++++++----------
 2 files changed, 42 insertions(+), 13 deletions(-)
 create mode 100644 testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch

(limited to 'testing/kmod')

diff --git a/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch b/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
new file mode 100644
index 000000000..4ffc3e53b
--- /dev/null
+++ b/testing/kmod/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch
@@ -0,0 +1,28 @@
+From 269de2e0bf5011072da2f40f4f2d4023fad696b9 Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
+Date: Tue, 7 Feb 2012 09:48:59 -0200
+Subject: [PATCH] libkmod-module: probe: Fix ignore-loaded flag not being
+ applied
+
+---
+ TODO                     |    3 +++
+ libkmod/libkmod-module.c |    3 ++-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
+index 0af3e2e..b5eb7c9 100644
+--- a/libkmod/libkmod-module.c
++++ b/libkmod/libkmod-module.c
+@@ -1132,7 +1132,8 @@ KMOD_EXPORT int kmod_module_probe_insert_module(struct kmod_module *mod,
+ 	if (mod == NULL)
+ 		return -ENOENT;
+ 
+-	if (module_is_inkernel(mod)) {
++	if (!(flags & KMOD_PROBE_IGNORE_LOADED)
++					&& module_is_inkernel(mod)) {
+ 		if (flags & KMOD_PROBE_FAIL_ON_LOADED)
+ 			return -EEXIST;
+ 		else
+-- 
+1.7.9
+
diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD
index f20f2c4f0..678db471d 100644
--- a/testing/kmod/PKGBUILD
+++ b/testing/kmod/PKGBUILD
@@ -1,31 +1,35 @@
-# $Id: PKGBUILD 149555 2012-02-08 14:02:30Z tomegun $
+# $Id: PKGBUILD 149778 2012-02-10 19:09:35Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
 pkgver=5
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
 url="http://git.profusion.mobi/cgit.cgi/kmod.git"
 license=('GPL2')
 depends=('glibc' 'zlib')
-options=('!libtool' '!strip')
+options=('!libtool')
 provides=('module-init-tools=3.16')
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
 source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz"
+        '0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch'
         "depmod-search.conf")
 md5sums=('b271c2ec54aba1c67bda63c8579d8c15'
+         '81545a1509b43008f85c03fb980f0e86'
          '4b8cbcbc54b9029c99fd730e257d4436')
 
 build() {
   cd "$pkgname-$pkgver"
 
+  # fix modprobe --show-depends failures on loaded modules
+  patch -Np1 <"$srcdir/0001-libkmod-module-probe-Fix-ignore-loaded-flag-not-bein.patch"
+
   CFLAGS+=' -g -O0' ./configure \
     --sysconfdir=/etc \
     --with-rootprefix= \
-    --with-zlib \
-    --enable-debug
+    --with-zlib
 
   make
 }
@@ -37,16 +41,13 @@ check() {
 package() {
   make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 
-  # binary directories
-  install -dm755 "$pkgdir"/{,s}bin
-
-  # configuration directories
-  install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d
+  # extra directories
+  install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d "$pkgdir/sbin"
 
   # add symlinks to kmod
-  ln -s /usr/bin/kmod "$pkgdir/bin/lsmod"
-  for tool in {ins,rm,dep}mod mod{info,probe}; do
-    ln -s ../usr/bin/kmod "$pkgdir/sbin/$tool"
+  ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
+  for tool in {dep,ins,ls,rm}mod modinfo; do
+    ln -s kmod "$pkgdir/usr/bin/$tool"
   done
 
   # install depmod.d file for search/ dir
-- 
cgit v1.2.3-54-g00ecf