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 554A11396D0 for ; Tue, 12 Sep 2017 13:07:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A539E1FC096; Tue, 12 Sep 2017 13:07:06 +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 779991FC096 for ; Tue, 12 Sep 2017 13:07:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4EAD7341130 for ; Tue, 12 Sep 2017 13:07:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1DB02907B for ; Tue, 12 Sep 2017 13:07:03 +0000 (UTC) From: "Jonathan Vasquez" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Vasquez" Message-ID: <1505221597.618255ce30bd22ccd172eb3acd641f446af7b69e.fearedbliss@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.7.0-r1.ebuild sys-fs/zfs/zfs-0.7.0-r2.ebuild sys-fs/zfs/zfs-0.7.0.ebuild sys-fs/zfs/zfs-0.7.1-r1.ebuild sys-fs/zfs/zfs-0.7.1.ebuild X-VCS-Directories: sys-fs/zfs/ X-VCS-Committer: fearedbliss X-VCS-Committer-Name: Jonathan Vasquez X-VCS-Revision: 618255ce30bd22ccd172eb3acd641f446af7b69e X-VCS-Branch: master Date: Tue, 12 Sep 2017 13:07:03 +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: 5f726029-7021-4432-9ca1-6427b6c875b6 X-Archives-Hash: 9e38fa49db6481af675ed543d228dfba commit: 618255ce30bd22ccd172eb3acd641f446af7b69e Author: Jonathan Vasquez gentoo org> AuthorDate: Tue Sep 12 13:06:37 2017 +0000 Commit: Jonathan Vasquez gentoo org> CommitDate: Tue Sep 12 13:06:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=618255ce sys-fs/zfs: changing blocker deps for 0.7.0 ebuilds, and removing 0.7.0-r0 Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../{zfs-0.7.0-r1.ebuild => zfs-0.7.0-r2.ebuild} | 6 +- sys-fs/zfs/zfs-0.7.0.ebuild | 197 --------------------- .../zfs/{zfs-0.7.1.ebuild => zfs-0.7.1-r1.ebuild} | 6 +- 3 files changed, 8 insertions(+), 201 deletions(-) diff --git a/sys-fs/zfs/zfs-0.7.0-r1.ebuild b/sys-fs/zfs/zfs-0.7.0-r2.ebuild similarity index 97% rename from sys-fs/zfs/zfs-0.7.0-r1.ebuild rename to sys-fs/zfs/zfs-0.7.0-r2.ebuild index 1fa9e574522..b20cb49f36a 100644 --- a/sys-fs/zfs/zfs-0.7.0-r1.ebuild +++ b/sys-fs/zfs/zfs-0.7.0-r2.ebuild @@ -50,8 +50,10 @@ RDEPEND="${COMMON_DEPEND} app-arch/cpio app-misc/pax-utils !=sys-kernel/genkernel-3.5.1.1 - >=sys-kernel/bliss-initramfs-7.1.0 ) + !" - eerror " Block devices --->" - eerror " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - else - [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ - einfo "You should add zfs-import to the boot runlevel." - [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ - einfo "You should add zfs-mount to the boot runlevel." - [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ - einfo "You should add zfs-share to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.7.1.ebuild b/sys-fs/zfs/zfs-0.7.1-r1.ebuild similarity index 97% rename from sys-fs/zfs/zfs-0.7.1.ebuild rename to sys-fs/zfs/zfs-0.7.1-r1.ebuild index 48136e7a0c6..c5bf9372537 100644 --- a/sys-fs/zfs/zfs-0.7.1.ebuild +++ b/sys-fs/zfs/zfs-0.7.1-r1.ebuild @@ -50,8 +50,10 @@ RDEPEND="${COMMON_DEPEND} app-arch/cpio app-misc/pax-utils !=sys-kernel/genkernel-3.5.1.1 - >=sys-kernel/bliss-initramfs-7.1.0 ) + !