diff options
author | 2012-01-31 21:41:19 +0400 | |
---|---|---|
committer | 2012-01-31 21:41:19 +0400 | |
commit | e15038ee28bc50c95a1c24c7b8d8be707ac3eadd (patch) | |
tree | add4e9867b6dae8d4987930cfd1b193f793e7b87 | |
parent | sci-biology/seaview: and the path to the helpfile was corrected in the Makefi... (diff) | |
download | sci-e15038ee28bc50c95a1c24c7b8d8be707ac3eadd.tar.gz sci-e15038ee28bc50c95a1c24c7b8d8be707ac3eadd.tar.bz2 sci-e15038ee28bc50c95a1c24c7b8d8be707ac3eadd.zip |
[zfs,spl] They are in tree already
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
-rw-r--r-- | sys-devel/spl/Manifest | 1 | ||||
-rw-r--r-- | sys-devel/spl/files/spl-0.6.0-includedir.patch | 26 | ||||
-rw-r--r-- | sys-devel/spl/metadata.xml | 5 | ||||
-rw-r--r-- | sys-devel/spl/spl-0.6.0_rc4.ebuild | 44 | ||||
-rw-r--r-- | sys-devel/spl/spl-9999.ebuild | 43 | ||||
-rw-r--r-- | sys-fs/zfs/Manifest | 1 | ||||
-rw-r--r-- | sys-fs/zfs/files/zfs-0.6.0-includedir.patch | 13 | ||||
-rw-r--r-- | sys-fs/zfs/files/zfs.initd | 98 | ||||
-rw-r--r-- | sys-fs/zfs/metadata.xml | 5 | ||||
-rw-r--r-- | sys-fs/zfs/zfs-0.6.0_rc4.ebuild | 67 | ||||
-rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 66 |
11 files changed, 0 insertions, 369 deletions
diff --git a/sys-devel/spl/Manifest b/sys-devel/spl/Manifest deleted file mode 100644 index c26c5c0a3..000000000 --- a/sys-devel/spl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST spl-0.6.0-rc4.tar.gz 428187 RMD160 13693caaff47dc5b852348b243ce519176580f2b SHA1 90c1d6d2fd621301f8aa87f7ee3e28c711db9b77 SHA256 2091ceb306e190c3bddb96df98fa9d165820f5f62ed3109e6b50e82ed002486a diff --git a/sys-devel/spl/files/spl-0.6.0-includedir.patch b/sys-devel/spl/files/spl-0.6.0-includedir.patch deleted file mode 100644 index 37cdbf6a4..000000000 --- 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/Makefile.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 +0400 -@@ -15,8 +15,7 @@ - noinst_HEADERS += $(top_srcdir)/include/vm/*.h - - install-data-local: -- destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ -- instdest=$(DESTDIR)/usr/src/$$destname; \ -+ instdest=$(DESTDIR)/${includedir}/spl; \ - instfiles=`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 @@ - - if CONFIG_KERNEL - install-data-local: -- destname=spl-$(SPL_META_VERSION)/$(LINUX_VERSION); \ -- instdest=$(DESTDIR)/usr/src/$$destname; \ -+ instdest=$(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 348e6c4de..000000000 --- a/sys-devel/spl/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>cluster</herd> -</pkgmetadata> 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 e5df7e635..000000000 --- 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="2" - -WANT_AUTOMAKE="1.11" -AT_M4DIR=./config # for aclocal called by eautoreconf -inherit autotools eutils linux-info - -DESCRIPTION="Solaris Porting Layer - a Linux kernel module providing some Solaris kernel APIs" -HOMEPAGE="http://wiki.github.com/behlendorf/spl/" -SRC_URI="http://github.com/downloads/behlendorf/${PN}/${P/_/-}.tar.gz" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~amd64 -x86" -IUSE="" - -DEPEND=" - >=virtual/linux-sources-2.6 - " -RDEPEND="" - -S="${WORKDIR}/${P/_/-}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch - eautoreconf -} - -src_configure() { - set_arch_to_kernel - econf \ - --with-config=all \ - --with-linux="${KERNEL_DIR}" \ - --with-linux-obj="${KERNEL_DIR}" -} - -src_install() { - emake DESTDIR="${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.ebuild deleted file mode 100644 index bb3c60914..000000000 --- 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="2" - -WANT_AUTOMAKE="1.11" -AT_M4DIR=./config # for aclocal called by eautoreconf -inherit autotools eutils git-2 linux-info - -DESCRIPTION="Solaris Porting Layer - a Linux kernel module providing some Solaris kernel APIs" -HOMEPAGE="http://wiki.github.com/behlendorf/spl/" -SRC_URI="" -EGIT_REPO_URI="git://github.com/behlendorf/spl.git" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="" -IUSE="" - -DEPEND=" - >=virtual/linux-sources-2.6 - " -RDEPEND="" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch - eautoreconf -} - -src_configure() { - set_arch_to_kernel - econf \ - --with-config=all \ - --with-linux="${KERNEL_DIR}" \ - --with-linux-obj="${KERNEL_DIR}" -} - -src_install() { - emake DESTDIR="${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/Manifest b/sys-fs/zfs/Manifest deleted file mode 100644 index 4d73866dd..000000000 --- a/sys-fs/zfs/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST zfs-0.6.0-rc4.tar.gz 1870362 RMD160 190677dddcf54835ab933f2ec891f189dc1cb39e SHA1 c01bb9458586c5b50ee4d3dfb8b6059689da1e12 SHA256 947f3bd84998c6e9047cf68a37d3f029b850c9470d3a65f99edb246f73fa7c7d diff --git a/sys-fs/zfs/files/zfs-0.6.0-includedir.patch b/sys-fs/zfs/files/zfs-0.6.0-includedir.patch deleted file mode 100644 index fd31ec37c..000000000 --- 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 @@ - - if CONFIG_KERNEL - install-data-local: -- destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \ -- instdest=$(DESTDIR)/usr/src/$$destname; \ -+ instdest=$(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 c9c563429..000000000 --- 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=/etc/zfs/zpool.cache -ZPOOL=/usr/sbin/zpool -ZFS=/usr/sbin/zfs -ZFS_MODULE=zfs - -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)" == "x" ]; then - 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=$? - 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 imported - # The check for $rv makes no sense...but someday, it will work right. - $ZPOOL import -c $CACHEFILE -aN 2>/dev/null || true - rv=$? - 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=$? - if [ $rv -ne 0 ]; then - eerror "Failed to mount ZFS filesystems." - eend $rv - return $rv - fi - - eend 0 - return 0 -} - -stop() -{ - ebegin "Unmounting ZFS filesystems" - $ZFS umount -a - rv=$? - if [ $rv -ne 0 ]; then - eerror "Failed to umount ZFS filesystems." - fi - - 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 348e6c4de..000000000 --- a/sys-fs/zfs/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>cluster</herd> -</pkgmetadata> diff --git a/sys-fs/zfs/zfs-0.6.0_rc4.ebuild b/sys-fs/zfs/zfs-0.6.0_rc4.ebuild deleted file mode 100644 index efe78b202..000000000 --- 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="2" - -WANT_AUTOMAKE="1.11" -AT_M4DIR=./config # for aclocal called by eautoreconf -inherit autotools eutils linux-mod - -DESCRIPTION="Native ZFS for Linux" -HOMEPAGE="http://wiki.github.com/behlendorf/zfs/" -SRC_URI="http://github.com/downloads/behlendorf/${PN}/${P/_/-}.tar.gz" - -LICENSE="CDDL GPL-2" -SLOT="0" -KEYWORDS="~amd64 -x86" -IUSE="" - -DEPEND=" - >=sys-devel/spl-${PV} - >=virtual/linux-sources-2.6 - " -RDEPEND=" - !sys-fs/zfs-fuse - " - -S="${WORKDIR}/${P/_/-}" - -pkg_setup() { - linux-mod_pkg_setup - kernel_is gt 2 6 32 || die "Your kernel is too old. ${CATEGORY}/${PN} need 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=all \ - --with-linux="${KERNEL_DIR}" \ - --with-linux-obj="${KERNEL_DIR}" \ - --with-spl=/usr/include/spl \ - --with-spl-obj=/usr/include/spl/module -} - -src_compile() { - set_arch_to_kernel - default # _not_ the one from linux-mod -} - -src_install() { - emake DESTDIR="${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 efb5f7cd0..000000000 --- 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="2" - -WANT_AUTOMAKE="1.11" -AT_M4DIR=./config # for aclocal called by eautoreconf - -EGIT_REPO_URI="http://github.com/behlendorf/zfs.git" - -inherit autotools eutils git-2 linux-mod - -DESCRIPTION="Native ZFS for Linux" -HOMEPAGE="http://wiki.github.com/behlendorf/zfs/" -SRC_URI="" - -LICENSE="CDDL GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="" - -DEPEND=" - >=sys-devel/spl-${PV} - >=virtual/linux-sources-2.6 - " -RDEPEND=" - !sys-fs/zfs-fuse - " - -pkg_setup() { - linux-mod_pkg_setup - kernel_is gt 2 6 32 || die "Your kernel is too old. ${CATEGORY}/${PN} need 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=all \ - --with-linux="${KERNEL_DIR}" \ - --with-linux-obj="${KERNEL_DIR}" \ - --with-spl=/usr/include/spl \ - --with-spl-obj=/usr/include/spl/module -} - -src_compile() { - set_arch_to_kernel - default # _not_ the one from linux-mod -} - -src_install() { - emake DESTDIR="${D}" install || die 'emake install failed' - # Drop unwanted files - rm -rf "${D}/usr/src" || die "removing unwanted files die" -} |