[kernel] r18873 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Wed Mar 21 03:18:35 2012
New Revision: 18873

Log:
kbuild: do not check for ancient modutils tools

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/kbuild-do-not-check-for-ancient-modutils-tools.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/base

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Mar 21 03:08:24 2012	(r18872)
+++ dists/sid/linux-2.6/debian/changelog	Wed Mar 21 03:18:35 2012	(r18873)
@@ -1,3 +1,9 @@
+linux-2.6 (3.2.12-2) UNRELEASED; urgency=low
+
+  * kbuild: do not check for ancient modutils tools
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 21 Mar 2012 03:15:13 +0000
+
 linux-2.6 (3.2.12-1) unstable; urgency=high
 
   * New upstream stable update:

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/kbuild-do-not-check-for-ancient-modutils-tools.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/kbuild-do-not-check-for-ancient-modutils-tools.patch	Wed Mar 21 03:18:35 2012	(r18873)
@@ -0,0 +1,45 @@
+From: Lucas De Marchi <lucas.demarchi at profusion.mobi>
+Date: Tue, 17 Jan 2012 14:50:51 -0200
+Subject: [PATCH] kbuild: do not check for ancient modutils tools
+
+commit 620c231c7a7f48745094727bb612f6321cfc8844 upstream.
+
+scripts/depmod.sh checks for the output of '-V' expecting that it has
+module-init-tools in it. It's a hack to prevent users from using
+modutils instead of module-init-tools, that only works with 2.4.x
+kernels. This however prints an annoying warning for kmod tool, that is
+currently replacing module-init-tools.
+
+Rather than putting another check for kmod's version, just remove it
+since users of 2.4.x kernel are unlikely to upgrade to 3.x, and if they
+do, let depmod fail in that case because they should know what they are
+doing.
+
+Signed-off-by: Lucas De Marchi <lucas.demarchi at profusion.mobi>
+Acked-by: WANG Cong <amwang at redhat.com>
+Acked-By: Kay Sievers <kay.sievers at vrfy.org>
+Signed-off-by: Michal Marek <mmarek at suse.cz>
+---
+ scripts/depmod.sh |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/scripts/depmod.sh b/scripts/depmod.sh
+index a272356..2ae4817 100755
+--- a/scripts/depmod.sh
++++ b/scripts/depmod.sh
+@@ -9,12 +9,6 @@ fi
+ DEPMOD=$1
+ KERNELRELEASE=$2
+ 
+-if ! "$DEPMOD" -V 2>/dev/null | grep -q module-init-tools; then
+-	echo "Warning: you may need to install module-init-tools" >&2
+-	echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2
+-	sleep 1
+-fi
+-
+ if ! test -r System.map -a -x "$DEPMOD"; then
+ 	exit 0
+ fi
+-- 
+1.7.9.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Wed Mar 21 03:08:24 2012	(r18872)
+++ dists/sid/linux-2.6/debian/patches/series/base	Wed Mar 21 03:18:35 2012	(r18873)
@@ -85,3 +85,4 @@
 + bugfix/all/CIFS-Fix-a-spurious-error-in-cifs_push_posix_locks.patch
 + bugfix/all/tcp-fix-syncookie-regression.patch
 + bugfix/all/ipv6-don-t-dev_hold-dev-in-ip6_mc_find_dev_rcu.patch
++ bugfix/all/kbuild-do-not-check-for-ancient-modutils-tools.patch