diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-03-22 08:50:44 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-03-22 08:50:44 +0000 |
| commit | 2562acfc56d266b1df0b64eedc968cb582dfaf9f (patch) | |
| tree | 99746503016b4f31802bc1376d86abc5ccbd9faa /sys-apps/kmod | |
| parent | Bump (diff) | |
| download | gentoo-2-2562acfc56d266b1df0b64eedc968cb582dfaf9f.tar.gz gentoo-2-2562acfc56d266b1df0b64eedc968cb582dfaf9f.tar.bz2 gentoo-2-2562acfc56d266b1df0b64eedc968cb582dfaf9f.zip | |
Sanitize upgrade path from sys-apps/module-init-tools by running update_depmod() function from linux-mod.eclass, but skipping it if we are upgrading or the /lib/modules directory with eg. modules.dep is missing.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-apps/kmod')
| -rw-r--r-- | sys-apps/kmod/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-12-r1.ebuild | 13 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-9999.ebuild | 13 |
3 files changed, 29 insertions, 5 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index 7c2974b11c3b..2f1e2725c36e 100644 --- a/sys-apps/kmod/ChangeLog +++ b/sys-apps/kmod/ChangeLog @@ -1,6 +1,12 @@ # 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.76 2013/03/06 19:55:30 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.77 2013/03/22 08:50:44 ssuominen Exp $ + + 22 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> kmod-12-r1.ebuild, + kmod-9999.ebuild: + Sanitize upgrade path from sys-apps/module-init-tools by running + update_depmod() function from linux-mod.eclass, but skipping it if we are + upgrading or the /lib/modules directory with eg. modules.dep is missing. 06 Mar 2013; Raúl Porcel <armin76@gentoo.org> kmod-12-r1.ebuild: m68k/s390/sh/sparc stable wrt #457568 diff --git a/sys-apps/kmod/kmod-12-r1.ebuild b/sys-apps/kmod/kmod-12-r1.ebuild index a7596b03e428..9bfb4bfa0d13 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.14 2013/03/06 19:55:30 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v 1.15 2013/03/22 08:50:44 ssuominen Exp $ EAPI=4 -inherit autotools eutils libtool multilib linux-info +inherit autotools eutils libtool multilib linux-mod if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -96,3 +96,12 @@ src_install() insinto /lib/modprobe.d 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 +} diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 0ec5d2d735b5..06ceaec8ee1a 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.48 2013/02/15 18:33:52 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.49 2013/03/22 08:50:44 ssuominen Exp $ EAPI=4 -inherit autotools eutils libtool multilib linux-info +inherit autotools eutils libtool multilib linux-mod if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -96,3 +96,12 @@ src_install() insinto /lib/modprobe.d 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 +} |