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: Wed, 13 Feb 2019 23:46:36
Message-Id: 1550101586.b142f9bc848cbf7e9309791828cd141606b0e206.polynomial-c@gentoo
1 commit: b142f9bc848cbf7e9309791828cd141606b0e206
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 13 23:45:02 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 13 23:46:26 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b142f9bc
7
8 sys-apps/kmod: Bump to version 26
9
10 Package-Manager: Portage-2.3.60, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/kmod/Manifest | 1 +
14 sys-apps/kmod/kmod-26.ebuild | 193 +++++++++++++++++++++++++++++++++++++++++++
15 2 files changed, 194 insertions(+)
16
17 diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
18 index fcd6ee3777a..73f60c13354 100644
19 --- a/sys-apps/kmod/Manifest
20 +++ b/sys-apps/kmod/Manifest
21 @@ -1,2 +1,3 @@
22 DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb2462315c0e5dc955b58f02ffd0504a77859b7030c3619f1b5f6a7fa3fb25ec99d90ac67f0167b1eb889 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779
23 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
24 +DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
25
26 diff --git a/sys-apps/kmod/kmod-26.ebuild b/sys-apps/kmod/kmod-26.ebuild
27 new file mode 100644
28 index 00000000000..7738137ba64
29 --- /dev/null
30 +++ b/sys-apps/kmod/kmod-26.ebuild
31 @@ -0,0 +1,193 @@
32 +# Copyright 1999-2019 Gentoo Authors
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
36 +
37 +PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
38 +
39 +inherit bash-completion-r1 multilib python-r1
40 +
41 +if [[ ${PV} == 9999* ]]; then
42 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
43 + inherit autotools git-r3
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 ssl 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 + ssl? ( >=dev-libs/openssl-1.1.0:0= )
71 + zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
72 +DEPEND="${RDEPEND}
73 + doc? ( dev-util/gtk-doc )
74 + lzma? ( virtual/pkgconfig )
75 + python? (
76 + dev-python/cython[${PYTHON_USEDEP}]
77 + virtual/pkgconfig
78 + )
79 + zlib? ( virtual/pkgconfig )"
80 +if [[ ${PV} == 9999* ]]; then
81 + DEPEND="${DEPEND}
82 + dev-libs/libxslt"
83 +fi
84 +
85 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
86 +
87 +DOCS="NEWS README TODO"
88 +
89 +src_prepare() {
90 + default
91 +
92 + if [[ ! -e configure ]] ; then
93 + if use doc; then
94 + gtkdocize --copy --docdir libkmod/docs || die
95 + else
96 + touch libkmod/docs/gtk-doc.make
97 + fi
98 + eautoreconf
99 + else
100 + elibtoolize
101 + fi
102 +
103 + # Restore possibility of running --enable-static wrt #472608
104 + sed -i \
105 + -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
106 + configure || die
107 +}
108 +
109 +src_configure() {
110 + local myeconfargs=(
111 + --bindir="${EPREFIX}/bin"
112 + --enable-shared
113 + --with-bashcompletiondir="$(get_bashcompdir)"
114 + --with-rootlibdir="${EPREFIX}/$(get_libdir)"
115 + $(use_enable debug)
116 + $(use_enable doc gtk-doc)
117 + $(use_enable static-libs static)
118 + $(use_enable tools)
119 + $(use_with lzma xz)
120 + $(use_with ssl openssl)
121 + $(use_with zlib)
122 + )
123 +
124 + local ECONF_SOURCE="${S}"
125 +
126 + kmod_configure() {
127 + mkdir -p "${BUILD_DIR}" || die
128 + run_in_build_dir econf "${myeconfargs[@]}" "$@"
129 + }
130 +
131 + BUILD_DIR="${WORKDIR}/build"
132 + kmod_configure --disable-python
133 +
134 + if use python; then
135 + python_foreach_impl kmod_configure --enable-python
136 + fi
137 +}
138 +
139 +src_compile() {
140 + emake -C "${BUILD_DIR}"
141 +
142 + if use python; then
143 + local native_builddir=${BUILD_DIR}
144 +
145 + python_compile() {
146 + emake -C "${BUILD_DIR}" -f Makefile -f - python \
147 + VPATH="${native_builddir}:${S}" \
148 + native_builddir="${native_builddir}" \
149 + libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
150 + <<< 'python: $(pkgpyexec_LTLIBRARIES)'
151 + }
152 +
153 + python_foreach_impl python_compile
154 + fi
155 +}
156 +
157 +src_install() {
158 + emake -C "${BUILD_DIR}" DESTDIR="${D}" install
159 + einstalldocs
160 +
161 + if use python; then
162 + local native_builddir=${BUILD_DIR}
163 +
164 + python_install() {
165 + emake -C "${BUILD_DIR}" DESTDIR="${D}" \
166 + VPATH="${native_builddir}:${S}" \
167 + install-pkgpyexecLTLIBRARIES \
168 + install-dist_pkgpyexecPYTHON
169 + }
170 +
171 + python_foreach_impl python_install
172 + fi
173 +
174 + find "${ED}" -name "*.la" -delete || die
175 +
176 + if use tools; then
177 + local bincmd sbincmd
178 + for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
179 + dosym ../bin/kmod /sbin/${sbincmd}
180 + done
181 +
182 + # These are also usable as normal user
183 + for bincmd in lsmod modinfo; do
184 + dosym kmod /bin/${bincmd}
185 + done
186 + fi
187 +
188 + cat <<-EOF > "${T}"/usb-load-ehci-first.conf
189 + softdep uhci_hcd pre: ehci_hcd
190 + softdep ohci_hcd pre: ehci_hcd
191 + EOF
192 +
193 + insinto /lib/modprobe.d
194 + doins "${T}"/usb-load-ehci-first.conf #260139
195 +
196 + newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
197 +}
198 +
199 +pkg_postinst() {
200 + if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
201 + ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
202 + rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
203 + fi
204 +
205 + # Add kmod to the runlevel automatically if this is the first install of this package.
206 + if [[ -z ${REPLACING_VERSIONS} ]]; then
207 + if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
208 + mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
209 + fi
210 + if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
211 + ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
212 + fi
213 + fi
214 +
215 + if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
216 + if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
217 + ewarn
218 + ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
219 + ewarn "kernel modules to have required static nodes!"
220 + ewarn "Run this command:"
221 + ewarn "\trc-update add kmod-static-nodes sysinit"
222 + fi
223 + fi
224 +}