ryao 14/12/01 07:04:45 Modified: zfs-9999.ebuild ChangeLog Added: zfs-0.6.3-r1.ebuild Log: Numerous backports from HEAD: Send/recv reliability/performance fixes, ZED fixes, systemd compatibility fixes, dracut support, memory leak (userland tools) fixes, drive database update, a pkgconfig file and many more. (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)
Revision Changes Path 1.56 sys-fs/zfs/zfs-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.56&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.56&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?r1=1.55&r2=1.56 Index: zfs-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- zfs-9999.ebuild 1 Dec 2014 05:26:19 -0000 1.55 +++ zfs-9999.ebuild 1 Dec 2014 07:04:45 -0000 1.56 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.55 2014/12/01 05:26:19 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.56 2014/12/01 07:04:45 ryao Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3,3_4} ) @@ -91,6 +91,7 @@ --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)" @@ -113,7 +114,6 @@ src_install() { autotools-utils_src_install gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - rm -rf "${ED}usr/lib/dracut" use test-suite || rm -rf "${ED}usr/share/zfs" use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs 1.87 sys-fs/zfs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.87&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.87&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?r1=1.86&r2=1.87 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- ChangeLog 1 Dec 2014 05:26:19 -0000 1.86 +++ ChangeLog 1 Dec 2014 07:04:45 -0000 1.87 @@ -1,6 +1,14 @@ # ChangeLog for sys-fs/zfs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.86 2014/12/01 05:26:19 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.87 2014/12/01 07:04:45 ryao Exp $ + +*zfs-0.6.3-r1 (01 Dec 2014) + + 01 Dec 2014; Richard Yao <r...@gentoo.org> +zfs-0.6.3-r1.ebuild, + zfs-9999.ebuild: + Numerous backports from HEAD: Send/recv reliability/performance fixes, ZED + fixes, systemd compatibility fixes, dracut support, memory leak (userland + tools) fixes, drive database update, a pkgconfig file and many more. 01 Dec 2014; Richard Yao <r...@gentoo.org> zfs-0.6.2-r3.ebuild, zfs-0.6.2-r4.ebuild, zfs-0.6.2-r5.ebuild, zfs-0.6.3.ebuild, zfs-9999.ebuild: 1.1 sys-fs/zfs/zfs-0.6.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.3-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.3-r1.ebuild?rev=1.1&content-type=text/plain Index: zfs-0.6.3-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.3-r1.ebuild,v 1.1 2014/12/01 07:04:45 ryao Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3,3_4} ) inherit python-r1 AT_M4DIR="config" AUTOTOOLS_AUTORECONF="1" AUTOTOOLS_IN_SOURCE_BUILD="1" if [ ${PV} == "9999" ] ; then inherit git-2 linux-mod EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" else inherit eutils versionator SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz http://dev.gentoo.org/~ryao/dist/${P}-patches-${PR}.tar.xz"; S="${WORKDIR}/${PN}-${P}" KEYWORDS="~amd64" fi inherit bash-completion-r1 flag-o-matic toolchain-funcs autotools-utils udev systemd DESCRIPTION="Userland utilities for ZFS Linux kernel module" HOMEPAGE="http://zfsonlinux.org/"; LICENSE="BSD-2 CDDL bash-completion? ( MIT )" SLOT="0" IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs test-suite static-libs" RESTRICT="test" COMMON_DEPEND=" sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk " DEPEND="${COMMON_DEPEND} virtual/pkgconfig " RDEPEND="${COMMON_DEPEND} !=sys-apps/grep-2.13* !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( sys-apps/util-linux sys-devel/bc sys-block/parted sys-fs/lsscsi sys-fs/mdadm sys-process/procps virtual/modutils ) rootfs? ( app-arch/cpio app-misc/pax-utils !<sys-boot/grub-2.00-r2:2 ) " pkg_setup() { : } src_prepare() { if [ ${PV} != "9999" ] then # Apply patch set EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ epatch "${WORKDIR}/${P}-patches" fi # 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" use bash-completion && newbashcomp "${FILESDIR}/bash-completion-r1" zfs 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 [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ || ewarn 'You should add zfs to the boot runlevel.' 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 }
