From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- sys-fs/zfs-kmod/Manifest | 5 +- sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc4.ebuild | 188 ++++++++++++++++++++++++++++++ sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 15 ++- 3 files changed, 204 insertions(+), 4 deletions(-) create mode 100644 sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc4.ebuild (limited to 'sys-fs/zfs-kmod') diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index b20f4df54968..d43442524d2f 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -2,8 +2,11 @@ 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.3.tar.gz 13114404 BLAKE2B 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 SHA512 8b2a6e0edfb3c85441076b2c6163ad3d7d239e11db128ab74d60bf8dc802d67b7f5b8d1cc7227316a7dc3917f14e9ac072ebf1583957f2a45c1b8438e4068200 DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b +DIST zfs-2.1.0-rc4.tar.gz 34806338 BLAKE2B b15b641ad322b7a50a5942500ef7c26f85074ef2672747f7391fcc785c3564c23fa5d49d51a146d284309905b4f1e1f96bb1e48f5cd1aeaebe6c55bc74a1f46f SHA512 1739798ea4fa552300004cbcb16ab0d3b02bba7cbd3bb31f9282af2dab9606478754abb49b8f170b0dfedfc4e2484e16cc8c160d02fa72a9b6720660c663e7bc +DIST zfs-2.1.0-rc4.tar.gz.asc 195 BLAKE2B 99fd0599ed81838a1c416dbfbaa1bace607576544d5a49918d98c1c8ddf879be694f8c3213c5f5d28f7806a99bc08027ab45d46d55eed3b0e3952ec51af204ae SHA512 ed331cc7db67590d62c19fb37babd0303fddf8255d93d0742659c98af26da31d45685770ec86b086e2ba4468d48bb2c3faba1763e4b00d0c5624a308ee751527 EBUILD zfs-kmod-0.8.6.ebuild 4761 BLAKE2B 03ae7e6c75b1e0b2032758272eeef7ac5ceccb367ba9180aee173bbe322580ca9757915eaa13dcd88781d738341748e338f25c41eec95f6293a066850dfe286b SHA512 9991249746e2f912c6978eb8f771d2f25cb082a31b26c9bd5167985a6f8c11dcbae4851e965053dccfa7fcad323e973d150b0a4963f47be39c6513d614097d0e EBUILD zfs-kmod-2.0.3.ebuild 4445 BLAKE2B 34792791c3efbd2a83c023bf5d333a3d2827dde23f892e7826c109b07c5a9138d755fc2026fdebc9ad4dc669b0292548ff8bbf7921b6f6044b4319bafcd78361 SHA512 07482c1f513078e5aa0dffc0ffc98938eccb954da558182e600926175fa0d1f4c5dbf6fd010c557248eb726dbbfa3199188102de5d0859db665969465940b769 EBUILD zfs-kmod-2.0.4.ebuild 4445 BLAKE2B 34792791c3efbd2a83c023bf5d333a3d2827dde23f892e7826c109b07c5a9138d755fc2026fdebc9ad4dc669b0292548ff8bbf7921b6f6044b4319bafcd78361 SHA512 07482c1f513078e5aa0dffc0ffc98938eccb954da558182e600926175fa0d1f4c5dbf6fd010c557248eb726dbbfa3199188102de5d0859db665969465940b769 -EBUILD zfs-kmod-9999.ebuild 4445 BLAKE2B 34792791c3efbd2a83c023bf5d333a3d2827dde23f892e7826c109b07c5a9138d755fc2026fdebc9ad4dc669b0292548ff8bbf7921b6f6044b4319bafcd78361 SHA512 07482c1f513078e5aa0dffc0ffc98938eccb954da558182e600926175fa0d1f4c5dbf6fd010c557248eb726dbbfa3199188102de5d0859db665969465940b769 +EBUILD zfs-kmod-2.1.0_rc4.ebuild 4770 BLAKE2B 5140b93cd549185414ae36ba19eeed9d967d768dc63e214e9fd98fbded127d92e85dfb931e354bb399d16647c8ab0a3041af0b9b4f67c2184eb6aef3fe072e0a SHA512 675a344f48a6759553a87327c350e5aba67780dde6858c95edd386a17601968cbc8d7fae00db7206ec3ac36aa46ef3cb56b5d1da20b2482b0365110713a696b4 +EBUILD zfs-kmod-9999.ebuild 4770 BLAKE2B 5140b93cd549185414ae36ba19eeed9d967d768dc63e214e9fd98fbded127d92e85dfb931e354bb399d16647c8ab0a3041af0b9b4f67c2184eb6aef3fe072e0a SHA512 675a344f48a6759553a87327c350e5aba67780dde6858c95edd386a17601968cbc8d7fae00db7206ec3ac36aa46ef3cb56b5d1da20b2482b0365110713a696b4 MISC metadata.xml 548 BLAKE2B 0245ac0b73ed129ce2df41358814d46749fab0463a03fceb643010629cd522460e84c5b8c0247f499adf4ed2e781e0d6f6857a3c6be4f4fb206eeabba158e86c SHA512 2b98b289369d875c5ff89825590a98c9764a1b716df1b79c852dbb833f4f02d5c66782f43084a1acde11a0ba2cb9ef2956b35c10881f77ec92d6749566276e6b diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc4.ebuild new file mode 100644 index 000000000000..f72fc5b216bc --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0_rc4.ebuild @@ -0,0 +1,188 @@ +# 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=/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/${PN}/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" + S="${WORKDIR}/zfs-${PV%_rc?}" + ZFS_KERNEL_COMPAT="5.11" + + if [[ ${PV} != *_rc* ]]; then + KEYWORDS="~amd64 ~arm64 ~ppc64" + fi +fi + +LICENSE="CDDL MIT debug? ( GPL-2+ )" +SLOT="0" +IUSE="custom-cflags debug +rootfs" + +RDEPEND="${DEPEND} + !sys-kernel/spl +" + +BDEPEND=" + dev-lang/perl + virtual/awk +" + +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" +fi + +RESTRICT="debug? ( strip ) test" + +DOCS=( AUTHORS COPYRIGHT META README.md ) + +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 + + if [[ ${PV} == "9999" ]]; then + eautoreconf + else + # 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,* + + local myconf=( + CROSS_COMPILE="${CHOST}-" + 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=( + CROSS_COMPILE="${CHOST}-" + HOSTCC="$(tc-getBUILD_CC)" + V=1 + ) + + emake "${myemakeargs[@]}" +} + +src_install() { + set_arch_to_kernel + + myemakeargs+=( + DEPMOD="/bin/true" + DESTDIR="${D}" + INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" + ) + + emake "${myemakeargs[@]}" install + + einstalldocs +} + +pkg_postinst() { + linux-mod_pkg_postinst + + # Remove old modules + if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then + ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" + ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" + ewarn "Automatically removing old modules to avoid problems." + rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" + 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." + fi + + 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 ZFSOnLinux. 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." +} diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index b4fc7559ba13..f72fc5b216bc 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -12,19 +12,24 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/openzfs/zfs.git" else + VERIFY_SIG_OPENPGP_KEY_PATH=/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" - KEYWORDS="~amd64 ~arm64 ~ppc64" + SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" S="${WORKDIR}/zfs-${PV%_rc?}" ZFS_KERNEL_COMPAT="5.11" + + if [[ ${PV} != *_rc* ]]; then + KEYWORDS="~amd64 ~arm64 ~ppc64" + fi fi LICENSE="CDDL MIT debug? ( GPL-2+ )" SLOT="0" IUSE="custom-cflags debug +rootfs" -DEPEND="" - RDEPEND="${DEPEND} !sys-kernel/spl " @@ -34,6 +39,10 @@ BDEPEND=" virtual/awk " +if [[ ${PV} != "9999" ]] ; then + BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )" +fi + RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) -- cgit v1.2.3