commit: ff2c0b81882ff111f8494b6b73626b7154ae01a5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jul 3 20:54:44 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jul 3 20:59:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff2c0b81
sys-fs/zfs: add 2.2.0_rc1 (unkeyworded) Signed-off-by: Sam James <sam <AT> gentoo.org> sys-fs/zfs/Manifest | 2 ++ .../zfs/{zfs-9999.ebuild => zfs-2.2.0_rc1.ebuild} | 22 ++++++++++------------ sys-fs/zfs/zfs-9999.ebuild | 22 ++++++++++------------ 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 9f12bf8dd950..c2835e7dc8d2 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -8,3 +8,5 @@ DIST zfs-2.1.7.tar.gz 35092436 BLAKE2B 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e81 DIST zfs-2.1.7.tar.gz.asc 836 BLAKE2B 648fb818860a1cecc2ec42f23102e0466c038bfe48f5feca1ab58afb9cb439a0fe51cb89941f63a05c14d3b6f95c64dd3910c9a06b9cac14c467b963c65c2948 SHA512 4d4fef707bdfc37a82eb79aa0a21c71e30779bcf2ac54fe2df45a03e3302e2a45cb9f4e4ff0122b892b1e608a9f09e86d1334e0c7d9bf681780505f6e1439f9f DIST zfs-2.1.9.tar.gz 35106538 BLAKE2B d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812 SHA512 a3c410abe911be7d3d66af8ad7023a810eb4ae3284001e544c3a34275eb17a4916a7c094936a2628a590007c007eea84673efa9f3201fd9f24c499fd5ed3ed75 DIST zfs-2.1.9.tar.gz.asc 836 BLAKE2B 1e76525eab338398dd6ff7539ea4e7d18847d0f40e9093d813ec93fce5fa4c16e09f91c0805ba01a29190f673d131f85442c13035166d6f2d007a7e42dc15486 SHA512 35e1213fcac0458e1243355beba021dfefef455df2b341fbc4b10047f9ed4747df84e319d10ffe4bbcd572fbf014019e0dec200eb4e7d3c116fb805369182cb0 +DIST zfs-2.2.0-rc1.tar.gz 33656024 BLAKE2B 1157db51d2736905b787a2627e599d7ac527be281edc9a76da0f746ae39483df3b4b8b31e5af504b9b06cd99a3776cd16670a8774d0e68f50014b09971209437 SHA512 22285ea1b34d4dbed311e3855449cad51c6f6ddb29c906f106fa6f4816d8e478f073b29fbc4d9636bf783558e041b20d2f2c5c0c33f65153d3b21da6cd9b7689 +DIST zfs-2.2.0-rc1.tar.gz.asc 195 BLAKE2B 8df7d05729716ca75e8c975df92f8a1976b7712a3c98e3479582550e60bd97af77f80e9b72be094b57650948136ad8a9276e7d4ea0a1d0473a5d56988058bcc8 SHA512 de6ee565f864080dfcf69ecdf832cebdabaa29d9f3dac1ad5f5928e664352aa3da4ed0ba5f2e634e3629f10eedbae9d1613ac3d3a13285fef846f7beabfa2f79 diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-2.2.0_rc1.ebuild similarity index 96% copy from sys-fs/zfs/zfs-9999.ebuild copy to sys-fs/zfs/zfs-2.2.0_rc1.ebuild index 647324b9a308..e9d67dd0d80e 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-2.2.0_rc1.ebuild @@ -22,7 +22,7 @@ else MY_P="${P/_rc/-rc}" SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" - S="${WORKDIR}/${P%_rc?}" + S="${WORKDIR}/${MY_P}" if [[ ${PV} != *_rc* ]]; then KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc" @@ -37,11 +37,11 @@ SLOT="0/5" IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite" DEPEND=" + dev-libs/openssl:= net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= - dev-libs/openssl:0= !minimal? ( ${PYTHON_DEPS} ) pam? ( sys-libs/pam ) python? ( @@ -49,7 +49,8 @@ DEPEND=" ) " -BDEPEND="app-alternatives/awk +BDEPEND=" + app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( @@ -66,11 +67,12 @@ if [[ ${PV} != "9999" ]] ; then fi # awk is used for some scripts, completions, and the Dracut module -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts app-alternatives/awk + sys-fs/udev-init-scripts dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio @@ -179,6 +181,9 @@ src_prepare() { popd >/dev/null || die fi + # Tries to use /etc/conf.d which we reserve for OpenRC + sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die + # prevent errors showing up on zfs-mount stop, #647688 # openrc will unmount all filesystems anyway. sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die @@ -188,13 +193,6 @@ src_configure() { use custom-cflags || strip-flags use minimal || python_setup - # All the same issue: - # Segfaults w/ GCC 12 and 'zfs send' - # bug #856373 - # https://github.com/openzfs/zfs/issues/13620 - # https://github.com/openzfs/zfs/issues/13605 - append-flags -fno-tree-vectorize - local myconf=( --bindir="${EPREFIX}/bin" --enable-shared diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 647324b9a308..e9d67dd0d80e 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -22,7 +22,7 @@ else MY_P="${P/_rc/-rc}" SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" - S="${WORKDIR}/${P%_rc?}" + S="${WORKDIR}/${MY_P}" if [[ ${PV} != *_rc* ]]; then KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc" @@ -37,11 +37,11 @@ SLOT="0/5" IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs selinux test-suite" DEPEND=" + dev-libs/openssl:= net-libs/libtirpc:= sys-apps/util-linux sys-libs/zlib virtual/libudev:= - dev-libs/openssl:0= !minimal? ( ${PYTHON_DEPS} ) pam? ( sys-libs/pam ) python? ( @@ -49,7 +49,8 @@ DEPEND=" ) " -BDEPEND="app-alternatives/awk +BDEPEND=" + app-alternatives/awk virtual/pkgconfig nls? ( sys-devel/gettext ) python? ( @@ -66,11 +67,12 @@ if [[ ${PV} != "9999" ]] ; then fi # awk is used for some scripts, completions, and the Dracut module -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts app-alternatives/awk + sys-fs/udev-init-scripts dist-kernel? ( virtual/dist-kernel:= ) rootfs? ( app-arch/cpio @@ -179,6 +181,9 @@ src_prepare() { popd >/dev/null || die fi + # Tries to use /etc/conf.d which we reserve for OpenRC + sed -i -e '/EnvironmentFile/d' etc/systemd/system/zfs*.in || die + # prevent errors showing up on zfs-mount stop, #647688 # openrc will unmount all filesystems anyway. sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die @@ -188,13 +193,6 @@ src_configure() { use custom-cflags || strip-flags use minimal || python_setup - # All the same issue: - # Segfaults w/ GCC 12 and 'zfs send' - # bug #856373 - # https://github.com/openzfs/zfs/issues/13620 - # https://github.com/openzfs/zfs/issues/13605 - append-flags -fno-tree-vectorize - local myconf=( --bindir="${EPREFIX}/bin" --enable-shared