From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 100AE1382C5 for ; Thu, 8 Mar 2018 16:21:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1EC49E096E; Thu, 8 Mar 2018 16:21:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DBA93E096E for ; Thu, 8 Mar 2018 16:21:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 721CF335C31 for ; Thu, 8 Mar 2018 16:21:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBBC31F0 for ; Thu, 8 Mar 2018 16:21:32 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1520526040.20c8e69ec3b25a431ee1c0e8cf3d1f0274dbffec.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/zfs-0.6.5.11-r2.ebuild sys-fs/zfs/zfs-0.6.5.4-r4.ebuild sys-fs/zfs/zfs-0.7.5-r2.ebuild sys-fs/zfs/zfs-0.7.6-r1.ebuild sys-fs/zfs/zfs-0.7.9999.ebuild sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 20c8e69ec3b25a431ee1c0e8cf3d1f0274dbffec X-VCS-Branch: master Date: Thu, 8 Mar 2018 16:21:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8c8b3d4f-f1fa-4bb4-ab30-9b6fdbe4a694 X-Archives-Hash: df90023c1594a0a503e53d9188d22fc4 commit: 20c8e69ec3b25a431ee1c0e8cf3d1f0274dbffec Author: Georgy Yakovlev sysdump net> AuthorDate: Thu Mar 8 02:12:59 2018 +0000 Commit: Matt Thode gentoo org> CommitDate: Thu Mar 8 16:20:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20c8e69e sys-fs/zfs: fix dracut module path zfs should use /usr/lib/dracut to install dracut modules. dracut ebuild defines: local dracutlibdir="usr/lib/dracut" with /usr/lib64 path on SYMLINK_LIB=no systems dracut fails to pick up zfs modules and generates an unbootable initramfs Closes: https://bugs.gentoo.org/645176 Package-Manager: Portage-2.3.24, Repoman-2.3.6 Signed-off-by: Matthew Thode gentoo.org> ...{zfs-0.7.9999.ebuild => zfs-0.6.5.11-r2.ebuild} | 17 ++++--- .../zfs/{zfs-9999.ebuild => zfs-0.6.5.4-r4.ebuild} | 52 ++++++++++++++++------ .../{zfs-0.7.9999.ebuild => zfs-0.7.5-r2.ebuild} | 20 +++++---- .../{zfs-0.7.9999.ebuild => zfs-0.7.6-r1.ebuild} | 20 +++++---- sys-fs/zfs/zfs-0.7.9999.ebuild | 2 +- sys-fs/zfs/zfs-9999.ebuild | 2 +- 6 files changed, 75 insertions(+), 38 deletions(-) diff --git a/sys-fs/zfs/zfs-0.7.9999.ebuild b/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild similarity index 94% copy from sys-fs/zfs/zfs-0.7.9999.ebuild copy to sys-fs/zfs/zfs-0.6.5.11-r2.ebuild index da5f1597be5..1973747e440 100644 --- a/sys-fs/zfs/zfs-0.7.9999.ebuild +++ b/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild @@ -4,14 +4,13 @@ EAPI="5" PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -if [[ ${PV} == *"9999" ]] ; then +if [ ${PV} == "9999" ] ; then + inherit git-r3 linux-mod AUTOTOOLS_AUTORECONF="1" EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" - EGIT_BRANCH="zfs-0.7-release" - inherit git-r3 linux-mod else SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" + KEYWORDS="~amd64" fi inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev @@ -34,7 +33,10 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig " +# Adding glibc >= 2.25 blocker for ZFS versions lower +# than 0.7.0, due to bug 617628. RDEPEND="${COMMON_DEPEND} + !>=sys-libs/glibc-2.25 !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) !sys-fs/zfs-fuse @@ -53,6 +55,7 @@ RDEPEND="${COMMON_DEPEND} app-misc/pax-utils != 2.25 blocker for ZFS versions lower +# than 0.7.0, due to bug 617628. RDEPEND="${COMMON_DEPEND} + !>=sys-libs/glibc-2.25 !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) + !kernel-builtin? ( + =sys-fs/zfs-kmod-${PV}* + ! "${T}/zfs-init.sh" || die - if use kernel-builtin - then - sed -i -e '/modprobe\ zfs/d' "${T}/zfs.service" || die - fi } src_install() { @@ -197,6 +207,22 @@ pkg_postinst() { rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi + einfo "sys-kernel/spl-0.6.5.3-r1, sys-fs/zfs-kmod-0.6.5.3-r1 and " + einfo "sys-fs/zfs-0.6.5.3-r1 have introduced a partial stable " + einfo "/dev/zfs API developed by ClusterHQ. This means that situations " + einfo "arising from the kernel modules and userland tools being " + einfo "mismatched on future updates will not cause problems." + einfo + einfo "In specific, this should solve the failure to mount filesystems when " + einfo "old modules are cached in an old initramfs provided that those " + einfo "modules support this API" + if use rootfs + then + einfo + ewarn "The older modules will *NOT* work with the new userland code." + ewarn "It is very important that you update your initramfs after this " + ewarn "update." + fi } pkg_postrm() { diff --git a/sys-fs/zfs/zfs-0.7.9999.ebuild b/sys-fs/zfs/zfs-0.7.5-r2.ebuild similarity index 92% copy from sys-fs/zfs/zfs-0.7.9999.ebuild copy to sys-fs/zfs/zfs-0.7.5-r2.ebuild index da5f1597be5..118fe97e22a 100644 --- a/sys-fs/zfs/zfs-0.7.9999.ebuild +++ b/sys-fs/zfs/zfs-0.7.5-r2.ebuild @@ -4,14 +4,13 @@ EAPI="5" PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -if [[ ${PV} == *"9999" ]] ; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" - EGIT_BRANCH="zfs-0.7-release" +if [ ${PV} == "9999" ] ; then inherit git-r3 linux-mod + AUTOTOOLS_AUTORECONF="1" + EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" else SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64" + KEYWORDS="~amd64" fi inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev @@ -52,7 +51,12 @@ RDEPEND="${COMMON_DEPEND} app-arch/cpio app-misc/pax-utils !