1 |
commit: 1b8d861c26ab37300abcbc7efb2f614628454200 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 23 02:04:44 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 23 02:08:56 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8d861c |
7 |
|
8 |
sys-apps/kmod: drop 29, 29-r2 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
sys-apps/kmod/Manifest | 1 - |
13 |
sys-apps/kmod/kmod-29-r2.ebuild | 205 ---------------------------------------- |
14 |
sys-apps/kmod/kmod-29.ebuild | 203 --------------------------------------- |
15 |
3 files changed, 409 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest |
18 |
index 8001e3ac896a..0471cb625242 100644 |
19 |
--- a/sys-apps/kmod/Manifest |
20 |
+++ b/sys-apps/kmod/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998 |
23 |
DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e |
24 |
|
25 |
diff --git a/sys-apps/kmod/kmod-29-r2.ebuild b/sys-apps/kmod/kmod-29-r2.ebuild |
26 |
deleted file mode 100644 |
27 |
index d6f72bfcac71..000000000000 |
28 |
--- a/sys-apps/kmod/kmod-29-r2.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,205 +0,0 @@ |
31 |
-# Copyright 1999-2022 Gentoo Authors |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=8 |
35 |
- |
36 |
-PYTHON_COMPAT=( python3_{8..10} ) |
37 |
- |
38 |
-inherit autotools libtool bash-completion-r1 python-r1 |
39 |
- |
40 |
-if [[ ${PV} == 9999* ]]; then |
41 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" |
42 |
- inherit git-r3 |
43 |
-else |
44 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" |
45 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
46 |
-fi |
47 |
- |
48 |
-DESCRIPTION="library and tools for managing linux kernel modules" |
49 |
-HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" |
50 |
- |
51 |
-LICENSE="LGPL-2" |
52 |
-SLOT="0" |
53 |
-IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd" |
54 |
- |
55 |
-# Upstream does not support running the test suite with custom configure flags. |
56 |
-# I was also told that the test suite is intended for kmod developers. |
57 |
-# So we have to restrict it. |
58 |
-# See bug #408915. |
59 |
-RESTRICT="test" |
60 |
- |
61 |
-# - >=zlib-1.2.6 required because of bug #427130 |
62 |
-# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch |
63 |
-# - >=zstd-1.5.2-r1 required for bug #771078 |
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 |
- pkcs7? ( >=dev-libs/openssl-1.1.0:= ) |
71 |
- zlib? ( >=sys-libs/zlib-1.2.6 ) |
72 |
- zstd? ( >=app-arch/zstd-1.5.2-r1:= )" |
73 |
-DEPEND="${RDEPEND}" |
74 |
-BDEPEND=" |
75 |
- doc? ( |
76 |
- dev-util/gtk-doc |
77 |
- dev-util/gtk-doc-am |
78 |
- ) |
79 |
- lzma? ( virtual/pkgconfig ) |
80 |
- python? ( |
81 |
- dev-python/cython[${PYTHON_USEDEP}] |
82 |
- virtual/pkgconfig |
83 |
- ) |
84 |
- zlib? ( virtual/pkgconfig ) |
85 |
-" |
86 |
-if [[ ${PV} == 9999* ]]; then |
87 |
- BDEPEND="${BDEPEND} |
88 |
- dev-libs/libxslt" |
89 |
-fi |
90 |
- |
91 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
92 |
- |
93 |
-DOCS=( NEWS README TODO ) |
94 |
- |
95 |
-src_prepare() { |
96 |
- default |
97 |
- |
98 |
- if [[ ! -e configure ]] || use doc ; then |
99 |
- if use doc; then |
100 |
- cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die |
101 |
- gtkdocize --copy --docdir libkmod/docs || die |
102 |
- else |
103 |
- touch libkmod/docs/gtk-doc.make |
104 |
- fi |
105 |
- eautoreconf |
106 |
- else |
107 |
- elibtoolize |
108 |
- fi |
109 |
- |
110 |
- # Restore possibility of running --enable-static, bug #472608 |
111 |
- sed -i \ |
112 |
- -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ |
113 |
- configure || die |
114 |
-} |
115 |
- |
116 |
-src_configure() { |
117 |
- local myeconfargs=( |
118 |
- --bindir="${EPREFIX}/bin" |
119 |
- --enable-shared |
120 |
- --with-bashcompletiondir="$(get_bashcompdir)" |
121 |
- --with-rootlibdir="${EPREFIX}/$(get_libdir)" |
122 |
- $(use_enable debug) |
123 |
- $(usex doc '--enable-gtk-doc' '') |
124 |
- $(use_enable static-libs static) |
125 |
- $(use_enable tools) |
126 |
- $(use_with lzma xz) |
127 |
- $(use_with pkcs7 openssl) |
128 |
- $(use_with zlib) |
129 |
- $(use_with zstd) |
130 |
- ) |
131 |
- |
132 |
- local ECONF_SOURCE="${S}" |
133 |
- |
134 |
- kmod_configure() { |
135 |
- mkdir -p "${BUILD_DIR}" || die |
136 |
- run_in_build_dir econf "${myeconfargs[@]}" "$@" |
137 |
- } |
138 |
- |
139 |
- BUILD_DIR="${WORKDIR}/build" |
140 |
- kmod_configure --disable-python |
141 |
- |
142 |
- if use python; then |
143 |
- python_foreach_impl kmod_configure --enable-python |
144 |
- fi |
145 |
-} |
146 |
- |
147 |
-src_compile() { |
148 |
- emake -C "${BUILD_DIR}" |
149 |
- |
150 |
- if use python; then |
151 |
- local native_builddir="${BUILD_DIR}" |
152 |
- |
153 |
- python_compile() { |
154 |
- emake -C "${BUILD_DIR}" -f Makefile -f - python \ |
155 |
- VPATH="${native_builddir}:${S}" \ |
156 |
- native_builddir="${native_builddir}" \ |
157 |
- libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ |
158 |
- <<< 'python: $(pkgpyexec_LTLIBRARIES)' |
159 |
- } |
160 |
- |
161 |
- python_foreach_impl python_compile |
162 |
- fi |
163 |
-} |
164 |
- |
165 |
-src_install() { |
166 |
- emake -C "${BUILD_DIR}" DESTDIR="${D}" install |
167 |
- |
168 |
- einstalldocs |
169 |
- |
170 |
- if use python; then |
171 |
- local native_builddir="${BUILD_DIR}" |
172 |
- |
173 |
- python_install() { |
174 |
- emake -C "${BUILD_DIR}" DESTDIR="${D}" \ |
175 |
- VPATH="${native_builddir}:${S}" \ |
176 |
- install-pkgpyexecLTLIBRARIES \ |
177 |
- install-dist_pkgpyexecPYTHON |
178 |
- python_optimize |
179 |
- } |
180 |
- |
181 |
- python_foreach_impl python_install |
182 |
- fi |
183 |
- |
184 |
- find "${ED}" -type f -name "*.la" -delete || die |
185 |
- |
186 |
- if use tools; then |
187 |
- local cmd |
188 |
- for cmd in depmod insmod modprobe rmmod; do |
189 |
- dosym ../bin/kmod /sbin/${cmd} |
190 |
- done |
191 |
- |
192 |
- # These are also usable as normal user |
193 |
- for cmd in lsmod modinfo; do |
194 |
- dosym kmod /bin/${cmd} |
195 |
- done |
196 |
- fi |
197 |
- |
198 |
- cat <<-EOF > "${T}"/usb-load-ehci-first.conf |
199 |
- softdep uhci_hcd pre: ehci_hcd |
200 |
- softdep ohci_hcd pre: ehci_hcd |
201 |
- EOF |
202 |
- |
203 |
- insinto /lib/modprobe.d |
204 |
- # bug #260139 |
205 |
- doins "${T}"/usb-load-ehci-first.conf |
206 |
- |
207 |
- newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes |
208 |
-} |
209 |
- |
210 |
-pkg_postinst() { |
211 |
- if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then |
212 |
- ewarn "Removing old conflicting static-nodes init script from the boot runlevel" |
213 |
- rm -f "${EROOT}"/etc/runlevels/boot/static-nodes |
214 |
- fi |
215 |
- |
216 |
- # Add kmod to the runlevel automatically if this is the first install of this package. |
217 |
- if [[ -z ${REPLACING_VERSIONS} ]]; then |
218 |
- if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then |
219 |
- mkdir -p "${EROOT}"/etc/runlevels/sysinit |
220 |
- fi |
221 |
- if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then |
222 |
- ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes |
223 |
- fi |
224 |
- fi |
225 |
- |
226 |
- if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then |
227 |
- if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then |
228 |
- ewarn |
229 |
- ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" |
230 |
- ewarn "kernel modules to have required static nodes!" |
231 |
- ewarn "Run this command:" |
232 |
- ewarn "\trc-update add kmod-static-nodes sysinit" |
233 |
- fi |
234 |
- fi |
235 |
-} |
236 |
|
237 |
diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild |
238 |
deleted file mode 100644 |
239 |
index 215876687c49..000000000000 |
240 |
--- a/sys-apps/kmod/kmod-29.ebuild |
241 |
+++ /dev/null |
242 |
@@ -1,203 +0,0 @@ |
243 |
-# Copyright 1999-2022 Gentoo Authors |
244 |
-# Distributed under the terms of the GNU General Public License v2 |
245 |
- |
246 |
-EAPI=7 |
247 |
- |
248 |
-PYTHON_COMPAT=( python3_{7..10} ) |
249 |
- |
250 |
-inherit autotools bash-completion-r1 multilib python-r1 |
251 |
- |
252 |
-if [[ ${PV} == 9999* ]]; then |
253 |
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" |
254 |
- inherit git-r3 |
255 |
-else |
256 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz" |
257 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" |
258 |
- #inherit libtool |
259 |
-fi |
260 |
- |
261 |
-DESCRIPTION="library and tools for managing linux kernel modules" |
262 |
-HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git" |
263 |
- |
264 |
-LICENSE="LGPL-2" |
265 |
-SLOT="0" |
266 |
-IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd" |
267 |
- |
268 |
-# Upstream does not support running the test suite with custom configure flags. |
269 |
-# I was also told that the test suite is intended for kmod developers. |
270 |
-# So we have to restrict it. |
271 |
-# See bug #408915. |
272 |
-RESTRICT="test" |
273 |
- |
274 |
-# >=zlib-1.2.6 required because of bug #427130 |
275 |
-# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch |
276 |
-RDEPEND="!sys-apps/module-init-tools |
277 |
- !sys-apps/modutils |
278 |
- !<sys-apps/openrc-0.13.8 |
279 |
- !<sys-apps/systemd-216-r3 |
280 |
- lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) |
281 |
- python? ( ${PYTHON_DEPS} ) |
282 |
- pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) |
283 |
- zlib? ( >=sys-libs/zlib-1.2.6 ) |
284 |
- zstd? ( >=app-arch/zstd-1.4.4 )" |
285 |
-DEPEND="${RDEPEND}" |
286 |
-BDEPEND=" |
287 |
- doc? ( |
288 |
- dev-util/gtk-doc |
289 |
- dev-util/gtk-doc-am |
290 |
- ) |
291 |
- lzma? ( virtual/pkgconfig ) |
292 |
- python? ( |
293 |
- dev-python/cython[${PYTHON_USEDEP}] |
294 |
- virtual/pkgconfig |
295 |
- ) |
296 |
- zlib? ( virtual/pkgconfig ) |
297 |
-" |
298 |
-if [[ ${PV} == 9999* ]]; then |
299 |
- BDEPEND="${BDEPEND} |
300 |
- dev-libs/libxslt" |
301 |
-fi |
302 |
- |
303 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
304 |
- |
305 |
-DOCS=( NEWS README TODO ) |
306 |
- |
307 |
-src_prepare() { |
308 |
- default |
309 |
- |
310 |
- if [[ ! -e configure ]] || use doc ; then |
311 |
- if use doc; then |
312 |
- cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die |
313 |
- gtkdocize --copy --docdir libkmod/docs || die |
314 |
- else |
315 |
- touch libkmod/docs/gtk-doc.make |
316 |
- fi |
317 |
- eautoreconf |
318 |
- else |
319 |
- elibtoolize |
320 |
- fi |
321 |
- |
322 |
- # Restore possibility of running --enable-static wrt #472608 |
323 |
- sed -i \ |
324 |
- -e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \ |
325 |
- configure || die |
326 |
-} |
327 |
- |
328 |
-src_configure() { |
329 |
- local myeconfargs=( |
330 |
- --bindir="${EPREFIX}/bin" |
331 |
- --enable-shared |
332 |
- --with-bashcompletiondir="$(get_bashcompdir)" |
333 |
- --with-rootlibdir="${EPREFIX}/$(get_libdir)" |
334 |
- $(use_enable debug) |
335 |
- $(usex doc '--enable-gtk-doc' '') |
336 |
- $(use_enable static-libs static) |
337 |
- $(use_enable tools) |
338 |
- $(use_with lzma xz) |
339 |
- $(use_with pkcs7 openssl) |
340 |
- $(use_with zlib) |
341 |
- $(use_with zstd) |
342 |
- ) |
343 |
- |
344 |
- local ECONF_SOURCE="${S}" |
345 |
- |
346 |
- kmod_configure() { |
347 |
- mkdir -p "${BUILD_DIR}" || die |
348 |
- run_in_build_dir econf "${myeconfargs[@]}" "$@" |
349 |
- } |
350 |
- |
351 |
- BUILD_DIR="${WORKDIR}/build" |
352 |
- kmod_configure --disable-python |
353 |
- |
354 |
- if use python; then |
355 |
- python_foreach_impl kmod_configure --enable-python |
356 |
- fi |
357 |
-} |
358 |
- |
359 |
-src_compile() { |
360 |
- emake -C "${BUILD_DIR}" |
361 |
- |
362 |
- if use python; then |
363 |
- local native_builddir=${BUILD_DIR} |
364 |
- |
365 |
- python_compile() { |
366 |
- emake -C "${BUILD_DIR}" -f Makefile -f - python \ |
367 |
- VPATH="${native_builddir}:${S}" \ |
368 |
- native_builddir="${native_builddir}" \ |
369 |
- libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \ |
370 |
- <<< 'python: $(pkgpyexec_LTLIBRARIES)' |
371 |
- } |
372 |
- |
373 |
- python_foreach_impl python_compile |
374 |
- fi |
375 |
-} |
376 |
- |
377 |
-src_install() { |
378 |
- emake -C "${BUILD_DIR}" DESTDIR="${D}" install |
379 |
- einstalldocs |
380 |
- |
381 |
- if use python; then |
382 |
- local native_builddir=${BUILD_DIR} |
383 |
- |
384 |
- python_install() { |
385 |
- emake -C "${BUILD_DIR}" DESTDIR="${D}" \ |
386 |
- VPATH="${native_builddir}:${S}" \ |
387 |
- install-pkgpyexecLTLIBRARIES \ |
388 |
- install-dist_pkgpyexecPYTHON |
389 |
- python_optimize |
390 |
- } |
391 |
- |
392 |
- python_foreach_impl python_install |
393 |
- fi |
394 |
- |
395 |
- find "${ED}" -type f -name "*.la" -delete || die |
396 |
- |
397 |
- if use tools; then |
398 |
- local cmd |
399 |
- for cmd in depmod insmod modprobe rmmod; do |
400 |
- dosym ../bin/kmod /sbin/${cmd} |
401 |
- done |
402 |
- |
403 |
- # These are also usable as normal user |
404 |
- for cmd in lsmod modinfo; do |
405 |
- dosym kmod /bin/${cmd} |
406 |
- done |
407 |
- fi |
408 |
- |
409 |
- cat <<-EOF > "${T}"/usb-load-ehci-first.conf |
410 |
- softdep uhci_hcd pre: ehci_hcd |
411 |
- softdep ohci_hcd pre: ehci_hcd |
412 |
- EOF |
413 |
- |
414 |
- insinto /lib/modprobe.d |
415 |
- doins "${T}"/usb-load-ehci-first.conf #260139 |
416 |
- |
417 |
- newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes |
418 |
-} |
419 |
- |
420 |
-pkg_postinst() { |
421 |
- if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then |
422 |
- ewarn "Removing old conflicting static-nodes init script from the boot runlevel" |
423 |
- rm -f "${EROOT}"/etc/runlevels/boot/static-nodes |
424 |
- fi |
425 |
- |
426 |
- # Add kmod to the runlevel automatically if this is the first install of this package. |
427 |
- if [[ -z ${REPLACING_VERSIONS} ]]; then |
428 |
- if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then |
429 |
- mkdir -p "${EROOT}"/etc/runlevels/sysinit |
430 |
- fi |
431 |
- if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then |
432 |
- ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes |
433 |
- fi |
434 |
- fi |
435 |
- |
436 |
- if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then |
437 |
- if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then |
438 |
- ewarn |
439 |
- ewarn "You need to add kmod-static-nodes to the sysinit runlevel for" |
440 |
- ewarn "kernel modules to have required static nodes!" |
441 |
- ewarn "Run this command:" |
442 |
- ewarn "\trc-update add kmod-static-nodes sysinit" |
443 |
- fi |
444 |
- fi |
445 |
-} |