diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-14 21:30:45 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-05-14 21:30:45 +0000 |
commit | b3c7956d57f75793888817f5765ea542cfc31f8c (patch) | |
tree | 53c6f6f33c8091ac8ebe152971ff5551a46c4057 /sys-apps/kmod | |
parent | amd64/x86 stable wrt #509924 (diff) | |
download | historical-b3c7956d57f75793888817f5765ea542cfc31f8c.tar.gz historical-b3c7956d57f75793888817f5765ea542cfc31f8c.tar.bz2 historical-b3c7956d57f75793888817f5765ea542cfc31f8c.zip |
Punt USE="openrc" which was to allow USE=-openrc install <sys-apps/openrc-0.12, but now they are no longer in portage, which obviously means we don't need USE="opnerc" here anymore. Futher, installing init scripts always is preferred anyway as sys-apps/openrc is the gentoo default. Futher, this is the exact same behavior in pkg_postinst() as with sys-fs/udev-init-scripts. Both, sys-fs/udev-init-scripts and sys-apps/kmod are pulled in by sys-apps/systemd, and sys-fs/udev.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'sys-apps/kmod')
-rw-r--r-- | sys-apps/kmod/ChangeLog | 12 | ||||
-rw-r--r-- | sys-apps/kmod/Manifest | 24 | ||||
-rw-r--r-- | sys-apps/kmod/kmod-16.ebuild | 48 | ||||
-rw-r--r-- | sys-apps/kmod/kmod-17.ebuild | 48 | ||||
-rw-r--r-- | sys-apps/kmod/kmod-9999.ebuild | 48 | ||||
-rw-r--r-- | sys-apps/kmod/metadata.xml | 1 |
6 files changed, 92 insertions, 89 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index 86f6534a4c39..a0afcf00b3fc 100644 --- a/sys-apps/kmod/ChangeLog +++ b/sys-apps/kmod/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-apps/kmod # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.150 2014/05/14 21:18:32 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.151 2014/05/14 21:30:38 ssuominen Exp $ + + 14 May 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-16.ebuild, + kmod-17.ebuild, kmod-9999.ebuild, metadata.xml: + Punt USE="openrc" which was to allow USE=-openrc install <sys- + apps/openrc-0.12, but now they are no longer in portage, which obviously means + we don't need USE="opnerc" here anymore. Futher, installing init scripts + always is preferred anyway as sys-apps/openrc is the gentoo default. Futher, + this is the exact same behavior in pkg_postinst() as with sys-fs/udev-init- + scripts. Both, sys-fs/udev-init-scripts and sys-apps/kmod are pulled in by + sys-apps/systemd, and sys-fs/udev. 14 May 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-17.ebuild: amd64/x86 stable wrt #509924 diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index e29f251561b7..f4f4cbdbc0f8 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -5,19 +5,19 @@ AUX kmod-15-dynamic-kmod.patch 493 SHA256 36aa0232ec80a8f211c29d349ab5ef8c3f6dea AUX kmod-static-nodes 584 SHA256 078b07581e63b5113cef9e85da7d5b53e1fbad91d793f7fa8b7188b364689b0e SHA512 cddd4e95ffd112adedfb01c90ea3cea268236983f2dd88f0a83855d62dfa8a63e1f1457a9517ebbc45970455b8f8c0dc7f4d56c138bcc3d453c7ba61d189ff85 WHIRLPOOL 920e19b8d99ff77a337b0edf2fda3461249bdd253d1c6d14c1e872d931ef643679185e8bac6b7d58490dae640f78cc1a8492f627893bfee46b48fa2c4efc947b DIST kmod-16.tar.xz 1440880 SHA256 63412efab37c70459ccef167556965c93fd4f56af5986cd3750542a684c613c5 SHA512 326921bb184d53840837cc600f6301b948031ef7c2048e46ef16bc26ef7b967fa3c20cb133b1ebbddcf8a8537e9af8166fbca6a28d94f694f12ce1d89361a1bc WHIRLPOOL 625c277d7733a344040eaaeca26ce103d79c96ca1ba7759302e5fd573bba86285420c6f599a70411e7732e22145108afadbc29606d9f8fc62fe94479480f3a3f DIST kmod-17.tar.xz 1484336 SHA256 3ba7470041de04ca88308f501901b574169cb517d3192397074611b3921a2dfa SHA512 2b237a96b8bcfe03bde30d4f8b6886f8ec33817cc6f0fe810f6f382310bd71814236b299b9051304ca5a9b29c205d8e1ba5a15bf6ee98648644ac268dc368294 WHIRLPOOL 421f95e48da7baf40617c9222d4cc26868d26dbf51f77aa2613cfe5cf7a84b5489eca4611fe86108135c164890eeab32916836776561ab8f2541aa10456d1095 -EBUILD kmod-16.ebuild 3791 SHA256 be36a499e17190ab608b19706978477063d3c6295700838d613504000014bf20 SHA512 a2a237b0f0c95852c64030bae807c9501da448f9c7a2858b1bbbbda5a347b2dbeb473d941f91a28ee7eb2083814f17fa6aefb9081038c771ff658c97d4195852 WHIRLPOOL d7dafcabc14d2195f61dced5724c1de14eaa57770af51c40e1daf1224c6e32dee995a2ba9f0be5185c1de91acf6e3eab83c2a82dc39e2216cd41e6d041623432 -EBUILD kmod-17.ebuild 5131 SHA256 2bf1eb3dc22bec92fb158838cf259aa54252a708fc0282a252d364b3616d202f SHA512 d228f07423a3d387db2e46b8951a1d96b83fb2d2752d652433868162d362755ed9733c37a1dd2464d7ad47df8a2259bb30269944e629dd6833d323b945381353 WHIRLPOOL 97e61e6197d2e0d2c678130f390e5c23c722695a49850f774d76a2eb54c85b9d7022a3f31e7a1eace826a859f29ed191cf4ea5bfb3622da4ed742ed55441bf80 -EBUILD kmod-9999.ebuild 5135 SHA256 3302c13cbb789a35a7aa76dd3a42d1c5ef6a531985316db36206b0fd1a329f73 SHA512 cf44f4528ea193773c6cf9be86900b256bad34e9f70bcb35c1e5445d4520c27ea89b055dd853b6b5597d3bb6e3869a1712aab189eb16e62953d28f46450a5f8f WHIRLPOOL f812e9acad1be5b86749cbafe8e75f5f5e527e9a503030d324b6c1799ce6e51aec1dca9844d14442ea905e3783fb46a10c81d850f7188e24b51f679f0ba1471a -MISC ChangeLog 21389 SHA256 5d10a59e2a43a74a7c6bd66d48b72b624bf3f1cbc5f7d5c3ed7fd0439e634306 SHA512 ed12a7b057fbd3430b821260b4cc3fd2999a86b12e481838c5588a375fee46e02160606fb408cdaa6ecb47048564bb6e12c7ebe93e31ec088a6079b246589447 WHIRLPOOL f8e02b96385476677a48e21d2cf2643feffd467085cc786e2cc110d6f1faede05ed9504b14167a0241822f1e8da2f5bc783c820c4f9b615a7791c9f2c58828a2 -MISC metadata.xml 376 SHA256 5eb64ba82d456033efa6947dff12b009f73f4e5b4e883841c7fb4c8a368b3e0c SHA512 7dd59b5c777f37c5aa734a81562491ab90e0ed2854340f4d89fd9198d17c8e8d880e8d47ae99dba23b1fb16bc0b711788b7159f77ff53b08a2b2a3af01894f43 WHIRLPOOL d659931a7f525e0453e86a96f2dd6ca889bcf428496f1510bb612251961dac7afa5c36b87f90947371f4903c84b5cabf42d7647cfbbbf7af3e24396107a7197f +EBUILD kmod-16.ebuild 3710 SHA256 54a9acb449fa1a3e1c6205c86c25b5ca731d6f60831f57f6cddb9f9f50183ae4 SHA512 af07adaafe88489047b296cd97c345260f5776f34742c89bfef9f372d62ae1a87973a5fcc3237577a9b70265249020b2b6be5a5c308a7c158576402fb4ad228f WHIRLPOOL b93f5d9bbd94013ed7db8cae2b514c573aea7e29110184e6ea57c5f1ac177bee10b95c55615c312ca7e455c93f1c552757ace616f5ec33280b33a3b38101319e +EBUILD kmod-17.ebuild 5050 SHA256 1f587e36ab6a8f370d2f9505e0a623c477a3b71983aa6f85994a88d10b1dec67 SHA512 2cb5fa44a97a82aab9f5387f096c2593cc1be63051c82eb50eb214d23c7bd358aebb6d1300da12f62830ea7f463043058b7212061c8ab94de80c9c42a9e5d140 WHIRLPOOL 730cf50cddbbb6b32e9c64b65a4df3cd123301758cf11df362aeb54733db9e718002387d62d1d3e6b821e3fb75b1f53c17a20add993b5d6001fa9b74ee163d4d +EBUILD kmod-9999.ebuild 5056 SHA256 3da9b18a3d1b034c3cc21cac91bc008dd6904f742a65a8958e19a7c31ab9af88 SHA512 bf63989a683f198aac09a69e7e4af5e927a245be50d10e576aab57202dd4f611662e31363e02110dc41ebaeddd88fb4e14eb596a039cf11501841bf83333daef WHIRLPOOL 5a33bfff7819de4a5452b0b860bbe7132897f2a870b08058cf4e5c2a6dda1c289508ab5ea3fab205b2a53451d96acb29e5d2c7f2d4a83969776907eb8b8216bd +MISC ChangeLog 22002 SHA256 a02aea54b5bcc2077a2c9ba79aa06d888ae1df09223112b1c7c534c85937fd14 SHA512 89aac46ec253e6bbbbd10e8d10991ef1b1e10d15dcb30d119c15dc50242271bc9ff00bec28a2ca958d087ceb6a168c5d0f81e960aee7a47b668c6b50d670d7fd WHIRLPOOL fd6d7364a134d9c98b21d86357e670a3c8cd36d86aaab8f329d2509e891ab989e09930f73bd599b16fd1253a2c3601db5b1bed7087895a783bfadf119fbd9b8a +MISC metadata.xml 315 SHA256 615f47d63e08942e7a0c3cd3246f70d2f49b276aec75c84a9ec5e1188a91a18e SHA512 0f8bb9e3ba70ec5084d3c8a3fe8fba508dec2a33cb77cc13f3aba35c70b53d9011674a862033de6ba83aefb1b351b4d1fac7112d2e61070444620191f8ed8742 WHIRLPOOL 928f3536c928ba3457a2f94eb6de26e3c13f5a34748d554219edd8aa5841c24ebbc5930fcb147550c0cd9d8f5eae8f4a1cd04f3267ddbe066450178e38d7cb37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJTc91pAAoJEEdUh39IaPFND84H/jCWtgqWVvzlDCZf4cfNPU/q -oicPlmaqCueySKet9GvOHZ+pENVSLUGwGR09QCwjXV3S4qwF8ydKrBkNOaQ6yCCF -/CSlhou6ojbpLe13q5CYp/dJgOgKoNxx8qssVZ8tAgFRXp4PWZSoyxbePtfK2igk -Ndhe4QN/FHkFXgAD8heJq3M16qrkQYHjy970KDn57ec6t98B3ptJSGmUUC8l+GFB -LZACVdOUCRzVLL5LlVwwW/T1NEpZ0TM3dAnDzxYk/k/8g04FPQf23/yfhe/FExf/ -IrR8qtbZSiYGKQ0S+67jYEXF3sQ8BfM0F75n9HXlZ50hAXgEgTLabT7Jy8Cqxjk= -=gWbP +iQEcBAEBCAAGBQJTc+BAAAoJEEdUh39IaPFNrisH/1QeRIZLcM7DvgAm89AHozxj +E5bfAj4zGh6vrYuIhRSjpAFiBAIfn1RvgkEFvbkTwfRyzrc5QPQnK85R1m7tFy9s +h3G8wS7G6M6TWOtvaJHLzyHHstOPBhhIO6c2HUH4wpubl/BM4x9AO56ifAOxPwLb +7i3Hv2nkbR0gBdAGqJg6GYUDoxmqT5kiaHQoGNQteCTa2dHi57w5kgYTPztMoLeE +7W3H/3WbhQdLPhax75lDT6tY43HPWxocNm2C30jFXkErmDXe1dXpn+mURJJkOe4F +wK8LPE8G8CFYPdTTJU6vl3wiOn7ImCbxT3x9Xo77ZUNsqbo1xzD4Cc4iKjrTnoU= +=t69P -----END PGP SIGNATURE----- diff --git a/sys-apps/kmod/kmod-16.ebuild b/sys-apps/kmod/kmod-16.ebuild index ab8d43277e78..fd8f9ca28ddd 100644 --- a/sys-apps/kmod/kmod-16.ebuild +++ b/sys-apps/kmod/kmod-16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.14 2014/04/05 11:02:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.15 2014/05/14 21:30:38 ssuominen Exp $ EAPI=5 inherit bash-completion-r1 eutils multilib @@ -19,7 +19,7 @@ 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" +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. @@ -30,7 +30,7 @@ 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 ) + !<sys-apps/openrc-0.12 zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 DEPEND="${RDEPEND} dev-libs/libxslt @@ -105,34 +105,32 @@ src_install() { insinto /lib/modprobe.d doins "${T}"/usb-load-ehci-first.conf #260139 - use openrc && doinitd "${FILESDIR}"/kmod-static-nodes + 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 + 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 [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${ROOT%/}"/etc/runlevels/sysinit - fi - if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes - fi + # Add kmod to the runlevel automatically if this is the first install of this package. + if [[ -z ${REPLACING_VERSIONS} ]]; then + if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then + mkdir -p "${ROOT%/}"/etc/runlevels/sysinit fi + if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; 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 + 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 } diff --git a/sys-apps/kmod/kmod-17.ebuild b/sys-apps/kmod/kmod-17.ebuild index acc178d531b8..50142c729992 100644 --- a/sys-apps/kmod/kmod-17.ebuild +++ b/sys-apps/kmod/kmod-17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.7 2014/05/14 21:18:32 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-17.ebuild,v 1.8 2014/05/14 21:30:38 ssuominen Exp $ EAPI=5 @@ -22,7 +22,7 @@ HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git" LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc lzma +openrc python static-libs +tools zlib" +IUSE="debug doc lzma python 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. @@ -32,8 +32,8 @@ RESTRICT="test" RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils + !<sys-apps/openrc-0.12 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - openrc? ( !<sys-apps/openrc-0.12 ) python? ( ${PYTHON_DEPS} ) zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 DEPEND="${RDEPEND} @@ -161,34 +161,32 @@ src_install() { insinto /lib/modprobe.d doins "${T}"/usb-load-ehci-first.conf #260139 - use openrc && doinitd "${FILESDIR}"/kmod-static-nodes + 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 + 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 [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${ROOT%/}"/etc/runlevels/sysinit - fi - if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes - fi + # Add kmod to the runlevel automatically if this is the first install of this package. + if [[ -z ${REPLACING_VERSIONS} ]]; then + if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then + mkdir -p "${ROOT%/}"/etc/runlevels/sysinit fi + if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; 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 + 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 } diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 73ba6b29a440..1a22a1e0ad00 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.76 2014/04/24 19:52:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.77 2014/05/14 21:30:38 ssuominen Exp $ EAPI=5 @@ -22,7 +22,7 @@ HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git" LICENSE="LGPL-2" SLOT="0" -IUSE="debug doc lzma +openrc python static-libs +tools zlib" +IUSE="debug doc lzma python 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. @@ -32,8 +32,8 @@ RESTRICT="test" RDEPEND="!sys-apps/module-init-tools !sys-apps/modutils + !<sys-apps/openrc-0.12 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) - openrc? ( !<sys-apps/openrc-0.12 ) python? ( ${PYTHON_DEPS} ) zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 DEPEND="${RDEPEND} @@ -161,34 +161,32 @@ src_install() { insinto /lib/modprobe.d doins "${T}"/usb-load-ehci-first.conf #260139 - use openrc && doinitd "${FILESDIR}"/kmod-static-nodes + 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 + 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 [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then - mkdir -p "${ROOT%/}"/etc/runlevels/sysinit - fi - if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; then - ln -s /etc/init.d/kmod-static-nodes "${ROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes - fi + # Add kmod to the runlevel automatically if this is the first install of this package. + if [[ -z ${REPLACING_VERSIONS} ]]; then + if [[ ! -d ${ROOT%/}/etc/runlevels/sysinit ]]; then + mkdir -p "${ROOT%/}"/etc/runlevels/sysinit fi + if [[ -x ${ROOT%/}/etc/init.d/kmod-static-nodes ]]; 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 + 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 } diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml index 97fc7c560d6f..723317e9a34f 100644 --- a/sys-apps/kmod/metadata.xml +++ b/sys-apps/kmod/metadata.xml @@ -6,7 +6,6 @@ <email>udev-bugs@gentoo.org</email> </maintainer> <use> - <flag name='openrc'>Install the OpenRC init scripts</flag> <flag name='tools'>Install module loading/unloading tools.</flag> </use> </pkgmetadata> |