| 1 |
commit: a285cdf29fb8948bb736b3b8d2c6e83ef382ce7d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 2 14:45:38 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 14 23:11:14 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a285cdf2 |
| 7 |
|
| 8 |
sys-fs/zfs: use consistent 9999 test throughout, unify style |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-fs/zfs/zfs-9999.ebuild | 14 +++++++------- |
| 13 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild |
| 16 |
index ecae293cb14..fbce8715910 100644 |
| 17 |
--- a/sys-fs/zfs/zfs-9999.ebuild |
| 18 |
+++ b/sys-fs/zfs/zfs-9999.ebuild |
| 19 |
@@ -11,7 +11,7 @@ inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam sy |
| 20 |
DESCRIPTION="Userland utilities for ZFS Linux kernel module" |
| 21 |
HOMEPAGE="https://github.com/openzfs/zfs" |
| 22 |
|
| 23 |
-if [[ ${PV} == "9999" ]] ; then |
| 24 |
+if [[ ${PV} == "9999" ]]; then |
| 25 |
inherit git-r3 linux-mod |
| 26 |
EGIT_REPO_URI="https://github.com/openzfs/zfs.git" |
| 27 |
else |
| 28 |
@@ -19,7 +19,7 @@ else |
| 29 |
SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" |
| 30 |
S="${WORKDIR}/${P%_rc?}" |
| 31 |
|
| 32 |
- if [[ ${PV} != *_rc* ]] ; then |
| 33 |
+ if [[ ${PV} != *_rc* ]]; then |
| 34 |
KEYWORDS="~amd64 ~arm64 ~ppc64" |
| 35 |
fi |
| 36 |
fi |
| 37 |
@@ -86,7 +86,7 @@ pkg_setup() { |
| 38 |
if use kernel_linux && use test-suite; then |
| 39 |
linux-info_pkg_setup |
| 40 |
|
| 41 |
- if ! linux_config_exists; then |
| 42 |
+ if ! linux_config_exists; then |
| 43 |
ewarn "Cannot check the linux kernel configuration." |
| 44 |
else |
| 45 |
if use test-suite; then |
| 46 |
@@ -176,7 +176,7 @@ src_install() { |
| 47 |
use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } |
| 48 |
|
| 49 |
if ! use static-libs; then |
| 50 |
- find "${ED}/" -name '*.la' -delete || die |
| 51 |
+ find "${ED}" -name '*.la' -delete || die |
| 52 |
fi |
| 53 |
|
| 54 |
dobashcomp contrib/bash_completion.d/zfs |
| 55 |
@@ -198,14 +198,14 @@ src_install() { |
| 56 |
pkg_postinst() { |
| 57 |
if use rootfs; then |
| 58 |
if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then |
| 59 |
- elog "root on zfs requires initramfs to boot" |
| 60 |
- elog "the following packages known to provide one and tested on regular basis:" |
| 61 |
+ elog "Root on zfs requires an initramfs to boot" |
| 62 |
+ elog "The following packages provide one and are tested on a regular basis:" |
| 63 |
elog " sys-kernel/dracut" |
| 64 |
elog " sys-kernel/genkernel" |
| 65 |
fi |
| 66 |
fi |
| 67 |
|
| 68 |
- if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then |
| 69 |
+ if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then |
| 70 |
einfo "Adding ${P} to the module database to ensure that the" |
| 71 |
einfo "kernel modules and userland utilities stay in sync." |
| 72 |
update_moduledb |
Archives