summaryrefslogtreecommitdiff
path: root/sys-fs/zfs-kmod
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-25 20:34:27 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-25 20:34:27 +0000
commit0f15659d48c193027158492acb726297501202c5 (patch)
tree5502ba879a78b759da28441d418dbbfe08bd8f03 /sys-fs/zfs-kmod
parent93a93e9a3b53c1a73142a305ea1f8136846942ee (diff)
gentoo xmass resync : 25.12.2021
Diffstat (limited to 'sys-fs/zfs-kmod')
-rw-r--r--sys-fs/zfs-kmod/Manifest13
-rw-r--r--sys-fs/zfs-kmod/metadata.xml4
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild2
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild2
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild212
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild4
-rw-r--r--sys-fs/zfs-kmod/zfs-kmod-9999.ebuild4
7 files changed, 228 insertions, 13 deletions
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 2ca8c1bcf0b3..3f8ae68b198f 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -2,10 +2,13 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b
DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8
DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c
+DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21 SHA512 1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f
+DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682
DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102
DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb
-EBUILD zfs-kmod-0.8.6.ebuild 5749 BLAKE2B 867ba8d060dc08eae4027d8c6e17f8ed31f429c87cc0ad9faa88aab0ee60d91e0a2a1d0b9dc59974d3c406a6266d4a4f752dab9e909a0df18ddf5c65152e6e13 SHA512 3f7303584c5324ed8715cd5a473344564ce2862b3e730722ac128a758f2750c1cb3ab2521185eae6e237ec1aa5dda82b8780009a51fc6798e27fc45b18c96f6a
-EBUILD zfs-kmod-2.0.6.ebuild 6044 BLAKE2B bccfccf6b6a101e67448fa592cce63dee9b7eba6bdb2b925c6f0e7d6605137a87cf2d6ea2e231c20adb2cdf53a716ccccd22d2b3d8d2e555e71e8fb6f6313c81 SHA512 4834745ccdf0d77ff8aa9ec8a5796ef4ed2209e8735c86bb3762080ba95e6d34963ca9ee87320d216ccd68e1faef2d7f411a2dd4cbcab4df9c0e438fe85049ea
-EBUILD zfs-kmod-2.1.2.ebuild 5260 BLAKE2B 57af8a2b3d4dfbe46828dc052b222f4f4cb7ace95a6e116ccd62616892a2fdc9b414f23ed6853e870f6623bf010e2b08048fce35ef1de04aebe136f65797fa25 SHA512 de5a2d68b49355302c1b534c0d416001bffd1f0e44d2f6e9eda4054c2a7dd090d57c5f692c76528552ca84f3481ee582e8816e698e12969ab8d927c86b33e8b2
-EBUILD zfs-kmod-9999.ebuild 5242 BLAKE2B 7ed1e8a1afc61c7df54cdfd2cef35490a6f0ccc69a2178292048b9ea22732fa9505d85fa8f09cd64a6e0cefb086f5c0e030527651e902c023571ea4f56a87f46 SHA512 ab608b6814a9178970124790eb6849a6bf62178fb0d091248a608b63d5a5152e53d4889a3bcd9c1f34505ab98c8adf1c6161706c2b52e19e33064fb364a08f2b
-MISC metadata.xml 549 BLAKE2B ae860684a4cf82c277fe91d11e0bcf283103a08442e78584c9962b1571efed7e6ee0e215f3341263f809978e63e01d70275a80fa4996b8265569539e0b2ffe34 SHA512 7a97c7965147549da470c9d5d3a541284964c5ec276d005a2f7aa1a4550c915cce32b2593257e5ad373c84955e3bf74b235297d540364ee4a17cf9e1e705b650
+EBUILD zfs-kmod-0.8.6.ebuild 5746 BLAKE2B b8d5cfa1c83f6ae0b565a0469f0c69def97fd536dc2645b623fe31cd2ca6d802976b3aacd05023ede636abb45c5a968256270809e4c080ace95993d640646f4b SHA512 758cbe8be086ade139b4559684e4cfd6b8b1c61273c88f15b7bb612ae49b89b59f05b8f843a8a4993833406769ca017c582e7dadeef41fc70732bac7d1aa944c
+EBUILD zfs-kmod-2.0.6.ebuild 6041 BLAKE2B 023489558d68fce25c41745ffaedc835a4d4148b55c894121e25c6211bc42fe78aca518f4cab72d0f9a9770c62fd00a4076b7098f02169613cf39c4cfc614ca8 SHA512 f6b8e7d0805ebb2cd5ebd69c4fa15ce468a4b353cfd879ef642d3608a96041738ba2a43c9471914e16139ea707609244c68116e0a1d02f5faba6759cfcde8ea1
+EBUILD zfs-kmod-2.0.7.ebuild 5624 BLAKE2B ec04bc269acb6ea08e202b2a52e9883bd7b16d436c9c0fea54247e73c163664a449997bf06058c24602aba7718c49a224f4e1adc74228a5837290b02bacabf37 SHA512 31b39f7a831e034fe6aeecb169dc46e1641c6844f74c4d74127b30cb691bb4fe4a52a998008c2a16b860398192508727cc3b87f9325d30b6e45f2d0d48ea2ee8
+EBUILD zfs-kmod-2.1.2.ebuild 5263 BLAKE2B cfac8f441b725142fa66465972d4734107b04b2df17cf53cf1987d6af6aa9d5b05e9cc02825db79cf99c4b43dd6a40f32dd1ff734e4afd7bd3430d1540f02e06 SHA512 3c5f74e401e6735a4e8e8ba5a92e8d4e21cd46e7e81c863ceb65e068f2e96fb4c3f67e8e78eefbc4b95b8f943d1104ab8c037cbc55e24d3338051e297f1430f4
+EBUILD zfs-kmod-9999.ebuild 5245 BLAKE2B 6770468fefbd8fb234452bc27c5fc3b2862a22a06ec4aef527e80f1aec34fc209ad59435914a551cd9529494f84cacbd2dd83e3944d0a73216195144b3afe20b SHA512 d535a279d7ee1cf24f2db571cc0f8e2f5e1444a19354898467ef0b6e625f68534993640e76c41246a7bc008a7d6ebdaa703deefde6f1cbe0f0d1a33b5c395c12
+MISC metadata.xml 540 BLAKE2B a0697b121d90cd8fc298b5647324fe513f6829f7054e9d2828aa7064b55ae28a991f791be136c7ea38e5e34d5061c40b2d313d418426da8c276481d2cae2da9d SHA512 5640db791cfb6a6c90f096a5e4b250ecf0089fd78f957566926880ab5fb9274a00f0788e5de73dd0c099c5decfa3239e8b2092f37b0183092abb17bb4a9b9dbf
diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml
index 5698442202d7..789b42b040d7 100644
--- a/sys-fs/zfs-kmod/metadata.xml
+++ b/sys-fs/zfs-kmod/metadata.xml
@@ -10,9 +10,9 @@
<name>Sam James</name>
</maintainer>
<use>
- <flag name="rootfs">Install zfs-shutdown script to support exporting a pool containing rootfs</flag>
+ <flag name="rootfs">Pull dependencies and check kernel options required for root-on-zfs</flag>
</use>
<upstream>
- <remote-id type="github">zfsonlinux/zfs</remote-id>
+ <remote-id type="github">openzfs/zfs</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
index 3d63f3f393bf..f3bf1e8c644e 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
@@ -196,7 +196,7 @@ pkg_postinst() {
ewarn "/boot with the new feature flags is not yet available."
ewarn "Do *NOT* upgrade root pools to use the new feature flags."
ewarn "Any new pools will be created with the new feature flags by default"
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+ ewarn "and will not be compatible with older versions of OpenZFS. To"
ewarn "create a newpool that is backward compatible wih GRUB2, use "
ewarn
ewarn "zpool create -d -o feature@async_destroy=enabled "
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
index 69f6e20a0db0..f23afb773c2e 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild
@@ -203,7 +203,7 @@ pkg_postinst() {
ewarn "/boot with the new feature flags is not yet available."
ewarn "Do *NOT* upgrade root pools to use the new feature flags."
ewarn "Any new pools will be created with the new feature flags by default"
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+ ewarn "and will not be compatible with older versions of OpenZFS. To"
ewarn "create a newpool that is backward compatible wih GRUB2, use "
ewarn
ewarn "zpool create -d -o feature@async_destroy=enabled "
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild
new file mode 100644
index 000000000000..154ef6022aef
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
+ inherit verify-sig
+
+ MY_PV="${PV/_rc/-rc}"
+ SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+ SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )"
+ S="${WORKDIR}/zfs-${PV%_rc?}"
+ ZFS_KERNEL_COMPAT="5.15"
+
+ # increments minor eg 5.14 -> 5.15, and still supports override.
+ ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+ ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))"
+
+ if [[ ${PV} != *_rc* ]]; then
+ KEYWORDS="amd64 arm64 ppc64"
+ fi
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0/${PVR}"
+IUSE="custom-cflags debug +rootfs"
+
+RDEPEND="${DEPEND}
+ !sys-kernel/spl
+"
+
+BDEPEND="
+ dev-lang/perl
+ virtual/awk
+"
+
+# we want dist-kernel block in BDEPEND because of portage resolver.
+# since linux-mod.eclass already sets version-unbounded dep, portage
+# will pull new versions. So we set it in BDEPEND which takes priority.
+# and we don't need in in git ebuild.
+if [[ ${PV} != "9999" ]] ; then
+ BDEPEND+="
+ verify-sig? ( sec-keys/openpgp-keys-openzfs )
+ dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= )
+ "
+fi
+
+# PDEPEND in this form is needed to trick portage suggest
+# enabling dist-kernel if only 1 package have it set
+PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )"
+
+RESTRICT="debug? ( strip ) test"
+
+DOCS=( AUTHORS COPYRIGHT META README.md )
+
+pkg_pretend() {
+ use rootfs || return 0
+
+ if has_version virtual/dist-kernel && ! use dist-kernel; then
+ ewarn "You have virtual/dist-kernel installed, but"
+ ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}"
+ ewarn "It's recommended to globally enable dist-kernel USE flag"
+ ewarn "to auto-trigger initrd rebuilds with kernel updates"
+ fi
+}
+
+pkg_setup() {
+ CONFIG_CHECK="
+ !DEBUG_LOCK_ALLOC
+ EFI_PARTITION
+ MODULES
+ !PAX_KERNEXEC_PLUGIN_METHOD_OR
+ !TRIM_UNUSED_KSYMS
+ ZLIB_DEFLATE
+ ZLIB_INFLATE
+ "
+
+ use debug && CONFIG_CHECK="${CONFIG_CHECK}
+ FRAME_POINTER
+ DEBUG_INFO
+ !DEBUG_INFO_REDUCED
+ "
+
+ use rootfs && \
+ CONFIG_CHECK="${CONFIG_CHECK}
+ BLK_DEV_INITRD
+ DEVTMPFS
+ "
+
+ kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
+
+ if [[ ${PV} != "9999" ]]; then
+ local kv_major_max kv_minor_max zcompat
+ zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+ kv_major_max="${zcompat%%.*}"
+ zcompat="${zcompat#*.}"
+ kv_minor_max="${zcompat%%.*}"
+ kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+ "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+
+ fi
+
+ kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
+
+ linux-mod_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # Run unconditionally (bug #792627)
+ eautoreconf
+
+ if [[ ${PV} != "9999" ]]; then
+ # Set module revision number
+ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+ fi
+}
+
+src_configure() {
+ set_arch_to_kernel
+
+ use custom-cflags || strip-flags
+
+ filter-ldflags -Wl,*
+
+ # Set CROSS_COMPILE in the environment.
+ # This allows the user to override it via make.conf or via a local Makefile.
+ # https://bugs.gentoo.org/811600
+ export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-}
+
+ local myconf=(
+ HOSTCC="$(tc-getBUILD_CC)"
+ --bindir="${EPREFIX}/bin"
+ --sbindir="${EPREFIX}/sbin"
+ --with-config=kernel
+ --with-linux="${KV_DIR}"
+ --with-linux-obj="${KV_OUT_DIR}"
+ $(use_enable debug)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ set_arch_to_kernel
+
+ myemakeargs=(
+ HOSTCC="$(tc-getBUILD_CC)"
+ V=1
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_install() {
+ set_arch_to_kernel
+
+ myemakeargs+=(
+ DEPMOD=:
+ DESTDIR="${D}"
+ INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD
+ )
+
+ emake "${myemakeargs[@]}" install
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+
+ if [[ -z ${ROOT} ]] && use dist-kernel; then
+ set_arch_to_portage
+ 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."
+ fi
+
+ if has_version sys-boot/grub; then
+ ewarn "This version of OpenZFS includes support for new feature flags"
+ ewarn "that are incompatible with previous versions. GRUB2 support for"
+ ewarn "/boot with the new feature flags is not yet available."
+ ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+ ewarn "Any new pools will be created with the new feature flags by default"
+ ewarn "and will not be compatible with older versions of OpenZFS. To"
+ ewarn "create a newpool that is backward compatible wih GRUB2, use "
+ ewarn
+ ewarn "zpool create -d -o feature@async_destroy=enabled "
+ ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+ ewarn " -o feature@spacemap_histogram=enabled"
+ ewarn " -o feature@enabled_txg=enabled "
+ ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+ ewarn " ..."
+ ewarn
+ ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+ ewarn "developers do a tag or the Gentoo developers find time to backport"
+ ewarn "support from GRUB2 HEAD."
+ fi
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild
index 65b9253ee17a..44f7926e35bd 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild
@@ -195,11 +195,11 @@ pkg_postinst() {
ewarn "/boot with the new feature flags is not yet available."
ewarn "Do *NOT* upgrade root pools to use the new feature flags."
ewarn "Any new pools will be created with the new feature flags by default"
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+ ewarn "and will not be compatible with older versions of OpenZFS. To"
ewarn "create a newpool that is backward compatible wih GRUB2, use "
ewarn
ewarn "zpool create -o compatibility=grub2 ..."
ewarn
- ewarn "Refer to /etc/zfs/compatibility.d/grub2 for list of features."
+ ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
fi
}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 16b9466d2567..5a3434fb444c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -195,11 +195,11 @@ pkg_postinst() {
ewarn "/boot with the new feature flags is not yet available."
ewarn "Do *NOT* upgrade root pools to use the new feature flags."
ewarn "Any new pools will be created with the new feature flags by default"
- ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+ ewarn "and will not be compatible with older versions of OpenZFS. To"
ewarn "create a newpool that is backward compatible wih GRUB2, use "
ewarn
ewarn "zpool create -o compatibility=grub2 ..."
ewarn
- ewarn "Refer to /etc/zfs/compatibility.d/grub2 for list of features."
+ ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features."
fi
}