X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=a74420808cccd2898406487554b03ed3f86fe566;hb=fb7eb3e3e9f8e611a34192ceb5c2d2e849ca6de8;hp=077d318eb2554693a6ef871079b9fc504e44747b;hpb=ebe7e575eae1e03b1faa545a424f008faeac589d;p=zfs.git

diff --git a/Makefile.in b/Makefile.in
index 077d318..a744208 100644
--- 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 \
@@ -86,6 +86,8 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/config/kernel-blk-rq-sectors.m4 \
 	$(top_srcdir)/config/kernel-blkdev-get-by-path.m4 \
 	$(top_srcdir)/config/kernel-check-disk-size-change.m4 \
+	$(top_srcdir)/config/kernel-create-umode-t.m4 \
+	$(top_srcdir)/config/kernel-d-make-root.m4 \
 	$(top_srcdir)/config/kernel-d-obtain-alias.m4 \
 	$(top_srcdir)/config/kernel-evict-inode.m4 \
 	$(top_srcdir)/config/kernel-fallocate.m4 \
@@ -127,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))
@@ -209,6 +211,7 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
+DEBUG_DMU_TX = @DEBUG_DMU_TX@
 DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@
 DEBUG_ZFS = @DEBUG_ZFS@
 DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@
@@ -374,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
 
@@ -454,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
@@ -964,6 +969,7 @@ rpm-common:
 		--define "require_splobj $(SPL_OBJ)" \
 		--define "require_splver $(SPL_VERSION)" \
 		--define "$(DEBUG_ZFS) 1" \
+		--define "$(DEBUG_DMU_TX) 1" \
 		--nodeps --rebuild $$rpmpkg || exit 1; \
 	cp $$rpmbuild/RPMS/*/* . || exit 1; \
 	$(RM) -R $$rpmbuild
@@ -1086,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