X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=19992b01ba0ea9c4b79838f0a823ce5007a2c594;hb=26e08952e6ad113b91ae7d31263b6a4fd3a5a09f;hp=bb9bc1d9966aea2edf49b31175157de02426a17c;hpb=4b787d75c869a7f633607ecb17f3a7c482a553d2;p=zfs.git diff --git a/Makefile.in b/Makefile.in index bb9bc1d..19992b0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,12 +44,12 @@ target_triplet = @target@ 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)/dkms.conf.in $(srcdir)/zfs-modules.spec.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 \ @@ -62,6 +62,7 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = \ $(top_srcdir)/config/always-no-unused-but-set-variable.m4 \ + $(top_srcdir)/config/kernel-automount.m4 \ $(top_srcdir)/config/kernel-bdev-block-device-operations.m4 \ $(top_srcdir)/config/kernel-bdev-logical-size.m4 \ $(top_srcdir)/config/kernel-bdi-setup-and-register.m4 \ @@ -84,13 +85,20 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel-blk-rq-pos.m4 \ $(top_srcdir)/config/kernel-blk-rq-sectors.m4 \ $(top_srcdir)/config/kernel-blkdev-get-by-path.m4 \ + $(top_srcdir)/config/kernel-blkdev-get.m4 \ $(top_srcdir)/config/kernel-check-disk-size-change.m4 \ + $(top_srcdir)/config/kernel-clear-inode.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-discard-granularity.m4 \ + $(top_srcdir)/config/kernel-encode-fh-inode.m4 \ $(top_srcdir)/config/kernel-evict-inode.m4 \ $(top_srcdir)/config/kernel-fallocate.m4 \ $(top_srcdir)/config/kernel-fmode-t.m4 \ $(top_srcdir)/config/kernel-fsync.m4 \ $(top_srcdir)/config/kernel-get-disk-ro.m4 \ + $(top_srcdir)/config/kernel-get-gendisk.m4 \ $(top_srcdir)/config/kernel-insert-inode-locked.m4 \ $(top_srcdir)/config/kernel-invalidate-bdev-args.m4 \ $(top_srcdir)/config/kernel-kobj-name-len.m4 \ @@ -102,6 +110,7 @@ am__aclocal_m4_deps = \ $(top_srcdir)/config/kernel-set-nlink.m4 \ $(top_srcdir)/config/kernel-show-options.m4 \ $(top_srcdir)/config/kernel-shrink.m4 \ + $(top_srcdir)/config/kernel-truncate-range.m4 \ $(top_srcdir)/config/kernel-truncate-setsize.m4 \ $(top_srcdir)/config/kernel-xattr-handler.m4 \ $(top_srcdir)/config/kernel.m4 \ @@ -126,7 +135,8 @@ 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 \ + dkms.conf CONFIG_CLEAN_VPATH_FILES = AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) @@ -208,6 +218,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@ @@ -372,8 +383,8 @@ AUTOMAKE_OPTIONS = foreign 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 + ZFS.RELEASE dkms.postinst +noinst_HEADERS = zfs_config.h zfs.release all: zfs_config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -453,6 +464,10 @@ 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 $@ +dkms.conf: $(top_builddir)/config.status $(srcdir)/dkms.conf.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -893,22 +908,23 @@ uninstall-am: tags tags-recursive uninstall uninstall-am srpm-modules: - $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" srpm-common +@CONFIG_KERNEL_TRUE@ $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" srpm-common srpm-utils: - $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" srpm-common +@CONFIG_USER_TRUE@ $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" srpm-common srpm: srpm-modules srpm-utils +rpm-dkms: srpm-modules +@CONFIG_KERNEL_TRUE@ $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" dkms-common + rpm-modules: srpm-modules - $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" rpm-common +@CONFIG_KERNEL_TRUE@ $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" rpm-common rpm-utils: srpm-utils - $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" rpm-common - -rpm-modules: srpm-modules +@CONFIG_USER_TRUE@ $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" rpm-common -rpm: rpm-modules rpm-utils +rpm: rpm-modules rpm-utils rpm-dkms rpm-local: @(if test "${HAVE_RPMBUILD}" = "no"; then \ @@ -927,6 +943,26 @@ rpm-local: mkdir -p $(rpmbuild)/SOURCES && \ cp $(distdir).tar.gz $(rpmbuild)/SOURCES) +dkms-common: + rpmpkg=$(pkg)-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE).src.rpm; \ + rpmspec=$(pkg).spec; \ + rpmdkms=$(pkg)-dkms-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE).noarch.rpm;\ + rpmbuild=`mktemp -t -d $(PACKAGE)-build-$$USER-XXXXXXXX`; \ + $(MAKE) $(AM_MAKEFLAGS) \ + rpmbuild="$$rpmbuild" \ + rpmspec="$$rpmspec" \ + rpm-local || exit 1; \ + $(RPMBUILD) \ + --define "_tmppath $$rpmbuild/TMP" \ + --define "_topdir $$rpmbuild" \ + --define "dist %{nil}" \ + --define "_without_kernel 1" \ + --define "_without_kernel_debug 1" \ + --define "_with_kernel_dkms 1" \ + --nodeps --rebuild $$rpmpkg || exit 1; \ + cp $$rpmbuild/RPMS/noarch/$$rpmdkms . || exit 1; \ + $(RM) -R $$rpmbuild + srpm-common: dist rpmpkg=$(pkg)-$(ZFS_META_VERSION)-$(ZFS_META_RELEASE).src.rpm; \ rpmspec=$(pkg).spec; \ @@ -963,6 +999,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 @@ -983,25 +1020,25 @@ deb-local: fi) deb-modules: deb-local rpm-modules - name=${PACKAGE}-modules; \ - version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \ - release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \ - arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ - pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \ - pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \ - fakeroot $(ALIEN) --scripts --to-deb $$pkg1 $$pkg2; \ - $(RM) $$pkg1 $$pkg2 +@CONFIG_KERNEL_TRUE@ name=${PACKAGE}-modules; \ +@CONFIG_KERNEL_TRUE@ version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \ +@CONFIG_KERNEL_TRUE@ release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \ +@CONFIG_KERNEL_TRUE@ arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ +@CONFIG_KERNEL_TRUE@ pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \ +@CONFIG_KERNEL_TRUE@ pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \ +@CONFIG_KERNEL_TRUE@ fakeroot $(ALIEN) --scripts --to-deb $$pkg1 $$pkg2; \ +@CONFIG_KERNEL_TRUE@ $(RM) $$pkg1 $$pkg2 deb-utils: deb-local rpm-utils - name=${PACKAGE}; \ - version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \ - arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ - pkg1=$${name}-$${version}.$${arch}.rpm; \ - pkg2=$${name}-devel-$${version}.$${arch}.rpm; \ - pkg3=$${name}-test-$${version}.$${arch}.rpm; \ - pkg4=$${name}-dracut-$${version}.$${arch}.rpm; \ - fakeroot $(ALIEN) --scripts --to-deb $$pkg1 $$pkg2 $$pkg3 $$pkg4; \ - $(RM) $$pkg1 $$pkg2 $$pkg3 $$pkg4 +@CONFIG_USER_TRUE@ name=${PACKAGE}; \ +@CONFIG_USER_TRUE@ version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \ +@CONFIG_USER_TRUE@ arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ +@CONFIG_USER_TRUE@ pkg1=$${name}-$${version}.$${arch}.rpm; \ +@CONFIG_USER_TRUE@ pkg2=$${name}-devel-$${version}.$${arch}.rpm; \ +@CONFIG_USER_TRUE@ pkg3=$${name}-test-$${version}.$${arch}.rpm; \ +@CONFIG_USER_TRUE@ pkg4=$${name}-dracut-$${version}.$${arch}.rpm; \ +@CONFIG_USER_TRUE@ fakeroot $(ALIEN) --scripts --to-deb $$pkg1 $$pkg2 $$pkg3 $$pkg4; \ +@CONFIG_USER_TRUE@ $(RM) $$pkg1 $$pkg2 $$pkg3 $$pkg4 deb: deb-modules deb-utils tgz-local: @@ -1014,24 +1051,24 @@ tgz-local: fi) tgz-modules: tgz-local rpm-modules - name=${PACKAGE}-modules; \ - version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \ - release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \ - arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ - pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \ - pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \ - fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2; \ - $(RM) $$pkg1 $$pkg2 +@CONFIG_KERNEL_TRUE@ name=${PACKAGE}-modules; \ +@CONFIG_KERNEL_TRUE@ version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \ +@CONFIG_KERNEL_TRUE@ release=`echo ${LINUX_VERSION} | $(SED) -e "s/-/_/g"`; \ +@CONFIG_KERNEL_TRUE@ arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ +@CONFIG_KERNEL_TRUE@ pkg1=$${name}-$${version}_$${release}.$${arch}.rpm; \ +@CONFIG_KERNEL_TRUE@ pkg2=$${name}-devel-$${version}_$${release}.$${arch}.rpm; \ +@CONFIG_KERNEL_TRUE@ fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2; \ +@CONFIG_KERNEL_TRUE@ $(RM) $$pkg1 $$pkg2 tgz-utils: tgz-local rpm-utils - name=${PACKAGE}; \ - version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \ - arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ - pkg1=$${name}-$${version}.$${arch}.rpm; \ - pkg2=$${name}-devel-$${version}.$${arch}.rpm; \ - pkg3=$${name}-test-$${version}.$${arch}.rpm; \ - fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2 $$pkg3; \ - $(RM) $$pkg1 $$pkg2 $$pkg3 +@CONFIG_USER_TRUE@ name=${PACKAGE}; \ +@CONFIG_USER_TRUE@ version=${ZFS_META_VERSION}-${ZFS_META_RELEASE}; \ +@CONFIG_USER_TRUE@ arch=`$(RPM) -qp $${name}-$${version}.src.rpm --qf %{arch} | tail -1`; \ +@CONFIG_USER_TRUE@ pkg1=$${name}-$${version}.$${arch}.rpm; \ +@CONFIG_USER_TRUE@ pkg2=$${name}-devel-$${version}.$${arch}.rpm; \ +@CONFIG_USER_TRUE@ pkg3=$${name}-test-$${version}.$${arch}.rpm; \ +@CONFIG_USER_TRUE@ fakeroot $(ALIEN) --scripts --to-tgz $$pkg1 $$pkg2 $$pkg3; \ +@CONFIG_USER_TRUE@ $(RM) $$pkg1 $$pkg2 $$pkg3 tgz: tgz-modules tgz-utils @@ -1044,10 +1081,10 @@ sarch-utils: sarch: sarch-modules sarch-utils arch-modules: - $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" arch-common +@CONFIG_KERNEL_TRUE@ $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" arch-common arch-utils: - $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" arch-common +@CONFIG_USER_TRUE@ $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}" arch-common arch: arch-modules arch-utils @@ -1085,7 +1122,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