diff options
Diffstat (limited to 'sys-fs/zfs-kmod')
| -rw-r--r-- | sys-fs/zfs-kmod/Manifest | 8 | ||||
| -rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-2.0.2.ebuild (renamed from sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild) | 0 | ||||
| -rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-2.0.3.ebuild (renamed from sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild) | 32 |
3 files changed, 19 insertions, 21 deletions
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index b3f2e2df562c..7c86801821c6 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,9 +1,9 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23 -DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce -DIST zfs-2.0.1.tar.gz 12970188 BLAKE2B ec1ec4cfcc64adbe7ac0ce65e4fa118a77495886b1c8f2daea0b76f8bb32f0c4bbb6bc7fc16000b6c828f58e60b6ce8359a55ec1f2d2eef1279dd4f430e54f01 SHA512 7e8f490605cb80747a2e471ac5bdd184038f514da379ea7cadf14d5635d5f4cd1b47a7c92c95c4c1b7b0cf5ec22ea905d0d3e8d24e71733484f34cc9429f0f94 -EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322 +DIST zfs-2.0.2.tar.gz 12980696 BLAKE2B 34f4168365d36372349a4986f17cff64987a697e445c2de2ff0bf5d218725fad4aab12b0436ca816300a65856f5918f0cdb8931abeeacd894046daf013bb944f SHA512 5033645ad8fc2afd73187cc00e775ad79ac89e9a69841e1bda2867c2f05dab082f55fc83eedf2fdff1dab322f0eaac1ba2f8411def94e9cd7c011a03e84d5363 +DIST zfs-2.0.3.tar.gz 13114404 BLAKE2B 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 SHA512 8b2a6e0edfb3c85441076b2c6163ad3d7d239e11db128ab74d60bf8dc802d67b7f5b8d1cc7227316a7dc3917f14e9ac072ebf1583957f2a45c1b8438e4068200 EBUILD zfs-kmod-0.8.6.ebuild 4761 BLAKE2B 03ae7e6c75b1e0b2032758272eeef7ac5ceccb367ba9180aee173bbe322580ca9757915eaa13dcd88781d738341748e338f25c41eec95f6293a066850dfe286b SHA512 9991249746e2f912c6978eb8f771d2f25cb082a31b26c9bd5167985a6f8c11dcbae4851e965053dccfa7fcad323e973d150b0a4963f47be39c6513d614097d0e -EBUILD zfs-kmod-2.0.1.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41 +EBUILD zfs-kmod-2.0.2.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41 +EBUILD zfs-kmod-2.0.3.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41 EBUILD zfs-kmod-9999.ebuild 4445 BLAKE2B bb5601f29a461b9df1a65fa04ae99e76bfa6dfc36d1ae34a55b9b6210079ee61c8010962230cdac17ad8ff5abc5302750e61d158b607002598a45de301bc374e SHA512 b9dfb0464c041251531ac24798c731dc8046831d3f657e40402f142953b3c8f68c0eec64f42d13013723a565608fdce0e6ef07a79ff80962b3299ef883273e41 MISC metadata.xml 448 BLAKE2B 4a3c4f00039257710b1afa9fceba0480ea53df29d5c7a7eb0037fe326e9cc19f2dca572fa1122d769b6c432b4f6bbf6864d78cc9d0dd3fa797831d7c497ab8b4 SHA512 09d8c75b14b0934d134e10456074f51feeb35f77b59a089f7c6720ce9aa6c83819cdb7e72aa3879a71621310cdd24466ec2c9fd82e6e8040303547249c5464d5 diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.2.ebuild index 2fbfd85f7ccf..2fbfd85f7ccf 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.2.ebuild diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.3.ebuild index c5b1b6d6625d..2fbfd85f7ccf 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools flag-o-matic linux-mod toolchain-funcs +inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" HOMEPAGE="https://github.com/openzfs/zfs" @@ -12,13 +12,14 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/openzfs/zfs.git" else - SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - KEYWORDS="amd64 arm64 ppc64" - S="${WORKDIR}/zfs-${PV}" - ZFS_KERNEL_COMPAT="5.9" + MY_PV="${PV/_rc/-rc}" + SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64" + S="${WORKDIR}/zfs-${PV%_rc?}" + ZFS_KERNEL_COMPAT="5.10" fi -LICENSE="CDDL debug? ( GPL-2+ )" +LICENSE="CDDL MIT debug? ( GPL-2+ )" SLOT="0" IUSE="custom-cflags debug +rootfs" @@ -60,10 +61,6 @@ pkg_setup() { DEVTMPFS " - if use arm64; then - kernel_is -ge 5 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT" - fi - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" if [[ ${PV} != "9999" ]]; then @@ -75,13 +72,10 @@ pkg_setup() { kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" - # 0.8.x requires at least 2.6.32 - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - else - # git master requires at least 3.10 - kernel_is -ge 3 10 || die "Linux 3.10 or newer required" fi + kernel_is -ge 3 10 || die "Linux 3.10 or newer required" + linux-mod_pkg_setup } @@ -114,7 +108,7 @@ src_configure() { $(use_enable debug) ) - CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}" + econf "${myconf[@]}" } src_compile() { @@ -155,6 +149,10 @@ pkg_postinst() { rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" fi + if [[ -z ${ROOT} ]] && use dist-kernel; then + dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + fi + if use x86 || use arm; then ewarn "32-bit kernels will likely require increasing vmalloc to" ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |