Retire ZFS.RELEASE file

The ZFS.RELEASE file was originally added to document which
version of OpenSolaris the ZoL code was based on.  However,
that's no longer particularly important or useful.  We'll
likely never see a new onnv_* drop from Solaris, and even
if we do the ZoL changes are now extensive enough they
could not be easily applied.  We now treat Illumos as the
official upstream and cherry pick the patches we need.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/Makefile.am b/Makefile.am
index 2897ae9..ca8a419 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,8 +13,7 @@ endif
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST  = autogen.sh zfs.spec.in zfs-modules.spec.in
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
-EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown
-EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
+EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE
 EXTRA_DIST += dkms.postinst copy-builtin
 noinst_HEADERS = zfs_config.h zfs.release
 

diff --git a/ZFS.RELEASE b/ZFS.RELEASE
deleted file mode 100644 (file)
index 8ad36b9..0000000
--- a/ZFS.RELEASE
+++ /dev/null
@@ -1 +0,0 @@
-ssh://anon@hg.opensolaris.org/hg/onnv/onnv-gate/onnv_147

diff --git a/zfs.spec.in b/zfs.spec.in
index 7c46964..3e784ec 100644 (file)
--- a/zfs.spec.in
+++ b/zfs.spec.in
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/zfs/*
 
 %doc AUTHORS COPYING COPYRIGHT DISCLAIMER
-%doc OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE
+%doc OPENSOLARIS.LICENSE README.markdown
 
 %files devel
 %defattr(-,root,root)