X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=76303a230ac44c62cf3619f1dd1290dc7bacf9f8;hb=684e8c06431df0f8cb67b98330ff89ff4f69d95e;hp=a8b6a09f0c155fb8cefbe3b759f3f90a2d8fb48a;hpb=ee5fd0bb80d68ef095f831784cbb17181b2ba898;p=zfs.git diff --git a/Makefile.in b/Makefile.in index a8b6a09..76303a2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,7 +44,7 @@ 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)/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 \ @@ -135,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 zfs.release + 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)) @@ -382,7 +383,7 @@ 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 + ZFS.RELEASE dkms.postinst copy-builtin noinst_HEADERS = zfs_config.h zfs.release all: zfs_config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -465,6 +466,8 @@ zfs-script-config.sh: $(top_builddir)/config.status $(srcdir)/zfs-script-config. 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 @@ -912,13 +915,16 @@ srpm-utils: srpm: srpm-modules srpm-utils +rpm-dkms: srpm-modules +@CONFIG_KERNEL_TRUE@ $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" dkms-common + rpm-modules: srpm-modules @CONFIG_KERNEL_TRUE@ $(MAKE) $(AM_MAKEFLAGS) pkg="${PACKAGE}-modules" rpm-common rpm-utils: srpm-utils @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 \ @@ -937,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; \