kbuild: do not check for ancient modutils tools
svn path=/dists/sid/linux-2.6/; revision=18873
This commit is contained in:
parent
c017dfafa2
commit
54502859ca
|
@ -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@decadent.org.uk> Wed, 21 Mar 2012 03:15:13 +0000
|
||||||
|
|
||||||
linux-2.6 (3.2.12-1) unstable; urgency=high
|
linux-2.6 (3.2.12-1) unstable; urgency=high
|
||||||
|
|
||||||
* New upstream stable update:
|
* New upstream stable update:
|
||||||
|
|
45
debian/patches/bugfix/all/kbuild-do-not-check-for-ancient-modutils-tools.patch
vendored
Normal file
45
debian/patches/bugfix/all/kbuild-do-not-check-for-ancient-modutils-tools.patch
vendored
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
From: Lucas De Marchi <lucas.demarchi@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@profusion.mobi>
|
||||||
|
Acked-by: WANG Cong <amwang@redhat.com>
|
||||||
|
Acked-By: Kay Sievers <kay.sievers@vrfy.org>
|
||||||
|
Signed-off-by: Michal Marek <mmarek@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
|
||||||
|
|
|
@ -85,3 +85,4 @@
|
||||||
+ bugfix/all/CIFS-Fix-a-spurious-error-in-cifs_push_posix_locks.patch
|
+ bugfix/all/CIFS-Fix-a-spurious-error-in-cifs_push_posix_locks.patch
|
||||||
+ bugfix/all/tcp-fix-syncookie-regression.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/ipv6-don-t-dev_hold-dev-in-ip6_mc_find_dev_rcu.patch
|
||||||
|
+ bugfix/all/kbuild-do-not-check-for-ancient-modutils-tools.patch
|
||||||
|
|
Loading…
Reference in New Issue