From: "Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild kmod-12-r1.ebuild ChangeLog
Date: Fri, 22 Mar 2013 08:50:44 +0000 (UTC) [thread overview]
Message-ID: <20130322085044.6B0552171D@flycatcher.gentoo.org> (raw)
ssuominen 13/03/22 08:50:44
Modified: kmod-9999.ebuild kmod-12-r1.ebuild ChangeLog
Log:
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)
Revision Changes Path
1.49 sys-apps/kmod/kmod-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.48&r2=1.49
Index: kmod-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- kmod-9999.ebuild 15 Feb 2013 18:33:52 -0000 1.48
+++ kmod-9999.ebuild 22 Mar 2013 08:50:44 -0000 1.49
@@ -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 @@
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
+}
1.15 sys-apps/kmod/kmod-12-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild?r1=1.14&r2=1.15
Index: kmod-12-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kmod-12-r1.ebuild 6 Mar 2013 19:55:30 -0000 1.14
+++ kmod-12-r1.ebuild 22 Mar 2013 08:50:44 -0000 1.15
@@ -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 @@
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
+}
1.77 sys-apps/kmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.76&r2=1.77
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog 6 Mar 2013 19:55:30 -0000 1.76
+++ ChangeLog 22 Mar 2013 08:50:44 -0000 1.77
@@ -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
next reply other threads:[~2013-03-22 8:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-22 8:50 Samuli Suominen (ssuominen) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-03-26 8:14 [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild kmod-12-r1.ebuild ChangeLog Samuli Suominen (ssuominen)
2013-03-24 14:17 Samuli Suominen (ssuominen)
2013-03-24 11:49 Samuli Suominen (ssuominen)
2013-02-15 18:33 Samuli Suominen (ssuominen)
2013-02-05 16:01 Samuli Suominen (ssuominen)
2013-01-18 17:01 Samuli Suominen (ssuominen)
2013-01-07 19:22 Samuli Suominen (ssuominen)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130322085044.6B0552171D@flycatcher.gentoo.org \
--to=ssuominen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox