* [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild kmod-12-r1.ebuild ChangeLog kmod-12.ebuild
@ 2012-12-18 10:23 Samuli Suominen (ssuominen)
0 siblings, 0 replies; only message in thread
From: Samuli Suominen (ssuominen) @ 2012-12-18 10:23 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/12/18 10:23:37
Modified: kmod-9999.ebuild ChangeLog
Added: kmod-12-r1.ebuild
Removed: kmod-12.ebuild
Log:
Moving binaries to where they are with module-init-tools one last time wrt #447580 by "consus"
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path
1.43 sys-apps/kmod/kmod-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.42&r2=1.43
Index: kmod-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kmod-9999.ebuild 5 Dec 2012 17:13:29 -0000 1.42
+++ kmod-9999.ebuild 18 Dec 2012 10:23:37 -0000 1.43
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.42 2012/12/05 17:13:29 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.43 2012/12/18 10:23:37 ssuominen Exp $
EAPI=4
@@ -54,7 +54,7 @@
src_configure()
{
econf \
- --bindir=/bin \
+ --bindir=/sbin \
--with-rootlibdir=/$(get_libdir) \
$(use_enable static-libs static) \
$(use_enable tools) \
@@ -72,12 +72,9 @@
if use tools; then
local cmd
for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
- dosym kmod /bin/${cmd}
+ dosym kmod /sbin/${cmd}
done
- # Compatibility symlink(s):
- # These are both hardcoded in the Linux kernel source tree wrt #426698
- dosym /bin/kmod /sbin/depmod
- dosym /bin/kmod /sbin/modprobe
+ dosym /sbin/kmod /bin/lsmod
fi
cat <<-EOF > "${T}"/usb-load-ehci-first.conf
1.64 sys-apps/kmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.63&r2=1.64
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog 6 Dec 2012 18:26:59 -0000 1.63
+++ ChangeLog 18 Dec 2012 10:23:37 -0000 1.64
@@ -1,6 +1,16 @@
# ChangeLog for sys-apps/kmod
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.63 2012/12/06 18:26:59 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.64 2012/12/18 10:23:37 ssuominen Exp $
+
+ 18 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> -kmod-12.ebuild:
+ old
+
+*kmod-12-r1 (18 Dec 2012)
+
+ 18 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> +kmod-12-r1.ebuild,
+ kmod-9999.ebuild:
+ Moving binaries to where they are with module-init-tools one last time (!)
+ wrt #447580 by "consus"
06 Dec 2012; William Hubbs <williamh@gentoo.org> -kmod-11-r4.ebuild:
remove broken version
1.1 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.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-12-r1.ebuild?rev=1.1&content-type=text/plain
Index: kmod-12-r1.ebuild
===================================================================
# Copyright 1999-2012 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.1 2012/12/18 10:23:37 ssuominen Exp $
EAPI=4
inherit autotools eutils libtool multilib
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 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 )
zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
DEPEND="${RDEPEND}
dev-libs/libxslt
doc? ( dev-util/gtk-doc )
lzma? ( virtual/pkgconfig )
zlib? ( virtual/pkgconfig )"
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
}
src_configure()
{
econf \
--bindir=/sbin \
--with-rootlibdir=/$(get_libdir) \
$(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 cmd
for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
dosym kmod /sbin/${cmd}
done
dosym /sbin/kmod /bin/lsmod
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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-12-18 10:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-18 10:23 [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild kmod-12-r1.ebuild ChangeLog kmod-12.ebuild 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