packages: kmod/kmod.spec, kmod/kmod-options.patch (NEW)=?UTF-8?Q?=20?=- store in cvs

[arekm]

Author: arekm                        Date: Mon Mar 26 17:34:22 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- store in cvs

---- Files affected:
packages/kmod:
   kmod.spec (1.20 -> 1.21) , kmod-options.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kmod/kmod.spec
diff -u packages/kmod/kmod.spec:1.20 packages/kmod/kmod.spec:1.21
--- packages/kmod/kmod.spec:1.20	Thu Mar 22 19:47:46 2012
+++ packages/kmod/kmod.spec	Mon Mar 26 19:34:17 2012
@@ -14,7 +14,8 @@
 # Source0-md5:	7bd916ae1c8a38e7697fdd8118bc98eb
 Source1:	%{name}-blacklist
 Source2:	%{name}-usb
-Patch0:		http://git.kernel.org/?p=utils/kernel/kmod/%{name}.git;a=patch;h=02629fa02e96763db7460a930239cc93649a52f8
+# http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=patch;h=02629fa02e96763db7460a930239cc93649a52f8
+Patch0:		%{name}-options.patch
 # Patch0-md5:	7693f39dbc1477b7ea63ba9f62857e14
 URL:		http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
 BuildRequires:	autoconf >= 2.60
@@ -191,6 +192,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2012/03/26 17:34:17  arekm
+- store in cvs
+
 Revision 1.20  2012/03/22 18:47:46  glen
 - use softdep instead of install for ehci_hcd load order
 

================================================================
Index: packages/kmod/kmod-options.patch
diff -u /dev/null packages/kmod/kmod-options.patch:1.1
--- /dev/null	Mon Mar 26 19:34:22 2012
+++ packages/kmod/kmod-options.patch	Mon Mar 26 19:34:17 2012
@@ -0,0 +1,35 @@
+From 02629fa02e96763db7460a930239cc93649a52f8 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen at delfi.ee>
+Date: Thu, 22 Mar 2012 12:00:16 -0300
+Subject: [PATCH] modprobe: fix typo in config dump: option->options
+
+kmod uses "option MODNAME", not "options MODNAME"
+
+	--- modprobe-sorted.kmod	2012-03-21 22:31:03.751754042 +0200
+	+++ modprobe-sorted.module-init-tools	2012-03-21 22:30:49.561753089 +0200
+	@@ -1,6 +1,23 @@
+	[...]
+	-option uvesafb mode_option=1024x786-32 mtrr=4 scroll=ywrap
+	+options uvesafb mode_option=1024x786-32 mtrr=4 scroll=ywrap
+
+This breaks scripts that depend in modprobe -c output grepping
+---
+ tools/kmod-modprobe.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
+index 4760682..f6d47dc 100644
+--- a/tools/kmod-modprobe.c
++++ b/tools/kmod-modprobe.c
+@@ -218,7 +218,7 @@ static int show_config(struct kmod_ctx *ctx)
+ 		{ "install", kmod_config_get_install_commands },
+ 		{ "remove", kmod_config_get_remove_commands },
+ 		{ "alias", kmod_config_get_aliases },
+-		{ "option", kmod_config_get_options },
++		{ "options", kmod_config_get_options },
+ 		{ "softdep", kmod_config_get_softdeps },
+ 	};
+ 	size_t i;
+-- 
+1.7.6.5
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/kmod/kmod.spec?r1=1.20&r2=1.21