Skip to content

Commit fb7eb3e

Browse files
behlendorfbehlendorf
committed
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>
1 parent 7535251 commit fb7eb3e

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

‎Makefile.am‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in
1616
EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
1717
EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown
1818
EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
19-
20-
noinst_HEADERS = zfs_config.h
19+
noinst_HEADERS = zfs_config.h zfs.release
2120

2221
distclean-local::
2322
-$(RM) -R autom4te*.cache
@@ -35,7 +34,6 @@ if CONFIG_KERNEL
3534
install-data-local:
3635
release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
3736
instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
38-
echo "$$release" >$$instdest/zfs.release; \
3937
for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
4038
$(INSTALL) -D $$instfile $$instdest/$$instfile; \
4139
done

‎Makefile.in‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ DIST_COMMON = $(am__configure_deps) $(noinst_HEADERS) \
4545
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
4646
$(srcdir)/PKGBUILD-zfs-modules.in $(srcdir)/PKGBUILD-zfs.in \
4747
$(srcdir)/zfs-modules.spec.in \
48-
$(srcdir)/zfs-script-config.sh.in $(srcdir)/zfs.spec.in \
49-
$(srcdir)/zfs_config.h.in $(top_srcdir)/config/arch.am \
50-
$(top_srcdir)/config/deb.am $(top_srcdir)/config/rpm.am \
51-
$(top_srcdir)/config/tgz.am $(top_srcdir)/configure \
52-
$(top_srcdir)/module/Makefile.in \
48+
$(srcdir)/zfs-script-config.sh.in $(srcdir)/zfs.release.in \
49+
$(srcdir)/zfs.spec.in $(srcdir)/zfs_config.h.in \
50+
$(top_srcdir)/config/arch.am $(top_srcdir)/config/deb.am \
51+
$(top_srcdir)/config/rpm.am $(top_srcdir)/config/tgz.am \
52+
$(top_srcdir)/configure $(top_srcdir)/module/Makefile.in \
5353
$(top_srcdir)/module/avl/Makefile.in \
5454
$(top_srcdir)/module/nvpair/Makefile.in \
5555
$(top_srcdir)/module/unicode/Makefile.in \
@@ -129,7 +129,7 @@ CONFIG_CLEAN_FILES = module/Makefile module/avl/Makefile \
129129
module/nvpair/Makefile module/unicode/Makefile \
130130
module/zcommon/Makefile module/zfs/Makefile \
131131
module/zpios/Makefile zfs.spec zfs-modules.spec PKGBUILD-zfs \
132-
PKGBUILD-zfs-modules zfs-script-config.sh
132+
PKGBUILD-zfs-modules zfs-script-config.sh zfs.release
133133
CONFIG_CLEAN_VPATH_FILES =
134134
AM_V_GEN = $(am__v_GEN_$(V))
135135
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -377,7 +377,7 @@ EXTRA_DIST = autogen.sh zfs.spec.in zfs-modules.spec.in \
377377
config/config.awk config/rpm.am config/deb.am config/tgz.am \
378378
META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE \
379379
ZFS.RELEASE
380-
noinst_HEADERS = zfs_config.h
380+
noinst_HEADERS = zfs_config.h zfs.release
381381
all: zfs_config.h
382382
$(MAKE) $(AM_MAKEFLAGS) all-recursive
383383

@@ -457,6 +457,8 @@ PKGBUILD-zfs-modules: $(top_builddir)/config.status $(srcdir)/PKGBUILD-zfs-modul
457457
cd $(top_builddir) && $(SHELL) ./config.status $@
458458
zfs-script-config.sh: $(top_builddir)/config.status $(srcdir)/zfs-script-config.sh.in
459459
cd $(top_builddir) && $(SHELL) ./config.status $@
460+
zfs.release: $(top_builddir)/config.status $(srcdir)/zfs.release.in
461+
cd $(top_builddir) && $(SHELL) ./config.status $@
460462

461463
mostlyclean-libtool:
462464
-rm -f *.lo
@@ -1090,7 +1092,6 @@ distclean-local::
10901092
@CONFIG_KERNEL_TRUE@install-data-local:
10911093
@CONFIG_KERNEL_TRUE@ release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
10921094
@CONFIG_KERNEL_TRUE@ instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
1093-
@CONFIG_KERNEL_TRUE@ echo "$$release" >$$instdest/zfs.release; \
10941095
@CONFIG_KERNEL_TRUE@ for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
10951096
@CONFIG_KERNEL_TRUE@ $(INSTALL) -D $$instfile $$instdest/$$instfile; \
10961097
@CONFIG_KERNEL_TRUE@ done

‎configure‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24435,7 +24435,7 @@ $as_echo_n "checking whether dmu tx validation is enabled... " >&6; }
2443524435
$as_echo "$enable_debug_dmu_tx" >&6; }
2443624436

2443724437

24438-
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"
24438+
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"
2443924439

2444024440

2444124441
cat >confcache <<\_ACEOF
@@ -25419,6 +25419,7 @@ do
2541925419
"PKGBUILD-zfs") CONFIG_FILES="$CONFIG_FILES PKGBUILD-zfs" ;;
2542025420
"PKGBUILD-zfs-modules") CONFIG_FILES="$CONFIG_FILES PKGBUILD-zfs-modules" ;;
2542125421
"zfs-script-config.sh") CONFIG_FILES="$CONFIG_FILES zfs-script-config.sh" ;;
25422+
"zfs.release") CONFIG_FILES="$CONFIG_FILES zfs.release" ;;
2542225423

2542325424
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
2542425425
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

‎configure.ac‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ AC_CONFIG_FILES([
123123
PKGBUILD-zfs
124124
PKGBUILD-zfs-modules
125125
zfs-script-config.sh
126+
zfs.release
126127
])
127128

128129
AC_OUTPUT

‎zfs.release.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@ZFS_META_VERSION@-@ZFS_META_RELEASE@

0 commit comments

Comments
 (0)