summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2012-07-13 16:27:28 +0000
committerWilliam Hubbs <williamh@gentoo.org>2012-07-13 16:27:28 +0000
commit26fd25653b5ca66bdd4f83c3e104b7688ea60c09 (patch)
tree08e30f8a90dafe4df52160b5554c46f113ba5775 /sys-apps
parentStable ppc ppc64, bug #425360 (diff)
downloadgentoo-2-26fd25653b5ca66bdd4f83c3e104b7688ea60c09.tar.gz
gentoo-2-26fd25653b5ca66bdd4f83c3e104b7688ea60c09.tar.bz2
gentoo-2-26fd25653b5ca66bdd4f83c3e104b7688ea60c09.zip
remove broken version. The kernel calls /sbin/modprobe directly, so that symbolic link cannot be removed at this time.
(Portage version: 2.2.0_alpha117/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/kmod/ChangeLog10
-rw-r--r--sys-apps/kmod/kmod-9-r2.ebuild (renamed from sys-apps/kmod/kmod-9-r1.ebuild)7
-rw-r--r--sys-apps/kmod/kmod-9999.ebuild7
3 files changed, 18 insertions, 6 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 1f2033f1b974..364c85080ad8 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,5 +1,12 @@
# ChangeLog for sys-apps/kmod
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.41 2012/07/13 09:58:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.42 2012/07/13 16:27:28 williamh Exp $
+
+*kmod-9-r2 (13 Jul 2012)
+
+ 13 Jul 2012; William Hubbs <williamh@gentoo.org> +kmod-9-r2.ebuild,
+ -kmod-9-r1.ebuild, kmod-9999.ebuild:
+ remove broken version. The kernel calls /sbin/modprobe directly, so that
+ symbolic link cannot be removed at this time.
*kmod-9-r1 (13 Jul 2012)
@@ -175,4 +182,3 @@
25 Dec 2011; Michał Górny <mgorny@gentoo.org> +kmod-2.ebuild,
+metadata.xml:
Introduce kmod module tools wrt bug #395863 and as a dep of udev.
-
diff --git a/sys-apps/kmod/kmod-9-r1.ebuild b/sys-apps/kmod/kmod-9-r2.ebuild
index f73793d140f9..6b3ba12ff195 100644
--- a/sys-apps/kmod/kmod-9-r1.ebuild
+++ b/sys-apps/kmod/kmod-9-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9-r1.ebuild,v 1.1 2012/07/13 09:58:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9-r2.ebuild,v 1.1 2012/07/13 16:27:28 williamh Exp $
EAPI=4
@@ -76,8 +76,11 @@ src_install()
if use tools; then
local cmd
- for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
+ for cmd in depmod insmod lsmod modinfo rmmod; do
dosym kmod /usr/bin/${cmd}
done
+ # according to upstream, modprobe can be called directly by the kernel,
+ # so it cannot be moved to /usr/bin at this time.
+ dosym /usr/bin/kmod /sbin/modprobe
fi
}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 74dc57e605c4..63153008905d 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.28 2012/07/13 09:58:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.29 2012/07/13 16:27:28 williamh Exp $
EAPI=4
@@ -76,8 +76,11 @@ src_install()
if use tools; then
local cmd
- for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
+ for cmd in depmod insmod lsmod modinfo rmmod; do
dosym kmod /usr/bin/${cmd}
done
+ # according to upstream, modprobe can be called directly by the kernel,
+ # so it cannot be moved to /usr/bin at this time.
+ dosym /usr/bin/kmod /sbin/modprobe
fi
}