* [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild kmod-14-r2.ebuild ChangeLog
@ 2013-08-16 14:06 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-08-16 14:06 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/08/16 14:06:08
Modified: kmod-9999.ebuild ChangeLog
Added: kmod-14-r2.ebuild
Log:
Revision bump for OpenRC >= 0.12 to make the "static-nodes" -> "kmod-static-nodes" switch for everyone.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.62 sys-apps/kmod/kmod-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.61&r2=1.62
Index: kmod-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kmod-9999.ebuild 9 Aug 2013 20:29:53 -0000 1.61
+++ kmod-9999.ebuild 16 Aug 2013 14:06:08 -0000 1.62
@@ -1,6 +1,6 @@
# 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.61 2013/08/09 20:29:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.62 2013/08/16 14:06:08 ssuominen Exp $
EAPI=5
@@ -32,6 +32,7 @@
RDEPEND="!sys-apps/module-init-tools
!sys-apps/modutils
lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+ openrc? ( >=sys-apps/openrc-0.12 )
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
DEPEND="${RDEPEND}
dev-libs/libxslt
@@ -99,13 +100,7 @@
insinto /lib/modprobe.d
doins "${T}"/usb-load-ehci-first.conf #260139
- if use openrc; then
- if has_version '>=sys-apps/openrc-0.12'; then
- doinitd "${FILESDIR}"/kmod-static-nodes
- else
- doinitd "${FILESDIR}"/static-nodes
- fi
- fi
+ use openrc && doinitd "${FILESDIR}"/kmod-static-nodes
}
pkg_postinst() {
@@ -118,44 +113,25 @@
if use openrc; then
# Add kmod to the runlevel automatically if this is the first install of this package.
- if has_version '>=sys-apps/openrc-0.12'; then
- if [[ -L ${ROOT}etc/runlevels/boot/static-nodes ]]; then
- ewarn "Removing deprecated static-nodes init script from the boot runlevel"
- rm -f "${ROOT}"etc/runlevels/boot/static-nodes
- fi
-
- 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
- fi
- fi
+ if [[ -L ${ROOT}etc/runlevels/boot/static-nodes ]]; then
+ ewarn "Removing deprecated static-nodes init script from the boot runlevel"
+ rm -f "${ROOT}"etc/runlevels/boot/static-nodes
+ fi
- 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 boot runlevel."
- ewarn "If you do not do this,"
- ewarn "your system will not necessarily have the required static nodes!"
- ewarn "Run this command:"
- ewarn "\trc-update add kmod-static-nodes sysinit"
- fi
- fi
- else
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- if [[ -x ${ROOT}etc/init.d/static-nodes && -d ${ROOT}etc/runlevels/boot ]]; then
- ln -s /etc/init.d/static-nodes "${ROOT}"/etc/runlevels/boot/static-nodes
- fi
+ 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
fi
+ fi
- if [[ -e ${ROOT}etc/runlevels/boot ]]; then
- if [[ ! -e ${ROOT}etc/runlevels/boot/static-nodes ]]; then
- ewarn
- ewarn "You need to add static-nodes to the boot runlevel."
- ewarn "If you do not do this,"
- ewarn "your system will not necessarily have the required static nodes!"
- ewarn "Run this command:"
- ewarn "\trc-update add static-nodes boot"
- fi
+ 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 "Run this command:"
+ ewarn "\trc-update add kmod-static-nodes sysinit"
fi
fi
fi
1.106 sys-apps/kmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.105&r2=1.106
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- ChangeLog 9 Aug 2013 19:08:18 -0000 1.105
+++ ChangeLog 16 Aug 2013 14:06:08 -0000 1.106
@@ -1,6 +1,13 @@
# 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.105 2013/08/09 19:08:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.106 2013/08/16 14:06:08 ssuominen Exp $
+
+*kmod-14-r2 (16 Aug 2013)
+
+ 16 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> +kmod-14-r2.ebuild,
+ kmod-9999.ebuild:
+ Revision bump for OpenRC >= 0.12 to make the "static-nodes" -> "kmod-static-
+ nodes" switch for everyone.
09 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> kmod-14-r1.ebuild,
kmod-9999.ebuild, +files/kmod-static-nodes:
1.1 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.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild?rev=1.1&content-type=text/plain
Index: kmod-14-r2.ebuild
===================================================================
# 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.1 2013/08/16 14:06:08 ssuominen Exp $
EAPI=5
VIRTUAL_MODUTILS=1
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"
inherit git-2
else
SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
fi
DESCRIPTION="library and tools for managing linux kernel modules"
HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
LICENSE="LGPL-2"
SLOT="0"
IUSE="debug doc lzma +openrc static-libs +tools zlib"
# Upstream does not support running the test suite with custom configure flags.
# I was also told that the test suite is intended for kmod developers.
# So we have to restrict it.
# See bug #408915.
RESTRICT="test"
RDEPEND="!sys-apps/module-init-tools
!sys-apps/modutils
lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
openrc? ( >=sys-apps/openrc-0.12 )
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
DEPEND="${RDEPEND}
dev-libs/libxslt
doc? ( dev-util/gtk-doc )
lzma? ( virtual/pkgconfig )
zlib? ( virtual/pkgconfig )"
pkg_setup() {
CONFIG_CHECK="~MODULES ~MODULE_UNLOAD"
linux-info_pkg_setup
}
src_prepare() {
if [ ! -e configure ]; then
if use doc; then
gtkdocize --copy --docdir libkmod/docs || die
else
touch libkmod/docs/gtk-doc.make
fi
eautoreconf
else
elibtoolize
fi
# Restore possibility of running --enable-static wrt #472608
sed -i \
-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
configure || die
}
src_configure() {
econf \
--bindir=/bin \
--with-rootlibdir=/$(get_libdir) \
--enable-shared \
$(use_enable static-libs static) \
$(use_enable tools) \
$(use_enable debug) \
$(use_enable doc gtk-doc) \
$(use_with lzma xz) \
$(use_with zlib)
}
src_install() {
default
prune_libtool_files
if use tools; then
local bincmd sbincmd
for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
dosym /bin/kmod /sbin/${sbincmd}
done
# These are also usable as normal user
for bincmd in lsmod modinfo; do
dosym kmod /bin/${bincmd}
done
fi
cat <<-EOF > "${T}"/usb-load-ehci-first.conf
softdep uhci_hcd pre: ehci_hcd
softdep ohci_hcd pre: ehci_hcd
EOF
insinto /lib/modprobe.d
doins "${T}"/usb-load-ehci-first.conf #260139
use openrc && doinitd "${FILESDIR}"/kmod-static-nodes
}
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"
rm -f "${ROOT}"etc/runlevels/boot/static-nodes
fi
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
fi
fi
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 "Run this command:"
ewarn "\trc-update add kmod-static-nodes sysinit"
fi
fi
fi
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild kmod-14-r2.ebuild ChangeLog
@ 2013-08-16 14:07 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2013-08-16 14:07 UTC (permalink / raw
To: gentoo-commits
ssuominen 13/08/16 14:07:33
Modified: kmod-9999.ebuild kmod-14-r2.ebuild ChangeLog
Log:
Block old OpenRC instead of depending on new one to prevent circular dependency.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.63 sys-apps/kmod/kmod-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.62&r2=1.63
Index: kmod-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kmod-9999.ebuild 16 Aug 2013 14:06:08 -0000 1.62
+++ kmod-9999.ebuild 16 Aug 2013 14:07:33 -0000 1.63
@@ -1,6 +1,6 @@
# 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.62 2013/08/16 14:06:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.63 2013/08/16 14:07:33 ssuominen Exp $
EAPI=5
@@ -32,7 +32,7 @@
RDEPEND="!sys-apps/module-init-tools
!sys-apps/modutils
lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
- openrc? ( >=sys-apps/openrc-0.12 )
+ openrc? ( !<sys-apps/openrc-0.12 )
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
DEPEND="${RDEPEND}
dev-libs/libxslt
1.2 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.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild?r1=1.1&r2=1.2
Index: kmod-14-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmod-14-r2.ebuild 16 Aug 2013 14:06:08 -0000 1.1
+++ kmod-14-r2.ebuild 16 Aug 2013 14:07:33 -0000 1.2
@@ -1,6 +1,6 @@
# 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.1 2013/08/16 14:06:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-14-r2.ebuild,v 1.2 2013/08/16 14:07:33 ssuominen Exp $
EAPI=5
@@ -32,7 +32,7 @@
RDEPEND="!sys-apps/module-init-tools
!sys-apps/modutils
lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
- openrc? ( >=sys-apps/openrc-0.12 )
+ openrc? ( !<sys-apps/openrc-0.12 )
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
DEPEND="${RDEPEND}
dev-libs/libxslt
1.107 sys-apps/kmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.106&r2=1.107
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- ChangeLog 16 Aug 2013 14:06:08 -0000 1.106
+++ ChangeLog 16 Aug 2013 14:07:33 -0000 1.107
@@ -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.106 2013/08/16 14:06:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.107 2013/08/16 14:07:33 ssuominen Exp $
+
+ 16 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> kmod-14-r2.ebuild,
+ kmod-9999.ebuild:
+ Block old OpenRC instead of depending on new one to prevent circular
+ dependency.
*kmod-14-r2 (16 Aug 2013)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-16 14:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-16 14:07 [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild kmod-14-r2.ebuild ChangeLog Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2013-08-16 14:06 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