* [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild kmod-13-r1.ebuild kmod-14-r1.ebuild kmod-14-r2.ebuild ChangeLog
@ 2013-08-24 10:59 Samuli Suominen (ssuominen)
0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2013-08-24 10:59 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/08/24 10:59:48
Modified: kmod-9999.ebuild kmod-13-r1.ebuild
kmod-14-r1.ebuild kmod-14-r2.ebuild ChangeLog
Log:
Remove checks for CONFIG_MODULES and CONFIG_MODULE_UNLOAD and upgrade path from sys-apps/module-init-tools wrt #462926 by Mike Frysinger. Bail out early if the used compiler is too old wrt #481020.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.64 sys-apps/kmod/kmod-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.63&r2=1.64
Index: kmod-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kmod-9999.ebuild 16 Aug 2013 14:07:33 -0000 1.63
+++ kmod-9999.ebuild 24 Aug 2013 10:59:48 -0000 1.64
@@ -1,12 +1,9 @@
# 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.63 2013/08/16 14:07:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.64 2013/08/24 10:59:48 ssuominen Exp $
EAPI=5
-
-VIRTUAL_MODUTILS=1
-
-inherit autotools eutils libtool multilib linux-mod
+inherit autotools eutils libtool multilib toolchain-funcs versionator
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -41,8 +38,8 @@
zlib? ( virtual/pkgconfig )"
pkg_setup() {
- CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
- linux-info_pkg_setup
+ version_is_at_least 4.6 $(gcc-version) || \
+ die "At least sys-devel/gcc >= 4.6 is required to build ${CATEGORY}/${PN}." #481020
}
src_prepare() {
@@ -104,20 +101,13 @@
}
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
-
if use openrc; then
- # Add kmod to the runlevel automatically if this is the first install of this package.
if [[ -L ${ROOT}etc/runlevels/boot/static-nodes ]]; then
- ewarn "Removing deprecated static-nodes init script from the boot runlevel"
+ ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
rm -f "${ROOT}"etc/runlevels/boot/static-nodes
fi
+ # Add kmod to the runlevel automatically if this is the first install of this package.
if [[ -z ${REPLACING_VERSIONS} ]]; then
if [[ -x ${ROOT}etc/init.d/kmod-static-nodes && -d ${ROOT}etc/runlevels/sysinit ]]; then
ln -s /etc/init.d/kmod-static-nodes "${ROOT}"/etc/runlevels/sysinit/kmod-static-nodes
@@ -127,9 +117,8 @@
if [[ -e ${ROOT}etc/runlevels/sysinit ]]; then
if [[ ! -e ${ROOT}etc/runlevels/sysinit/kmod-static-nodes ]]; then
ewarn
- ewarn "You need to add kmod-static-nodes to the sysinit runlevel."
- ewarn "If you do not do this,"
- ewarn "your system will not necessarily have the required static nodes!"
+ ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+ ewarn "kernel modules to have required static nodes!"
ewarn "Run this command:"
ewarn "\trc-update add kmod-static-nodes sysinit"
fi
1.15 sys-apps/kmod/kmod-13-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-13-r1.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-13-r1.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-13-r1.ebuild?r1=1.14&r2=1.15
Index: kmod-13-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-13-r1.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kmod-13-r1.ebuild 26 Jul 2013 14:52:57 -0000 1.14
+++ kmod-13-r1.ebuild 24 Aug 2013 10:59:48 -0000 1.15
@@ -1,12 +1,9 @@
# 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-13-r1.ebuild,v 1.14 2013/07/26 14:52:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-13-r1.ebuild,v 1.15 2013/08/24 10:59:48 ssuominen Exp $
EAPI=5
-
-VIRTUAL_MODUTILS=1
-
-inherit autotools eutils libtool multilib linux-mod
+inherit autotools eutils libtool multilib
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -39,11 +36,6 @@
lzma? ( virtual/pkgconfig )
zlib? ( virtual/pkgconfig )"
-pkg_setup() {
- CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
- linux-info_pkg_setup
-}
-
src_prepare() {
epatch "${FILESDIR}"/${P}-errno_syscall.patch
@@ -95,12 +87,3 @@
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.8 sys-apps/kmod/kmod-14-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-14-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-14-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-14-r1.ebuild?r1=1.7&r2=1.8
Index: kmod-14-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-14-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kmod-14-r1.ebuild 16 Aug 2013 14:25:19 -0000 1.7
+++ kmod-14-r1.ebuild 24 Aug 2013 10:59:48 -0000 1.8
@@ -1,12 +1,9 @@
# 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-14-r1.ebuild,v 1.7 2013/08/16 14:25:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-14-r1.ebuild,v 1.8 2013/08/24 10:59:48 ssuominen Exp $
EAPI=5
-
-VIRTUAL_MODUTILS=1
-
-inherit autotools eutils libtool multilib linux-mod
+inherit autotools eutils libtool multilib toolchain-funcs versionator
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -40,8 +37,8 @@
zlib? ( virtual/pkgconfig )"
pkg_setup() {
- CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
- linux-info_pkg_setup
+ version_is_at_least 4.6 $(gcc-version) || \
+ die "At least sys-devel/gcc >= 4.6 is required to build ${CATEGORY}/${PN}." #481020
}
src_prepare() {
@@ -99,12 +96,3 @@
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.3 sys-apps/kmod/kmod-14-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild?r1=1.2&r2=1.3
Index: kmod-14-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kmod-14-r2.ebuild 16 Aug 2013 14:07:33 -0000 1.2
+++ kmod-14-r2.ebuild 24 Aug 2013 10:59:48 -0000 1.3
@@ -1,12 +1,9 @@
# 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-14-r2.ebuild,v 1.2 2013/08/16 14:07:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild,v 1.3 2013/08/24 10:59:48 ssuominen Exp $
EAPI=5
-
-VIRTUAL_MODUTILS=1
-
-inherit autotools eutils libtool multilib linux-mod
+inherit autotools eutils libtool multilib toolchain-funcs versionator
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
@@ -41,8 +38,8 @@
zlib? ( virtual/pkgconfig )"
pkg_setup() {
- CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
- linux-info_pkg_setup
+ version_is_at_least 4.6 $(gcc-version) || \
+ die "At least sys-devel/gcc >= 4.6 is required to build ${CATEGORY}/${PN}." #481020
}
src_prepare() {
@@ -104,20 +101,13 @@
}
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
-
if use openrc; then
- # Add kmod to the runlevel automatically if this is the first install of this package.
if [[ -L ${ROOT}etc/runlevels/boot/static-nodes ]]; then
- ewarn "Removing deprecated static-nodes init script from the boot runlevel"
+ ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
rm -f "${ROOT}"etc/runlevels/boot/static-nodes
fi
+ # Add kmod to the runlevel automatically if this is the first install of this package.
if [[ -z ${REPLACING_VERSIONS} ]]; then
if [[ -x ${ROOT}etc/init.d/kmod-static-nodes && -d ${ROOT}etc/runlevels/sysinit ]]; then
ln -s /etc/init.d/kmod-static-nodes "${ROOT}"/etc/runlevels/sysinit/kmod-static-nodes
@@ -127,9 +117,8 @@
if [[ -e ${ROOT}etc/runlevels/sysinit ]]; then
if [[ ! -e ${ROOT}etc/runlevels/sysinit/kmod-static-nodes ]]; then
ewarn
- ewarn "You need to add kmod-static-nodes to the sysinit runlevel."
- ewarn "If you do not do this,"
- ewarn "your system will not necessarily have the required static nodes!"
+ ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+ ewarn "kernel modules to have required static nodes!"
ewarn "Run this command:"
ewarn "\trc-update add kmod-static-nodes sysinit"
fi
1.110 sys-apps/kmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.109&r2=1.110
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- ChangeLog 16 Aug 2013 14:25:19 -0000 1.109
+++ ChangeLog 24 Aug 2013 10:59:48 -0000 1.110
@@ -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.109 2013/08/16 14:25:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.110 2013/08/24 10:59:48 ssuominen Exp $
+
+ 24 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> kmod-13-r1.ebuild,
+ kmod-14-r1.ebuild, kmod-14-r2.ebuild, kmod-9999.ebuild:
+ Remove checks for CONFIG_MODULES and CONFIG_MODULE_UNLOAD and upgrade path
+ from sys-apps/module-init-tools wrt #462926 by Mike Frysinger. Bail out early
+ if the used compiler is too old wrt #481020.
*kmod-14-r1 (16 Aug 2013)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-08-24 10:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-24 10:59 [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild kmod-13-r1.ebuild kmod-14-r1.ebuild kmod-14-r2.ebuild ChangeLog Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox