[arch-commits] Commit in kmod/trunk (PKGBUILD return-non-zero-on-fail.patch)

[Dave Reisner]

    Date: Thursday, January 5, 2012 @ 23:24:13
  Author: dreisner
Revision: 146215

upgpkg: kmod 3-3

- backport upstream patches to correct exit codes
- fix depmod.d config dir creation

Added:
  kmod/trunk/return-non-zero-on-fail.patch
Modified:
  kmod/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   12 ++++++++----
 return-non-zero-on-fail.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-06 04:08:36 UTC (rev 146214)
+++ PKGBUILD	2012-01-06 04:24:13 UTC (rev 146215)
@@ -3,7 +3,7 @@
 
 pkgname=kmod
 pkgver=3
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux kernel module handling"
 arch=('i686' 'x86_64')
 url="http://git.profusion.mobi/cgit.cgi/kmod.git"
@@ -14,13 +14,17 @@
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
 source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.xz"
-        "depmod-search.conf")
+        "depmod-search.conf"
+        "return-non-zero-on-fail.patch")
 md5sums=('bc0e69f75c2ac22c091f05e166e86c5d'
-         '4b8cbcbc54b9029c99fd730e257d4436')
+         '4b8cbcbc54b9029c99fd730e257d4436'
+         '4be6f783a7fc2d1747ccaa2536d2e88f')
 
 build() {
   cd "$pkgname-$pkgver"
 
+  patch -Np1 <"$srcdir/return-non-zero-on-fail.patch"
+
   ./configure \
     --with-rootprefix= \
     --with-rootlibdir=/lib \
@@ -40,7 +44,7 @@
   install -dm755 "$pkgdir"/{,s}bin
 
   # configuration directories
-  install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d
+  install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d
 
   # add symlinks to kmod
   ln -s /usr/bin/kmod "$pkgdir/bin/lsmod"

Added: return-non-zero-on-fail.patch
===================================================================
--- return-non-zero-on-fail.patch	                        (rev 0)
+++ return-non-zero-on-fail.patch	2012-01-06 04:24:13 UTC (rev 146215)
@@ -0,0 +1,30 @@
+diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
+index b6af26f..8506193 100644
+--- a/tools/kmod-modinfo.c
++++ b/tools/kmod-modinfo.c
+@@ -279,6 +279,12 @@ static int modinfo_alias_do(struct kmod_ctx *ctx, const char *alias)
+ 		LOG("Module alias %s not found.\n", alias);
+ 		return err;
+ 	}
++
++	if (list == NULL) {
++		LOG("Module %s not found.\n", alias);
++		return -ENOENT;
++	}
++
+ 	kmod_list_foreach(l, list) {
+ 		struct kmod_module *mod = kmod_module_get_module(l);
+ 		int r = modinfo_do(mod);
+diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
+index 8286b9b..6ca94f2 100644
+--- a/tools/kmod-modprobe.c
++++ b/tools/kmod-modprobe.c
+@@ -856,7 +856,7 @@ static int insmod_alias(struct kmod_ctx *ctx, const char *alias, const char *ext
+ 
+ 	if (list == NULL) {
+ 		LOG("Module %s not found.\n", alias);
+-		return err;
++		return -ENOENT;
+ 	}
+ 
+ 	if (use_blacklist) {