diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/kmod/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-16.ebuild | 124 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-9999.ebuild | 17 |
3 files changed, 138 insertions, 11 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index 180414d4c077..538399e8cf32 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.119 2013/12/09 01:55:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.120 2013/12/27 21:34:25 ssuominen Exp $ + +*kmod-16 (27 Dec 2013) + + 27 Dec 2013; Samuli Suominen <ssuominen@gentoo.org> +kmod-16.ebuild, + kmod-9999.ebuild: + Version bump (and synchronize with -9999) *kmod-15-r1 (09 Dec 2013) diff --git a/sys-apps/kmod/kmod-16.ebuild b/sys-apps/kmod/kmod-16.ebuild new file mode 100644 index 000000000000..e7a35060118b --- /dev/null +++ b/sys-apps/kmod/kmod-16.ebuild @@ -0,0 +1,124 @@ +# 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-16.ebuild,v 1.1 2013/12/27 21:34:25 ssuominen Exp $ + +EAPI=5 +inherit eutils multilib + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" + inherit autotools 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" + inherit libtool +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 )" + +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 + epatch "${FILESDIR}"/${PN}-15-dynamic-kmod.patch #493630 + 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() { + if use openrc; then + if [[ -L ${ROOT}etc/runlevels/boot/static-nodes ]]; then + 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 + 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 for" + ewarn "kernel modules to have required static nodes!" + ewarn "Run this command:" + ewarn "\trc-update add kmod-static-nodes sysinit" + fi + fi + fi +} diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 22c74e7ec01c..d723295cea93 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,16 +1,17 @@ # 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.65 2013/09/19 13:57:58 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.66 2013/12/27 21:34:25 ssuominen Exp $ EAPI=5 -inherit autotools eutils libtool multilib toolchain-funcs versionator +inherit eutils multilib -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" - inherit git-2 + inherit autotools 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" + inherit libtool fi DESCRIPTION="library and tools for managing linux kernel modules" @@ -37,11 +38,6 @@ DEPEND="${RDEPEND} lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig )" -pkg_setup() { - [[ $(tc-getCPP) == *cpp ]] && ! version_is_at_least 4.6 $(gcc-version) && \ - die "You need at least GNU GCC 4.6.x to build this package." #481020 -} - src_prepare() { if [ ! -e configure ]; then if use doc; then @@ -51,6 +47,7 @@ src_prepare() { fi eautoreconf else + epatch "${FILESDIR}"/${PN}-15-dynamic-kmod.patch #493630 elibtoolize fi @@ -63,7 +60,7 @@ src_prepare() { src_configure() { econf \ --bindir=/bin \ - --with-rootlibdir=/$(get_libdir) \ + --with-rootlibdir="/$(get_libdir)" \ --enable-shared \ $(use_enable static-libs static) \ $(use_enable tools) \ |