[arch-commits] Commit in kmod/trunk (2 files)

[Dave Reisner]

    Date: Thursday, November 19, 2015 @ 16:18:03
  Author: dreisner
Revision: 251247

upgpkg: kmod 22-1

Modified:
  kmod/trunk/PKGBUILD
Deleted:
  kmod/trunk/0001-libkmod-module-fix-return-code-in-error-path.patch

---------------------------------------------------------+
 0001-libkmod-module-fix-return-code-in-error-path.patch |   34 --------------
 PKGBUILD                                                |   16 +-----
 2 files changed, 4 insertions(+), 46 deletions(-)

Deleted: 0001-libkmod-module-fix-return-code-in-error-path.patch
===================================================================
--- 0001-libkmod-module-fix-return-code-in-error-path.patch	2015-11-19 11:45:22 UTC (rev 251246)
+++ 0001-libkmod-module-fix-return-code-in-error-path.patch	2015-11-19 15:18:03 UTC (rev 251247)
@@ -1,34 +0,0 @@
-From 114ec87c85c35a2bd3682f9f891e494127be6fb5 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi at intel.com>
-Date: Sat, 13 Jun 2015 18:29:47 -0300
-Subject: [PATCH] libkmod-module: fix return code in error path
-
-ENOSYS is the wrong errno to return when we don't find a module in
-kmod_module_insert_module(). Why is it there in the first place?  This
-goes back to kmod v1 when we couldn't load modules by names, but we
-should give a path instead.
-
-708624a ("ELF: initial support for modinfo and strip of modversions and
-vermagic.") changed that so we do a lazy-search by the module path in
-this function. Later  f304afe ("Change error message to reflect
-reality") fixed the log message but the return coded remained the same.
----
- libkmod/libkmod-module.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
-index 366308f..50b2ff9 100644
---- a/libkmod/libkmod-module.c
-+++ b/libkmod/libkmod-module.c
-@@ -830,7 +830,7 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod,
- 	path = kmod_module_get_path(mod);
- 	if (path == NULL) {
- 		ERR(mod->ctx, "could not find module by name='%s'\n", mod->name);
--		return -ENOSYS;
-+		return -ENOENT;
- 	}
- 
- 	mod->file = kmod_file_open(mod->ctx, path);
--- 
-2.5.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-19 11:45:22 UTC (rev 251246)
+++ PKGBUILD	2015-11-19 15:18:03 UTC (rev 251247)
@@ -2,9 +2,9 @@
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 
 pkgname=kmod
-pkgver=21
-pkgrel=2
-pkgdesc="Linux kernel module handling"
+pkgver=22
+pkgrel=1
+pkgdesc="Linux kernel module management tools and library"
 arch=('i686' 'x86_64')
 url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
 license=('GPL2')
@@ -17,20 +17,12 @@
 replaces=('module-init-tools')
 validpgpkeys=('EAB33C9690013C733916AC839BA2A5A630CBEA53')  # Lucas DeMarchi
 source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar."{xz,sign}
-        '0001-libkmod-module-fix-return-code-in-error-path.patch'
         "depmod-search.conf")
-md5sums=('ee246fab2e1cba9fbdcad6a86ec31531'
+md5sums=('4371b847f3fbfaa4e9aa890ad616748f'
          'SKIP'
-         '1825c63bd993a9b8a6b2395a1e25cdc6'
          'dd62cbf62bd8f212f51ef8c43bec9a77')
 
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <../0001-libkmod-module-fix-return-code-in-error-path.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"