ryao 14/04/10 03:14:39 Modified: zfs-9999.ebuild zfs-0.6.2-r3.ebuild ChangeLog Added: zfs-0.6.2-r4.ebuild Log: Add USE=debug and sync with sys-fs/zfs-kmod to get backports of userland fixes (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)
Revision Changes Path 1.51 sys-fs/zfs/zfs-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.51&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?rev=1.51&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild?r1=1.50&r2=1.51 Index: zfs-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- zfs-9999.ebuild 21 Nov 2013 16:21:23 -0000 1.50 +++ zfs-9999.ebuild 10 Apr 2014 03:14:39 -0000 1.51 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.50 2013/11/21 16:21:23 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.51 2014/04/10 03:14:39 ryao Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} ) @@ -30,7 +30,7 @@ LICENSE="BSD-2 CDDL bash-completion? ( MIT )" SLOT="0" -IUSE="bash-completion custom-cflags kernel-builtin +rootfs selinux test-suite static-libs" +IUSE="bash-completion custom-cflags debug kernel-builtin +rootfs selinux test-suite static-libs" RESTRICT="test" COMMON_DEPEND=" @@ -96,6 +96,7 @@ --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(udev_get_udevdir)" --with-blkid + $(use_enable debug) $(use_with selinux) ) autotools-utils_src_configure 1.2 sys-fs/zfs/zfs-0.6.2-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r3.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r3.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r3.ebuild?r1=1.1&r2=1.2 Index: zfs-0.6.2-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r3.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- zfs-0.6.2-r3.ebuild 21 Nov 2013 16:21:23 -0000 1.1 +++ zfs-0.6.2-r3.ebuild 10 Apr 2014 03:14:39 -0000 1.2 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# 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.2-r3.ebuild,v 1.1 2013/11/21 16:21:23 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r3.ebuild,v 1.2 2014/04/10 03:14:39 ryao Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} ) 1.78 sys-fs/zfs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.78&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?rev=1.78&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/ChangeLog?r1=1.77&r2=1.78 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- ChangeLog 21 Nov 2013 16:21:23 -0000 1.77 +++ ChangeLog 10 Apr 2014 03:14:39 -0000 1.78 @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/zfs -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.77 2013/11/21 16:21:23 ryao Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.78 2014/04/10 03:14:39 ryao Exp $ + +*zfs-0.6.2-r4 (10 Apr 2014) + + 10 Apr 2014; Richard Yao <[email protected]> +zfs-0.6.2-r4.ebuild, + zfs-0.6.2-r3.ebuild, zfs-9999.ebuild: + Add USE=debug and sync with sys-fs/zfs-kmod to get backports of userland fixes *zfs-0.6.2-r3 (21 Nov 2013) 1.1 sys-fs/zfs/zfs-0.6.2-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs/zfs-0.6.2-r4.ebuild?rev=1.1&content-type=text/plain Index: zfs-0.6.2-r4.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.2-r4.ebuild,v 1.1 2014/04/10 03:14:39 ryao Exp $ EAPI="5" PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} ) 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 MY_PV=$(replace_version_separator 3 '-') SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz http://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p3.tar.xz"; S="${WORKDIR}/${PN}-${PN}-${MY_PV}" 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 selinux test-suite static-libs" RESTRICT="test" COMMON_DEPEND=" selinux? ( sys-libs/libselinux ) 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}/${PN}-kmod-${MY_PV}-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-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(udev_get_udevdir)" --with-blkid $(use_enable debug) $(use_with selinux) ) 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 rm -rf "${ED}usr/lib/dracut" 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 }
