summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2012-07-11 19:44:10 +0000
committerRichard Yao <ryao@gentoo.org>2012-07-11 19:44:10 +0000
commit5242e0e20306d310f7982bef24b9b2f9f37ae4a3 (patch)
tree20b042932eb4182c7406d6642e82a9201023fc8d /sys-fs/zfs
parentMarking xf86-video-r128-6.8.2-r1 ppc64 for bug 419473 (diff)
downloadgentoo-2-5242e0e20306d310f7982bef24b9b2f9f37ae4a3.tar.gz
gentoo-2-5242e0e20306d310f7982bef24b9b2f9f37ae4a3.tar.bz2
gentoo-2-5242e0e20306d310f7982bef24b9b2f9f37ae4a3.zip
Remove the file in preparation to add it with `cvs add -ko`
Diffstat (limited to 'sys-fs/zfs')
-rw-r--r--sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch b/sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch
deleted file mode 100644
index 0d8fc1da1a55..000000000000
--- a/sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit 0ac83722a09ccb15067cad91217103474b58dadf
-Author: Richard Yao <ryao@cs.stonybrook.edu>
-Date: Tue Jul 10 09:27:09 2012 -0400
-
- Relicense zfs.gentoo.in from GPLv2 to 2-clause BSD
-
- As the Gentoo sys-fs/zfs maintainer, I receive license compatibility
- questions and at times, those questions can be harassing. I feel that
- the presence of the GPL in Gentoo's package metadata promotes such
- questions. zfs.gentoo.in is the only GPLv2 licensed file in ZFS, so I
- have taken the liberty of contacting all contributors to this file to
- request permission to relicense it.
-
- All of the contributors to this file have agreed to relicense it under
- the 2-clause BSD license. I have added their Signed-offs to this commit,
- in order of first contribution. Thankyou everyone for being so
- understanding.
-
- Signed-off-by: devsk <devsku@gmail.com>
- Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
- Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
- Signed-off-by: Andrew Tselischev <andrewtselischev@gmail.com>
- Signed-off-by: Zachary Bedell <zac@thebedells.org>
- Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
- Signed-off-by: Kyle Fuller <inbox@kylefuller.co.uk>
- Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
-
-diff --git a/etc/init.d/zfs.gentoo.in b/etc/init.d/zfs.gentoo.in
-index 957be99..df883cf 100644
---- a/etc/init.d/zfs.gentoo.in
-+++ b/etc/init.d/zfs.gentoo.in
-@@ -1,6 +1,6 @@
- #!/sbin/runscript
- # Copyright 1999-2011 Gentoo Foundation
--# Distributed under the terms of the GNU General Public License v2
-+# Released under the 2-clause BSD license.
- # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/files/zfs,v 0.9 2011/04/30 10:13:43 devsk Exp $
-
- depend()