From e07b579b1b487eec772ec9394eefaad264c779fb Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Sun, 17 Feb 2013 11:16:22 -0800 Subject: [PATCH] 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 --- Makefile.am | 3 +-- ZFS.RELEASE | 1 - zfs.spec.in | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 ZFS.RELEASE diff --git a/Makefile.am b/Makefile.am index 2897ae941b..ca8a41939b 100644 --- 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 index 8ad36b9835..0000000000 --- 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 7c469642ce..3e784ecdab 100644 --- 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)