diff options
| -rw-r--r-- | sys-apps/kmod/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-12-r1.ebuild | 20 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-9999.ebuild | 20 |
3 files changed, 26 insertions, 21 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index 2f1e2725c36e..e647ba64693b 100644 --- a/sys-apps/kmod/ChangeLog +++ b/sys-apps/kmod/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/kmod # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.77 2013/03/22 08:50:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.78 2013/03/24 11:49:43 ssuominen Exp $ + + 24 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> kmod-12-r1.ebuild, + kmod-9999.ebuild: + Temporarily remove running of update_depmod() from linux-mod.eclass because + it's introducing circulars wrt #462926 22 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> kmod-12-r1.ebuild, kmod-9999.ebuild: diff --git a/sys-apps/kmod/kmod-12-r1.ebuild b/sys-apps/kmod/kmod-12-r1.ebuild index 9bfb4bfa0d13..43aea9e06272 100644 --- a/sys-apps/kmod/kmod-12-r1.ebuild +++ b/sys-apps/kmod/kmod-12-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v 1.15 2013/03/22 08:50:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v 1.16 2013/03/24 11:49:43 ssuominen Exp $ EAPI=4 -inherit autotools eutils libtool multilib linux-mod +inherit autotools eutils libtool multilib linux-info # linux-mod if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -97,11 +97,11 @@ src_install() doins "${T}"/usb-load-ehci-first.conf #260139 } -pkg_postinst() { - # Upgrade path from sys-apps/module-init-tools - if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then - if [[ -z ${REPLACING_VERSIONS} ]]; then - update_depmod - fi - fi -} +#pkg_postinst() { +# # Upgrade path from sys-apps/module-init-tools +# if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then +# if [[ -z ${REPLACING_VERSIONS} ]]; then +# update_depmod +# fi +# fi +#} diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 06ceaec8ee1a..a9441b5c378c 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 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.49 2013/03/22 08:50:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.50 2013/03/24 11:49:43 ssuominen Exp $ EAPI=4 -inherit autotools eutils libtool multilib linux-mod +inherit autotools eutils libtool multilib linux-info # linux-mod if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -97,11 +97,11 @@ src_install() doins "${T}"/usb-load-ehci-first.conf #260139 } -pkg_postinst() { - # Upgrade path from sys-apps/module-init-tools - if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then - if [[ -z ${REPLACING_VERSIONS} ]]; then - update_depmod - fi - fi -} +#pkg_postinst() { +# # Upgrade path from sys-apps/module-init-tools +# if [[ -d ${ROOT}/lib/modules/${KV_FULL} ]]; then +# if [[ -z ${REPLACING_VERSIONS} ]]; then +# update_depmod +# fi +# fi +#} |