* [gentoo-commits] proj/sci:master commit in: sys-fs/zfs/, sys-fs/zfs/files/
@ 2011-04-14 23:02 Alexey Shvetsov
0 siblings, 0 replies; 4+ messages in thread
From: Alexey Shvetsov @ 2011-04-14 23:02 UTC (permalink / raw
To: gentoo-commits
commit: a098183d0bfd78b94788ad199743b538a7194850
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 23:02:26 2011 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 23:02:26 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a098183d
[sys-fs/zfs] Initial import from sping overlay
(Portage version: 2.2.0_alpha30/git/Linux x86_64, signed Manifest commit with key F82F92E6)
---
sys-fs/zfs/files/zfs-0.6.0-includedir.patch | 13 +++++++
sys-fs/zfs/metadata.xml | 5 +++
sys-fs/zfs/zfs-0.6.0_rc3.ebuild | 49 ++++++++++++++++++++++++++
sys-fs/zfs/zfs-9999.ebuild | 50 +++++++++++++++++++++++++++
4 files changed, 117 insertions(+), 0 deletions(-)
diff --git a/sys-fs/zfs/files/zfs-0.6.0-includedir.patch b/sys-fs/zfs/files/zfs-0.6.0-includedir.patch
new file mode 100644
index 0000000..fd31ec3
--- /dev/null
+++ b/sys-fs/zfs/files/zfs-0.6.0-includedir.patch
@@ -0,0 +1,13 @@
+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/metadata.xml b/sys-fs/zfs/metadata.xml
new file mode 100644
index 0000000..348e6c4
--- /dev/null
+++ b/sys-fs/zfs/metadata.xml
@@ -0,0 +1,5 @@
+<?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_rc3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
new file mode 100644
index 0000000..ab60f3a
--- /dev/null
+++ b/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
@@ -0,0 +1,49 @@
+# 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 eutils autotools 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.32
+ "
+RDEPEND="
+ !sys-fs/zfs-fuse
+ "
+
+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}" \
+ --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'
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
new file mode 100644
index 0000000..3f8e326
--- /dev/null
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -0,0 +1,50 @@
+# 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 git eutils autotools 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.32
+ "
+RDEPEND="
+ !sys-fs/zfs-fuse
+ "
+
+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'
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-fs/zfs/, sys-fs/zfs/files/
@ 2011-05-14 13:52 Alexey Shvetsov
0 siblings, 0 replies; 4+ messages in thread
From: Alexey Shvetsov @ 2011-05-14 13:52 UTC (permalink / raw
To: gentoo-commits
commit: f32e6e1a708ef5c0bb2779ed127711c57a5f1fbe
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 13:51:24 2011 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat May 14 13:51:24 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f32e6e1a
[sys-fs/zfs] Update to recent version
(Portage version: 2.2.0_alpha32/git/Linux x86_64, signed Manifest commit with key F82F92E6)
---
sys-fs/zfs/files/zfs.initd | 102 +++++++-------------
.../{zfs-0.6.0_rc3.ebuild => zfs-0.6.0_rc4.ebuild} | 0
sys-fs/zfs/zfs-9999.ebuild | 4 +-
3 files changed, 34 insertions(+), 72 deletions(-)
diff --git a/sys-fs/zfs/files/zfs.initd b/sys-fs/zfs/files/zfs.initd
index 878c054..c9c5634 100644
--- a/sys-fs/zfs/files/zfs.initd
+++ b/sys-fs/zfs/files/zfs.initd
@@ -3,54 +3,48 @@
# 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() {
+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
-LOCKFILE=/var/lock/zfs/zfs_lockfile
-checksystem()
-{
- /sbin/modinfo $ZFS_MODULE &>/dev/null
- if [[ $? -ne 0 ]]
- then
- eerror "$ZFS_MODULE not found. Is the ZFS package installed?"
- return 1
- fi
- if [[ ! -x $ZPOOL ]]
- then
- eerror "$ZPOOL binary not found."
- return 1
- fi
- if [[ ! -x $ZFS ]]
- then
- eerror "$ZFS binary not found."
- return 1
+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()
-{
- if [[ -f $LOCKFILE ]]
- then
- einfo "ZFS already running, please stop it first. Delete $LOCKFILE if its not so."
- eend 3
- return 3
- fi
+start() {
ebegin "Starting ZFS"
checksystem || return 1
- if ! grep -q $ZFS_MODULE /proc/modules
- then
- /sbin/modprobe $ZFS_MODULE &>/dev/null
+ if [ ! -c /dev/zfs ]; then
+ modprobe $ZFS_MODULE
rv=$?
- if [[ $rv -ne 0 ]]
- then
+ if [ $rv -ne 0 ]; then
eerror "Failed to load the $ZFS_MODULE module, check 'dmesg|tail'."
eend $rv
return $rv
@@ -59,16 +53,13 @@ start()
# Import all pools described by the cache file, and then mount
# all filesystem based on their properties.
- if [[ -f $CACHEFILE ]]
- then
+ 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
+ if [ $rv -ne 0 ]; then
eerror "Failed to import not-yet imported pools."
eend $rv
return $rv
@@ -78,57 +69,30 @@ start()
einfo "Mounting ZFS filesystems"
$ZFS mount -a
rv=$?
- if [[ $rv -ne 0 ]]
- then
+ if [ $rv -ne 0 ]; then
eerror "Failed to mount ZFS filesystems."
eend $rv
return $rv
fi
-
- # hack to read mounted file systems because otherwise
- # zfs returns EPERM when a non-root user reads a mounted filesystem before root did
- savepwd="$PWD"
- mount | grep " type zfs " | sed 's/.*on //' | sed 's/ type zfs.*$//' | \
- while read line
- do
- cd "$line" &> /dev/null
- ls &> /dev/null
- done
- cd "$savepwd"
-
- touch $LOCKFILE
+
eend 0
return 0
}
stop()
{
- if [[ ! -f $LOCKFILE ]]
- then
- einfo "ZFS is not started, remove $LOCKFILE if its not so."
- eend 3
- return 3
- fi
ebegin "Unmounting ZFS filesystems"
- sync
$ZFS umount -a
- if [[ $rv -ne 0 ]]
- then
+ rv=$?
+ if [ $rv -ne 0 ]; then
eerror "Failed to umount ZFS filesystems."
fi
- rm -f $LOCKFILE
+
eend $rv
}
status()
{
- if [[ ! -f $LOCKFILE ]]
- then
- einfo "ZFS is not started, remove $LOCKFILE if its not so."
- eend 3
- return 3
- fi
-
# show pool status and list
$ZPOOL status && echo && $ZPOOL list
}
diff --git a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc4.ebuild
similarity index 100%
rename from sys-fs/zfs/zfs-0.6.0_rc3.ebuild
rename to sys-fs/zfs/zfs-0.6.0_rc4.ebuild
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 5625db6..efb5f7c 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -9,7 +9,7 @@ AT_M4DIR=./config # for aclocal called by eautoreconf
EGIT_REPO_URI="http://github.com/behlendorf/zfs.git"
-inherit autotools eutils git linux-mod
+inherit autotools eutils git-2 linux-mod
DESCRIPTION="Native ZFS for Linux"
HOMEPAGE="http://wiki.github.com/behlendorf/zfs/"
@@ -61,8 +61,6 @@ src_compile() {
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"
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-fs/zfs/, sys-fs/zfs/files/
@ 2011-05-14 14:30 Alexey Shvetsov
0 siblings, 0 replies; 4+ messages in thread
From: Alexey Shvetsov @ 2011-05-14 14:30 UTC (permalink / raw
To: gentoo-commits
commit: bb6fe4e9cba5162eb4ecb5deb85b6539c66f8e7b
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 14:30:07 2011 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat May 14 14:30:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bb6fe4e9
[sys-fs/zfs] Fix gentoo detection
(Portage version: 2.2.0_alpha32/git/Linux x86_64, signed Manifest commit with key F82F92E6)
---
.../0001-gentoo-Fix-detection-of-gentoo.patch | 41 ++++++++++++++++++++
sys-fs/zfs/zfs-9999.ebuild | 1 +
2 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/sys-fs/zfs/files/0001-gentoo-Fix-detection-of-gentoo.patch b/sys-fs/zfs/files/0001-gentoo-Fix-detection-of-gentoo.patch
new file mode 100644
index 0000000..aa8e684
--- /dev/null
+++ b/sys-fs/zfs/files/0001-gentoo-Fix-detection-of-gentoo.patch
@@ -0,0 +1,41 @@
+From aa31bffa2022a73c3a5c57914462025ebdbd4407 Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@gentoo.org>
+Date: Sat, 14 May 2011 18:25:37 +0400
+Subject: [PATCH] [gentoo] Fix detection of gentoo
+
+Also this may fix other distros because some of them also provides
+/etc/lsb-release not only ubuntu.
+---
+ configure | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index fee3c74..f504950 100755
+--- a/configure
++++ b/configure
+@@ -11785,18 +11785,18 @@ $as_echo_n "checking linux distribution... " >&6; }
+ VENDOR=redhat ;
+ elif test -f /etc/fedora-release ; then
+ VENDOR=fedora ;
+- elif test -f /etc/lsb-release ; then
+- VENDOR=ubuntu ;
++ elif test -f /etc/gentoo-release ; then
++ VENDOR=gentoo ;
+ elif test -f /etc/debian_version ; then
+ VENDOR=debian ;
+ elif test -f /etc/SuSE-release ; then
+ VENDOR=sles ;
+ elif test -f /etc/slackware-version ; then
+ VENDOR=slackware ;
+- elif test -f /etc/gentoo-release ; then
+- VENDOR=gentoo ;
+ elif test -f /etc/lunar.release ; then
+ VENDOR=lunar ;
++ elif test -f /etc/lsb-release ; then
++ VENDOR=ubuntu ;
+ else
+ VENDOR= ;
+ fi
+--
+1.7.5.rc3
+
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index efb5f7c..db6fe7c 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -41,6 +41,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch
+ epatch "{FILESDIR}"/0001-gentoo-Fix-detection-of-gentoo.patch
eautoreconf
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-fs/zfs/, sys-fs/zfs/files/
@ 2011-05-14 17:48 Alexey Shvetsov
0 siblings, 0 replies; 4+ messages in thread
From: Alexey Shvetsov @ 2011-05-14 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 73a4f8d4b7d3148dafb1fcb28145f5aa94aa10e3
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 17:47:49 2011 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sat May 14 17:47:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=73a4f8d4
[sys-fs/zfs] Patch merged upstream
(Portage version: 2.2.0_alpha32/git/Linux x86_64, signed Manifest commit with key F82F92E6)
---
.../0001-gentoo-Fix-detection-of-gentoo.patch | 67 --------------------
sys-fs/zfs/zfs-9999.ebuild | 1 -
2 files changed, 0 insertions(+), 68 deletions(-)
diff --git a/sys-fs/zfs/files/0001-gentoo-Fix-detection-of-gentoo.patch b/sys-fs/zfs/files/0001-gentoo-Fix-detection-of-gentoo.patch
deleted file mode 100644
index 858402b..0000000
--- a/sys-fs/zfs/files/0001-gentoo-Fix-detection-of-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 954736163c4314a99a65c3bbdcb0294e896ba97a Mon Sep 17 00:00:00 2001
-From: Alexey Shvetsov <alexxy@gentoo.org>
-Date: Sat, 14 May 2011 18:25:37 +0400
-Subject: [PATCH] [gentoo] Fix detection of gentoo
-
-Also this may fix other distros because some of them also provides
-/etc/lsb-release not only ubuntu.
----
- config/zfs-build.m4 | 8 ++++----
- configure | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
-index d281b4d..773a944 100644
---- a/config/zfs-build.m4
-+++ b/config/zfs-build.m4
-@@ -178,16 +178,16 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
- VENDOR=redhat ;
- elif test -f /etc/fedora-release ; then
- VENDOR=fedora ;
-- elif test -f /etc/lsb-release ; then
-- VENDOR=ubuntu ;
-+ elif test -f /etc/gentoo-release ; then
-+ VENDOR=gentoo ;
- elif test -f /etc/debian_version ; then
- VENDOR=debian ;
- elif test -f /etc/SuSE-release ; then
- VENDOR=sles ;
- elif test -f /etc/slackware-version ; then
- VENDOR=slackware ;
-- elif test -f /etc/gentoo-release ; then
-- VENDOR=gentoo ;
-+ elif test -f /etc/lsb-release ; then
-+ VENDOR=ubuntu ;
- elif test -f /etc/lunar.release ; then
- VENDOR=lunar ;
- else
-diff --git a/configure b/configure
-index fee3c74..f504950 100755
---- a/configure
-+++ b/configure
-@@ -11785,18 +11785,18 @@ $as_echo_n "checking linux distribution... " >&6; }
- VENDOR=redhat ;
- elif test -f /etc/fedora-release ; then
- VENDOR=fedora ;
-- elif test -f /etc/lsb-release ; then
-- VENDOR=ubuntu ;
-+ elif test -f /etc/gentoo-release ; then
-+ VENDOR=gentoo ;
- elif test -f /etc/debian_version ; then
- VENDOR=debian ;
- elif test -f /etc/SuSE-release ; then
- VENDOR=sles ;
- elif test -f /etc/slackware-version ; then
- VENDOR=slackware ;
-- elif test -f /etc/gentoo-release ; then
-- VENDOR=gentoo ;
- elif test -f /etc/lunar.release ; then
- VENDOR=lunar ;
-+ elif test -f /etc/lsb-release ; then
-+ VENDOR=ubuntu ;
- else
- VENDOR= ;
- fi
---
-1.7.5.rc3
-
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 091776b..efb5f7c 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -41,7 +41,6 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.6.0-includedir.patch
- epatch "${FILESDIR}"/0001-gentoo-Fix-detection-of-gentoo.patch
eautoreconf
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-05-14 17:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-14 14:30 [gentoo-commits] proj/sci:master commit in: sys-fs/zfs/, sys-fs/zfs/files/ Alexey Shvetsov
-- strict thread matches above, loose matches on Subject: below --
2011-05-14 17:48 Alexey Shvetsov
2011-05-14 13:52 Alexey Shvetsov
2011-04-14 23:02 Alexey Shvetsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox