Move zfs.release generation to configure step

Previously, the zfs.release file was created at 'make install' time.
This is slightly problematic when the file is needed without running
'make install'. Because of this, the step creating the file was removed
from 'make install' and replaced with a more appropriate zfs.release.in
file.

As a result, the zfs.release file will now be created earlier as part
of the 'configure' step as opposed to the 'make install' step.

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

diff --git a/Makefile.am b/Makefile.am
index 17a6a26..1a9171d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,7 @@ 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
-
-noinst_HEADERS = zfs_config.h
+noinst_HEADERS = zfs_config.h zfs.release
 
 distclean-local::
        -$(RM) -R autom4te*.cache
@@ -35,7 +34,6 @@ if CONFIG_KERNEL
 install-data-local:
        release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
        instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
-       echo "$$release" >$$instdest/zfs.release; \
        for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
                $(INSTALL) -D $$instfile $$instdest/$$instfile; \
        done

diff --git a/Makefile.in b/Makefile.in
index 78d7e0e..a744208 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,11 +45,11 @@ DIST_COMMON = $(am__configure_deps) $(noinst_HEADERS) \
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(srcdir)/PKGBUILD-zfs-modules.in $(srcdir)/PKGBUILD-zfs.in \
        $(srcdir)/zfs-modules.spec.in \
-       $(srcdir)/zfs-script-config.sh.in $(srcdir)/zfs.spec.in \
-       $(srcdir)/zfs_config.h.in $(top_srcdir)/config/arch.am \
-       $(top_srcdir)/config/deb.am $(top_srcdir)/config/rpm.am \
-       $(top_srcdir)/config/tgz.am $(top_srcdir)/configure \
-       $(top_srcdir)/module/Makefile.in \
+       $(srcdir)/zfs-script-config.sh.in $(srcdir)/zfs.release.in \
+       $(srcdir)/zfs.spec.in $(srcdir)/zfs_config.h.in \
+       $(top_srcdir)/config/arch.am $(top_srcdir)/config/deb.am \
+       $(top_srcdir)/config/rpm.am $(top_srcdir)/config/tgz.am \
+       $(top_srcdir)/configure $(top_srcdir)/module/Makefile.in \
        $(top_srcdir)/module/avl/Makefile.in \
        $(top_srcdir)/module/nvpair/Makefile.in \
        $(top_srcdir)/module/unicode/Makefile.in \
@@ -129,7 +129,7 @@ CONFIG_CLEAN_FILES = module/Makefile module/avl/Makefile \
        module/nvpair/Makefile module/unicode/Makefile \
        module/zcommon/Makefile module/zfs/Makefile \
        module/zpios/Makefile zfs.spec zfs-modules.spec PKGBUILD-zfs \
-       PKGBUILD-zfs-modules zfs-script-config.sh
+       PKGBUILD-zfs-modules zfs-script-config.sh zfs.release
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -377,7 +377,7 @@ EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in \
        config/config.awk config/rpm.am config/deb.am config/tgz.am \
        META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE \
        ZFS.RELEASE
-noinst_HEADERS = zfs_config.h
+noinst_HEADERS = zfs_config.h zfs.release
 all: zfs_config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -457,6 +457,8 @@ PKGBUILD-zfs-modules: $(top_builddir)/config.status $(srcdir)/PKGBUILD-zfs-modul
        cd $(top_builddir) && $(SHELL) ./config.status $@
 zfs-script-config.sh: $(top_builddir)/config.status $(srcdir)/zfs-script-config.sh.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
+zfs.release: $(top_builddir)/config.status $(srcdir)/zfs.release.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
        -rm -f *.lo
@@ -1090,7 +1092,6 @@ distclean-local::
 @CONFIG_KERNEL_TRUE@install-data-local:
 @CONFIG_KERNEL_TRUE@   release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
 @CONFIG_KERNEL_TRUE@   instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
-@CONFIG_KERNEL_TRUE@   echo "$$release" >$$instdest/zfs.release; \
 @CONFIG_KERNEL_TRUE@   for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
 @CONFIG_KERNEL_TRUE@           $(INSTALL) -D $$instfile $$instdest/$$instfile; \
 @CONFIG_KERNEL_TRUE@   done

diff --git a/configure b/configure
index f46d147..a82acd6 100755 (executable)
--- a/configure
+++ b/configure
@@ -24435,7 +24435,7 @@ $as_echo_n "checking whether dmu tx validation is enabled... " >&6; }
 $as_echo "$enable_debug_dmu_tx" >&6; }
 
 
-ac_config_files="$ac_config_files Makefile dracut/Makefile dracut/90zfs/Makefile udev/Makefile udev/rules.d/Makefile etc/Makefile etc/init.d/Makefile etc/zfs/Makefile man/Makefile man/man5/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile lib/libshare/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile cmd/vdev_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec PKGBUILD-zfs PKGBUILD-zfs-modules zfs-script-config.sh"
+ac_config_files="$ac_config_files Makefile dracut/Makefile dracut/90zfs/Makefile udev/Makefile udev/rules.d/Makefile etc/Makefile etc/init.d/Makefile etc/zfs/Makefile man/Makefile man/man5/Makefile man/man8/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libspl/include/ia32/Makefile lib/libspl/include/ia32/sys/Makefile lib/libspl/include/rpc/Makefile lib/libspl/include/sys/Makefile lib/libspl/include/sys/sysevent/Makefile lib/libspl/include/sys/dktp/Makefile lib/libspl/include/util/Makefile lib/libavl/Makefile lib/libefi/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzfs/Makefile lib/libshare/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile cmd/mount_zfs/Makefile cmd/zpool_layout/Makefile cmd/zvol_id/Makefile cmd/zpool_id/Makefile cmd/vdev_id/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile include/Makefile include/linux/Makefile include/sys/Makefile include/sys/fs/Makefile include/sys/fm/Makefile include/sys/fm/fs/Makefile scripts/Makefile scripts/zpios-profile/Makefile scripts/zpios-test/Makefile scripts/zpool-config/Makefile scripts/zpool-layout/Makefile scripts/common.sh zfs.spec zfs-modules.spec PKGBUILD-zfs PKGBUILD-zfs-modules zfs-script-config.sh zfs.release"
 
 
 cat >confcache <<\_ACEOF
@@ -25419,6 +25419,7 @@ do
     "PKGBUILD-zfs") CONFIG_FILES="$CONFIG_FILES PKGBUILD-zfs" ;;
     "PKGBUILD-zfs-modules") CONFIG_FILES="$CONFIG_FILES PKGBUILD-zfs-modules" ;;
     "zfs-script-config.sh") CONFIG_FILES="$CONFIG_FILES zfs-script-config.sh" ;;
+    "zfs.release") CONFIG_FILES="$CONFIG_FILES zfs.release" ;;
 
   *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

diff --git a/configure.ac b/configure.ac
index d693f67..749f378 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,7 @@ AC_CONFIG_FILES([
        PKGBUILD-zfs
        PKGBUILD-zfs-modules
        zfs-script-config.sh
+       zfs.release
 ])
 
 AC_OUTPUT

diff --git a/zfs.release.in b/zfs.release.in
new file mode 100644 (file)
index 0000000..8213079
--- /dev/null
+++ b/zfs.release.in
@@ -0,0 +1 @@
+@ZFS_META_VERSION@-@ZFS_META_RELEASE@