From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RsHiL-0007Zl-PN for garchives@archives.gentoo.org; Tue, 31 Jan 2012 17:41:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3D38E0936; Tue, 31 Jan 2012 17:41:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 67813E0936 for ; Tue, 31 Jan 2012 17:41:44 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A848E1B4028 for ; Tue, 31 Jan 2012 17:41:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1561880042 for ; Tue, 31 Jan 2012 17:41:43 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sys-fs/zfs/, sys-devel/spl/, sys-devel/spl/files/, sys-fs/zfs/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-devel/spl/files/spl-0.6.0-includedir.patch sys-devel/spl/metadata.xml sys-devel/spl/spl-0.6.0_rc4.ebuild sys-devel/spl/spl-9999.ebuild sys-fs/zfs/files/zfs-0.6.0-includedir.patch sys-fs/zfs/files/zfs.initd sys-fs/zfs/metadata.xml sys-fs/zfs/zfs-0.6.0_rc4.ebuild sys-fs/zfs/zfs-9999.ebuild X-VCS-Directories: sys-fs/zfs/ sys-devel/spl/ sys-devel/spl/files/ sys-fs/zfs/files/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: e15038ee28bc50c95a1c24c7b8d8be707ac3eadd Date: Tue, 31 Jan 2012 17:41:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ec8f4a4c-51d4-4514-acef-ab6a1d0e51fa X-Archives-Hash: b333a6b779ab5323af091906a1180620 commit: e15038ee28bc50c95a1c24c7b8d8be707ac3eadd Author: Alexey Shvetsov gentoo org> AuthorDate: Tue Jan 31 17:41:19 2012 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Tue Jan 31 17:41:19 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3De15038ee [zfs,spl] They are in tree already Signed-off-by: Alexey Shvetsov gentoo.org> --- sys-devel/spl/files/spl-0.6.0-includedir.patch | 26 ------ sys-devel/spl/metadata.xml | 5 - sys-devel/spl/spl-0.6.0_rc4.ebuild | 44 ----------- sys-devel/spl/spl-9999.ebuild | 43 ---------- sys-fs/zfs/files/zfs-0.6.0-includedir.patch | 13 --- sys-fs/zfs/files/zfs.initd | 98 ------------------= ------ sys-fs/zfs/metadata.xml | 5 - sys-fs/zfs/zfs-0.6.0_rc4.ebuild | 67 ---------------- sys-fs/zfs/zfs-9999.ebuild | 66 ---------------- 9 files changed, 0 insertions(+), 367 deletions(-) diff --git a/sys-devel/spl/files/spl-0.6.0-includedir.patch b/sys-devel/s= pl/files/spl-0.6.0-includedir.patch deleted file mode 100644 index 37cdbf6..0000000 --- a/sys-devel/spl/files/spl-0.6.0-includedir.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -urN spl-0.6.0-rc3.orig/include/Makefile.am spl-0.6.0-rc3/include/M= akefile.am ---- spl-0.6.0-rc3.orig/include/Makefile.am 2011-04-07 22:30:50.000000000= +0400 -+++ spl-0.6.0-rc3/include/Makefile.am 2011-04-12 03:12:40.000000000 +040= 0 -@@ -15,8 +15,7 @@ - noinst_HEADERS +=3D $(top_srcdir)/include/vm/*.h -=20 - install-data-local: -- destname=3Dspl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ -- instdest=3D$(DESTDIR)/usr/src/$$destname; \ -+ instdest=3D$(DESTDIR)/${includedir}/spl; \ - instfiles=3D`find . -name '*.h'`; \ - for instfile in $$instfiles; do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ -diff -urN spl-0.6.0-rc3.orig/Makefile.am spl-0.6.0-rc3/Makefile.am ---- spl-0.6.0-rc3.orig/Makefile.am 2011-04-07 22:30:50.000000000 +0400 -+++ spl-0.6.0-rc3/Makefile.am 2011-04-12 03:12:22.000000000 +0400 -@@ -29,8 +29,7 @@ -=20 - if CONFIG_KERNEL - install-data-local: -- destname=3Dspl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ -- instdest=3D$(DESTDIR)/usr/src/$$destname; \ -+ instdest=3D$(DESTDIR)/${includedir}/spl; \ - echo "$(SPL_META_VERSION)" >$$instdest/spl.release; \ - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ diff --git a/sys-devel/spl/metadata.xml b/sys-devel/spl/metadata.xml deleted file mode 100644 index 348e6c4..0000000 --- a/sys-devel/spl/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -cluster - diff --git a/sys-devel/spl/spl-0.6.0_rc4.ebuild b/sys-devel/spl/spl-0.6.0= _rc4.ebuild deleted file mode 100644 index e5df7e6..0000000 --- a/sys-devel/spl/spl-0.6.0_rc4.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -WANT_AUTOMAKE=3D"1.11" -AT_M4DIR=3D./config # for aclocal called by eautoreconf -inherit autotools eutils linux-info - -DESCRIPTION=3D"Solaris Porting Layer - a Linux kernel module providing s= ome Solaris kernel APIs" -HOMEPAGE=3D"http://wiki.github.com/behlendorf/spl/" -SRC_URI=3D"http://github.com/downloads/behlendorf/${PN}/${P/_/-}.tar.gz" - -LICENSE=3D"|| ( GPL-2 GPL-3 )" -SLOT=3D"0" -KEYWORDS=3D"~amd64 -x86" -IUSE=3D"" - -DEPEND=3D" - >=3Dvirtual/linux-sources-2.6 - " -RDEPEND=3D"" - -S=3D"${WORKDIR}/${P/_/-}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch - eautoreconf -} - -src_configure() { - set_arch_to_kernel - econf \ - --with-config=3Dall \ - --with-linux=3D"${KERNEL_DIR}" \ - --with-linux-obj=3D"${KERNEL_DIR}" -} - -src_install() { - emake DESTDIR=3D"${D}" install || die 'emake install failed' - dosym /usr/include/spl/spl_config.h /usr/include/spl/module/spl_config.= h \ - || die -} diff --git a/sys-devel/spl/spl-9999.ebuild b/sys-devel/spl/spl-9999.ebuil= d deleted file mode 100644 index bb3c609..0000000 --- a/sys-devel/spl/spl-9999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -WANT_AUTOMAKE=3D"1.11" -AT_M4DIR=3D./config # for aclocal called by eautoreconf -inherit autotools eutils git-2 linux-info - -DESCRIPTION=3D"Solaris Porting Layer - a Linux kernel module providing s= ome Solaris kernel APIs" -HOMEPAGE=3D"http://wiki.github.com/behlendorf/spl/" -SRC_URI=3D"" -EGIT_REPO_URI=3D"git://github.com/behlendorf/spl.git" - -LICENSE=3D"|| ( GPL-2 GPL-3 )" -SLOT=3D"0" -KEYWORDS=3D"" -IUSE=3D"" - -DEPEND=3D" - >=3Dvirtual/linux-sources-2.6 - " -RDEPEND=3D"" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch - eautoreconf -} - -src_configure() { - set_arch_to_kernel - econf \ - --with-config=3Dall \ - --with-linux=3D"${KERNEL_DIR}" \ - --with-linux-obj=3D"${KERNEL_DIR}" -} - -src_install() { - emake DESTDIR=3D"${D}" install || die 'emake install failed' - dosym /usr/include/spl/spl_config.h /usr/include/spl/module/spl_config.= h \ - || die -} diff --git a/sys-fs/zfs/files/zfs-0.6.0-includedir.patch b/sys-fs/zfs/fil= es/zfs-0.6.0-includedir.patch deleted file mode 100644 index fd31ec3..0000000 --- a/sys-fs/zfs/files/zfs-0.6.0-includedir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN zfs-0.6.0-rc3.orig/Makefile.am zfs-0.6.0-rc3/Makefile.am ---- zfs-0.6.0-rc3.orig/Makefile.am 2011-04-07 22:31:01.000000000 +0400 -+++ zfs-0.6.0-rc3/Makefile.am 2011-04-12 03:25:36.000000000 +0400 -@@ -32,8 +32,7 @@ -=20 - if CONFIG_KERNEL - install-data-local: -- destname=3Dzfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \ -- instdest=3D$(DESTDIR)/usr/src/$$destname; \ -+ instdest=3D$(DESTDIR)/${includedir}/zfs-linux; \ - echo "$(ZFS_META_VERSION)" >$$instdest/zfs.release; \ - for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \ - $(INSTALL) -D $$instfile $$instdest/$$instfile; \ diff --git a/sys-fs/zfs/files/zfs.initd b/sys-fs/zfs/files/zfs.initd deleted file mode 100644 index c9c5634..0000000 --- a/sys-fs/zfs/files/zfs.initd +++ /dev/null @@ -1,98 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/files/zfs,v 0.9 2011/04/30= 10:13:43 devsk Exp $ - -depend() -{ - before net - after udev - keyword -lxc -openvz -prefix -vserver -} - -CACHEFILE=3D/etc/zfs/zpool.cache -ZPOOL=3D/usr/sbin/zpool -ZFS=3D/usr/sbin/zfs -ZFS_MODULE=3Dzfs - -checksystem() { - if [ -c /dev/zfs ]; then - einfo "ZFS modules already loaded" - return 0 - else - einfo "Checking if ZFS modules present" - if [ "x$(modprobe -l $ZFS_MODULE | grep $ZFS_MODULE)" =3D=3D "x" ]; t= hen - eerror "$ZFS_MODULE not found. Is the ZFS package installed?" - return 1 - fi - fi - einfo "Checking if zfs userspace tools present" - if [ ! -x $ZPOOL ]; then - eerror "$ZPOOL binary not found." - return 1 - fi - if [ ! -x $ZFS ]; then - eerror "$ZFS binary not found." - return 1 - fi - return 0 -} - -start() { - ebegin "Starting ZFS" - checksystem || return 1 - if [ ! -c /dev/zfs ]; then - modprobe $ZFS_MODULE - rv=3D$? - if [ $rv -ne 0 ]; then - eerror "Failed to load the $ZFS_MODULE module, check 'dmesg|tail'." - eend $rv - return $rv - fi - fi - - # Import all pools described by the cache file, and then mount - # all filesystem based on their properties. - if [ -f $CACHEFILE ]; then - einfo "Importing ZFS pools" - # as per fedora script, import can fail if all pools are already impor= ted - # The check for $rv makes no sense...but someday, it will work right. - $ZPOOL import -c $CACHEFILE -aN 2>/dev/null || true - rv=3D$? - if [ $rv -ne 0 ]; then - eerror "Failed to import not-yet imported pools." - eend $rv - return $rv - fi - fi - - einfo "Mounting ZFS filesystems" - $ZFS mount -a - rv=3D$? - if [ $rv -ne 0 ]; then - eerror "Failed to mount ZFS filesystems." - eend $rv - return $rv - fi -=09 - eend 0 - return 0 -} - -stop() -{ - ebegin "Unmounting ZFS filesystems" - $ZFS umount -a - rv=3D$? - if [ $rv -ne 0 ]; then - eerror "Failed to umount ZFS filesystems." - fi -=09 - eend $rv -} - -status() -{ - # show pool status and list - $ZPOOL status && echo && $ZPOOL list -} diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml deleted file mode 100644 index 348e6c4..0000000 --- a/sys-fs/zfs/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - -cluster - diff --git a/sys-fs/zfs/zfs-0.6.0_rc4.ebuild b/sys-fs/zfs/zfs-0.6.0_rc4.e= build deleted file mode 100644 index efe78b2..0000000 --- a/sys-fs/zfs/zfs-0.6.0_rc4.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -WANT_AUTOMAKE=3D"1.11" -AT_M4DIR=3D./config # for aclocal called by eautoreconf -inherit autotools eutils linux-mod - -DESCRIPTION=3D"Native ZFS for Linux" -HOMEPAGE=3D"http://wiki.github.com/behlendorf/zfs/" -SRC_URI=3D"http://github.com/downloads/behlendorf/${PN}/${P/_/-}.tar.gz" - -LICENSE=3D"CDDL GPL-2" -SLOT=3D"0" -KEYWORDS=3D"~amd64 -x86" -IUSE=3D"" - -DEPEND=3D" - >=3Dsys-devel/spl-${PV} - >=3Dvirtual/linux-sources-2.6 - " -RDEPEND=3D" - !sys-fs/zfs-fuse - " - -S=3D"${WORKDIR}/${P/_/-}" - -pkg_setup() { - linux-mod_pkg_setup - kernel_is gt 2 6 32 || die "Your kernel is too old. ${CATEGORY}/${PN} n= eed 2.6.32 or newer." - linux_config_exists || die "Your kernel sources are unconfigured." - if linux_chkconfig_present PREEMPT; then - eerror "${CATEGORY}/${PN} doesn't currently work with PREEMPT kernel." - eerror "Please look at bug https://github.com/behlendorf/zfs/issues/83= " - die "PREEMPT kernel" - fi -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.6.0-includedir.patch" - eautoreconf -} - -src_configure() { - set_arch_to_kernel - econf \ - --with-config=3Dall \ - --with-linux=3D"${KERNEL_DIR}" \ - --with-linux-obj=3D"${KERNEL_DIR}" \ - --with-spl=3D/usr/include/spl \ - --with-spl-obj=3D/usr/include/spl/module -} - -src_compile() { - set_arch_to_kernel - default # _not_ the one from linux-mod -} - -src_install() { - emake DESTDIR=3D"${D}" install || die 'emake install failed' - newinitd "${FILESDIR}/zfs.initd" zfs - keepdir /var/lock/zfs - # Drop unwanted files - rm -rf "${D}/usr/src" || die "removing unwanted files die" -} diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild deleted file mode 100644 index efb5f7c..0000000 --- a/sys-fs/zfs/zfs-9999.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D"2" - -WANT_AUTOMAKE=3D"1.11" -AT_M4DIR=3D./config # for aclocal called by eautoreconf - -EGIT_REPO_URI=3D"http://github.com/behlendorf/zfs.git" - -inherit autotools eutils git-2 linux-mod - -DESCRIPTION=3D"Native ZFS for Linux" -HOMEPAGE=3D"http://wiki.github.com/behlendorf/zfs/" -SRC_URI=3D"" - -LICENSE=3D"CDDL GPL-2" -SLOT=3D"0" -KEYWORDS=3D"" -IUSE=3D"" - -DEPEND=3D" - >=3Dsys-devel/spl-${PV} - >=3Dvirtual/linux-sources-2.6 - " -RDEPEND=3D" - !sys-fs/zfs-fuse - " - -pkg_setup() { - linux-mod_pkg_setup - kernel_is gt 2 6 32 || die "Your kernel is too old. ${CATEGORY}/${PN} n= eed 2.6.32 or newer." - linux_config_exists || die "Your kernel sources are unconfigured." - if linux_chkconfig_present PREEMPT; then - eerror "${CATEGORY}/${PN} doesn't currently work with PREEMPT kernel." - eerror "Please look at bug https://github.com/behlendorf/zfs/issues/83= " - die "PREEMPT kernel" - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch - eautoreconf -} - -src_configure() { - set_arch_to_kernel - econf \ - --with-config=3Dall \ - --with-linux=3D"${KERNEL_DIR}" \ - --with-linux-obj=3D"${KERNEL_DIR}" \ - --with-spl=3D/usr/include/spl \ - --with-spl-obj=3D/usr/include/spl/module -} - -src_compile() { - set_arch_to_kernel - default # _not_ the one from linux-mod -} - -src_install() { - emake DESTDIR=3D"${D}" install || die 'emake install failed' - # Drop unwanted files - rm -rf "${D}/usr/src" || die "removing unwanted files die" -}