diff options
Diffstat (limited to 'sys-fs/zfs-kmod')
| -rw-r--r-- | sys-fs/zfs-kmod/Manifest | 13 | ||||
| -rw-r--r-- | sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch | 48 | ||||
| -rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild (renamed from sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild) | 4 | ||||
| -rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild (renamed from sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild) | 4 | ||||
| -rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild | 175 | ||||
| -rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 4 |
6 files changed, 187 insertions, 61 deletions
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index f7e5590c9880..647fd7e18afc 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,7 +1,8 @@ -AUX 0.8.4-powerpc_jmp_weak.patch 1314 BLAKE2B 5cec0c5bf0e7c8ba4fb29539384eeb28e431956a94853d7c7722fc4dfc680f984c3e1567bc27effb28e94b1a411f9d7e57a26536fb4dee9446b12183558ab49b SHA512 dabea2f795e3ee2d7df13c803ac4cb21499e23d6663f14d52a7b270075176a4378cd15d04d051999aa7ec6b8cf49e645435363053e16640f28068c2764580047 -DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1 -DIST zfs-2.0.0-rc2.tar.gz 12854085 BLAKE2B 73cabd565c11eef1bebbc391f8c4ba18acd1610f98f1b8afb507bc844f4b6a64ba32d9727e634c7f26c48fe365a841bf071513df234b9b7a87e954610a6d7f3b SHA512 14b17d06124890efef15b3b073e103c9faeecaea761779fff9a8420e3ab72fa611df9875fa766a323d69646e9025f8b19f918ded4c6705af116cf9f14eea4f40 -EBUILD zfs-kmod-0.8.4-r1.ebuild 4593 BLAKE2B cf8a545a1d016c6d9d80717b82b7ce4bfb8434fa8ac4d081b4c1c8c730381a812a645218d9447e9f44b51fd10d57dd900bddfe41157a32a35b250929d2e961c4 SHA512 7d25b489db7696178d59c6953377a023b6e254adfe0f08b33fdda72c936afee3b2421d6ec430c46973967e4d080489585213e147d42eee695c57b360d52e5d7f -EBUILD zfs-kmod-2.0.0_rc2.ebuild 4312 BLAKE2B be95eaac5695ad30175fd32a9a95ca39376b82f667f91071b7e5d71c30c6c37d187fb137d93734b0c8ab21a70a8fd71317d5195db3452dcc09721c4df62a265c SHA512 cc6eac9ec1ee142b4fd2fabb7bb239374c5239a65222f45002b1e32c48a728ac936de398cecbd74b05669b8717579483ad1b4ba553d78e5dc205955bb52265e7 -EBUILD zfs-kmod-9999.ebuild 4312 BLAKE2B be95eaac5695ad30175fd32a9a95ca39376b82f667f91071b7e5d71c30c6c37d187fb137d93734b0c8ab21a70a8fd71317d5195db3452dcc09721c4df62a265c SHA512 cc6eac9ec1ee142b4fd2fabb7bb239374c5239a65222f45002b1e32c48a728ac936de398cecbd74b05669b8717579483ad1b4ba553d78e5dc205955bb52265e7 +DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773 +DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8 +DIST zfs-2.0.0-rc7.tar.gz 12994030 BLAKE2B 12dde3b935cddabd3d3e5874685cd914f0338526ba8d22aaba2b1ff09aae64a67cc66ea0acc7d08cdc438fd8dfc93a2727bab5e90c08c2a294074692f4189214 SHA512 fbef7bc76c2b913ef8c4af55e6feb46bcadbca856b8ba28c72432bb91b8dc88de191d657aaeb5efd67ee2d67a6ffcf5d3d53b4490f9a32211a571687694e7e65 +EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322 +EBUILD zfs-kmod-2.0.0_rc6.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89 +EBUILD zfs-kmod-2.0.0_rc7.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89 +EBUILD zfs-kmod-9999.ebuild 4317 BLAKE2B f805e2c20a65d928b89496aaff71f548c49594b5f4d7decf776339a173b16f39ea5a7e0bfca78f5b1fc01c08ea3a06fa11317458dc2cc4022bdf459d273d68ed SHA512 4ce6398c6ec3cb2015751b0deb6e8694afa22a6b19b0ca83661eed0e195f7ac06f5fb73eaa52a4d86ad2c039dd300de4d49c8901a51e1d80dd37b3e1b0185319 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a diff --git a/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch b/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch deleted file mode 100644 index 1a2948a3158c..000000000000 --- a/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch +++ /dev/null @@ -1,48 +0,0 @@ -From bd0efd1f062bfba5dd2d6b1fe30b6949f8e0a8ef Mon Sep 17 00:00:00 2001 -From: sterlingjensen <5555776+sterlingjensen@users.noreply.github.com> -Date: Mon, 24 Aug 2020 22:41:05 -0500 -Subject: [PATCH] Mark lua setjmp/longjmp for powerpc weak - -Linux already defines setjmp/longjmp for powerpc, which leads to -duplicate symbols in a statically linked build. - -Signed-off-by: Sterlng Jensen <sterlingjensen@users.noreply.github.com> ---- - module/lua/setjmp/setjmp_ppc.S | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/module/lua/setjmp/setjmp_ppc.S b/module/lua/setjmp/setjmp_ppc.S -index f787ef34913..72aa5d5ab5b 100644 ---- a/module/lua/setjmp/setjmp_ppc.S -+++ b/module/lua/setjmp/setjmp_ppc.S -@@ -56,7 +56,7 @@ - #define ENTRY(name) \ - .align 2 ; \ - .type name,@function; \ -- .globl name; \ -+ .weak name; \ - name: - - #else /* PPC64_ELF_ABI_v1 */ -@@ -65,8 +65,8 @@ name: - #define GLUE(a,b) XGLUE(a,b) - #define ENTRY(name) \ - .align 2 ; \ -- .globl name; \ -- .globl GLUE(.,name); \ -+ .weak name; \ -+ .weak GLUE(.,name); \ - .pushsection ".opd","aw"; \ - name: \ - .quad GLUE(.,name); \ -@@ -83,8 +83,8 @@ GLUE(.,name): - #define ENTRY(name) \ - .text; \ - .p2align 4; \ -- .globl name; \ -- .type name,@function; \ -+ .weak name; \ -+ .type name,@function; \ - name: - - #endif /* __powerpc64__ */ diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild index 18afe59c4a99..c5b1b6d6625d 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild @@ -15,7 +15,7 @@ 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.6" + ZFS_KERNEL_COMPAT="5.9" fi LICENSE="CDDL debug? ( GPL-2+ )" @@ -37,8 +37,6 @@ RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) -PATCHES=( "${FILESDIR}/${PV}-powerpc_jmp_weak.patch" ) - pkg_setup() { CONFIG_CHECK=" !DEBUG_LOCK_ALLOC diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild index 689dcbc44941..81328da6d290 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild @@ -16,10 +16,10 @@ else 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.8" + ZFS_KERNEL_COMPAT="5.9" fi -LICENSE="CDDL debug? ( GPL-2+ )" +LICENSE="CDDL MIT debug? ( GPL-2+ )" SLOT="0" IUSE="custom-cflags debug +rootfs" diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild new file mode 100644 index 000000000000..81328da6d290 --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools 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 + 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.9" +fi + +LICENSE="CDDL MIT debug? ( GPL-2+ )" +SLOT="0" +IUSE="custom-cflags debug +rootfs" + +DEPEND="" + +RDEPEND="${DEPEND} + !sys-kernel/spl +" + +BDEPEND=" + dev-lang/perl + virtual/awk +" + +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 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 689dcbc44941..e0bcf6bac5bb 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -16,10 +16,10 @@ else 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.8" + ZFS_KERNEL_COMPAT="5.10" fi -LICENSE="CDDL debug? ( GPL-2+ )" +LICENSE="CDDL MIT debug? ( GPL-2+ )" SLOT="0" IUSE="custom-cflags debug +rootfs" |