Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kmod/
Date: Mon, 27 Feb 2017 10:44:25
Message-Id: 1488192249.e47bbdd9365e13dcefbb5163d3832c789a4cef2f.polynomial-c@gentoo
1 commit: e47bbdd9365e13dcefbb5163d3832c789a4cef2f
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 27 10:39:17 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 27 10:44:09 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47bbdd9
7
8 sys-apps/kmod: Bump to version 24
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 sys-apps/kmod/Manifest | 1 +
13 sys-apps/kmod/kmod-24.ebuild | 190 +++++++++++++++++++++++++++++++++++++++++++
14 2 files changed, 191 insertions(+)
15
16 diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
17 index 874305856b..6a76a44926 100644
18 --- a/sys-apps/kmod/Manifest
19 +++ b/sys-apps/kmod/Manifest
20 @@ -1,2 +1,3 @@
21 DIST kmod-22.tar.xz 449724 SHA256 ba3b1ddea33228b473189fcb05b809024a3b86e9a7cf37d420cae06beb749f82 SHA512 e021bacebb07ba4a178215ca1d1e091195fed1d289a76ec3ddb309182a90b6eab19d98eb1331772bc739f73ed6f540d92213b8088a573df13cd28ebd333a8876 WHIRLPOOL ed5b338698f250a0cb344da0789099a4fcdd098a1d64ed0f912fbb361ee91eaf13ceffec28e95757778a687ed8ed8acce16c0717000c598237e01abda256ca1c
22 DIST kmod-23.tar.xz 450376 SHA256 d303d5519faec9d69e1132f6b37db2579db17a7fb5c1517da0115d03ba168155 SHA512 84b18d35117b33c48fd9b732a584a9f94caef553e371bd4e68953540f46fc6c7145c8c7163df898875437ad56e1a47e89be26531314299bce0026c46da9dd3c0 WHIRLPOOL 319fc1c4728e51ef97a4c999ddcf8dc38587028b239a8adf48750335548c3a8e099d3b6a4d1d7a9b3f80ac83609a109d3053dea10ad8b98c2d694494b7f09330
23 +DIST kmod-24.tar.xz 536864 SHA256 610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779 WHIRLPOOL f722a515967f8a8cf60e4a053f9227a848230d8b006ca9ba13160b2d5e9f1d4b5abb30f7d4c3c04287da58c7960dd36a5cf7d122036457990b93e0ed42e84195
24
25 diff --git a/sys-apps/kmod/kmod-24.ebuild b/sys-apps/kmod/kmod-24.ebuild
26 new file mode 100644
27 index 0000000000..71f1511801
28 --- /dev/null
29 +++ b/sys-apps/kmod/kmod-24.ebuild
30 @@ -0,0 +1,190 @@
31 +# Copyright 1999-2017 Gentoo Foundation
32 +# Distributed under the terms of the GNU General Public License v2
33 +# $Id$
34 +
35 +EAPI=5
36 +
37 +PYTHON_COMPAT=( python{2_7,3_4,3_5} )
38 +
39 +inherit bash-completion-r1 eutils multilib python-r1
40 +
41 +if [[ ${PV} == 9999* ]]; then
42 + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
43 + inherit autotools git-2
44 +else
45 + SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
46 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
47 + inherit libtool
48 +fi
49 +
50 +DESCRIPTION="library and tools for managing linux kernel modules"
51 +HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
52 +
53 +LICENSE="LGPL-2"
54 +SLOT="0"
55 +IUSE="debug doc lzma python static-libs +tools zlib"
56 +
57 +# Upstream does not support running the test suite with custom configure flags.
58 +# I was also told that the test suite is intended for kmod developers.
59 +# So we have to restrict it.
60 +# See bug #408915.
61 +RESTRICT="test"
62 +
63 +# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
64 +RDEPEND="!sys-apps/module-init-tools
65 + !sys-apps/modutils
66 + !<sys-apps/openrc-0.13.8
67 + !<sys-apps/systemd-216-r3
68 + lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
69 + python? ( ${PYTHON_DEPS} )
70 + zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
71 +DEPEND="${RDEPEND}
72 + doc? ( dev-util/gtk-doc )
73 + lzma? ( virtual/pkgconfig )
74 + python? (
75 + dev-python/cython[${PYTHON_USEDEP}]
76 + virtual/pkgconfig
77 + )
78 + zlib? ( virtual/pkgconfig )"
79 +if [[ ${PV} == 9999* ]]; then
80 + DEPEND="${DEPEND}
81 + dev-libs/libxslt"
82 +fi
83 +
84 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
85 +
86 +DOCS="NEWS README TODO"
87 +
88 +src_prepare() {
89 + if [ ! -e configure ]; then
90 + if use doc; then
91 + gtkdocize --copy --docdir libkmod/docs || die
92 + else
93 + touch libkmod/docs/gtk-doc.make
94 + fi
95 + eautoreconf
96 + else
97 + elibtoolize
98 + fi
99 +
100 + # Restore possibility of running --enable-static wrt #472608
101 + sed -i \
102 + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
103 + configure || die
104 +}
105 +
106 +src_configure() {
107 + local myeconfargs=(
108 + --bindir="${EPREFIX}/bin"
109 + --with-rootlibdir="${EPREFIX}/$(get_libdir)"
110 + --enable-shared
111 + $(use_enable static-libs static)
112 + $(use_enable tools)
113 + $(use_enable debug)
114 + $(use_enable doc gtk-doc)
115 + $(use_with lzma xz)
116 + $(use_with zlib)
117 + --with-bashcompletiondir="$(get_bashcompdir)"
118 + )
119 +
120 + local ECONF_SOURCE="${S}"
121 +
122 + kmod_configure() {
123 + mkdir -p "${BUILD_DIR}" || die
124 + run_in_build_dir econf "${myeconfargs[@]}" "$@"
125 + }
126 +
127 + BUILD_DIR="${WORKDIR}/build"
128 + kmod_configure --disable-python
129 +
130 + if use python; then
131 + python_foreach_impl kmod_configure --enable-python
132 + fi
133 +}
134 +
135 +src_compile() {
136 + emake -C "${BUILD_DIR}"
137 +
138 + if use python; then
139 + local native_builddir=${BUILD_DIR}
140 +
141 + python_compile() {
142 + emake -C "${BUILD_DIR}" -f Makefile -f - python \
143 + VPATH="${native_builddir}:${S}" \
144 + native_builddir="${native_builddir}" \
145 + libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
146 + <<< 'python: $(pkgpyexec_LTLIBRARIES)'
147 + }
148 +
149 + python_foreach_impl python_compile
150 + fi
151 +}
152 +
153 +src_install() {
154 + emake -C "${BUILD_DIR}" DESTDIR="${D}" install
155 + einstalldocs
156 +
157 + if use python; then
158 + local native_builddir=${BUILD_DIR}
159 +
160 + python_install() {
161 + emake -C "${BUILD_DIR}" DESTDIR="${D}" \
162 + VPATH="${native_builddir}:${S}" \
163 + install-pkgpyexecLTLIBRARIES \
164 + install-dist_pkgpyexecPYTHON
165 + }
166 +
167 + python_foreach_impl python_install
168 + fi
169 +
170 + prune_libtool_files --modules
171 +
172 + if use tools; then
173 + local bincmd sbincmd
174 + for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
175 + dosym ../bin/kmod /sbin/${sbincmd}
176 + done
177 +
178 + # These are also usable as normal user
179 + for bincmd in lsmod modinfo; do
180 + dosym kmod /bin/${bincmd}
181 + done
182 + fi
183 +
184 + cat <<-EOF > "${T}"/usb-load-ehci-first.conf
185 + softdep uhci_hcd pre: ehci_hcd
186 + softdep ohci_hcd pre: ehci_hcd
187 + EOF
188 +
189 + insinto /lib/modprobe.d
190 + doins "${T}"/usb-load-ehci-first.conf #260139
191 +
192 + newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
193 +}
194 +
195 +pkg_postinst() {
196 + if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
197 + ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
198 + rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
199 + fi
200 +
201 + # Add kmod to the runlevel automatically if this is the first install of this package.
202 + if [[ -z ${REPLACING_VERSIONS} ]]; then
203 + if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
204 + mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
205 + fi
206 + if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
207 + ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
208 + fi
209 + fi
210 +
211 + if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
212 + if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
213 + ewarn
214 + ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
215 + ewarn "kernel modules to have required static nodes!"
216 + ewarn "Run this command:"
217 + ewarn "\trc-update add kmod-static-nodes sysinit"
218 + fi
219 + fi
220 +}