X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=0054f7272e0c77469ab9a1504d1dad785a9f81f5;hp=78f31ac61ae418efe3b0fecb91bed1c970258805;hb=c14e6d47b216e6dab4b8c6ed4f491e700ce19367;hpb=a71ab04971382c77f708d6a082e8ee2fa845e9be diff --git a/autoMakefile.am b/autoMakefile.am index 78f31ac..0054f72 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -1,18 +1,18 @@ SUBDIRS := @LDISKFS_SUBDIR@ \ . \ - @SNMP_SUBDIR@ \ @LUSTREIOKIT_SUBDIR@ \ @LIBCFS_SUBDIR@ \ + @SNMP_SUBDIR@ \ lnet \ lustre DIST_SUBDIRS := ldiskfs \ - @SNMP_DIST_SUBDIR@ \ lustre-iokit \ @LIBCFS_SUBDIR@ \ + @SNMP_DIST_SUBDIR@ \ lnet \ lustre \ - config contrib + config AUTOMAKE_OPTIONS = foreign @@ -61,21 +61,18 @@ doxygen-%: build/doxyfile.% doxygen $< if MODULES -.PHONY: ldiskfs-sources lustre-sources +.PHONY: ldiskfs-sources ldiskfs-sources: if LDISKFS_ENABLED $(MAKE) sources -C @LDISKFS_SUBDIR@ || exit $$? endif -lustre-sources: - $(MAKE) sources -C lustre || exit $$? - if LINUX all-am: modules -modules: ldiskfs-sources lustre-sources module-symvers - $(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ) \ +modules: undef.h ldiskfs-sources + $(MAKE) LDFLAGS= CC="$(CC)" -C $(LINUX_OBJ) \ -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \ LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \ $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \ @@ -84,20 +81,31 @@ endif # LINUX endif # MODULES -dist-hook: +undef.h: config.h.in + grep -v config.h.in config.h.in > $@ + +dist-hook: undef.h find $(distdir) -name .deps -o \ -name CVS -o \ -name .svn -o \ -name .git -o \ -name .#* -exec rm -rf {} \; - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - module-dist-hook EXTRA_DIST = @PACKAGE_TARNAME@.spec \ build/Makefile \ build/Rules.in \ - build/gen_filelist.sh + config.h.in \ + lustre-dkms_pre-build.sh \ + lustre-dkms_post-build.sh \ + LUSTRE-VERSION-GEN \ + LUSTRE-VERSION-FILE \ + undef.h + +# contrib is a directory. Putting a directory in EXTRA_DIST +# recursively includes the entire directory contents in the +# distribution tarball (the tarball created with "make dist"). +EXTRA_DIST += contrib +EXTRA_DIST += rpm rpm-local: @(if test -z "$(RPMBUILD)"; then \ @@ -114,6 +122,39 @@ rpm-local: $(MKDIR_P) $(rpmbuilddir)/SPECS && \ $(MKDIR_P) $(rpmbuilddir)/SOURCES) +if SERVER +DKMS_PACKAGE=$(PACKAGE) +DKMS_SERVER=--with servers +else +DKMS_PACKAGE=$(PACKAGE)-client +DKMS_SERVER=--without servers +endif + +# Only zfs Lustre DKMS Server is supported, so previous configure command +# must use related parameters for success. +dkms-srpm: $(PACKAGE)-dkms.spec dist Makefile + rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \ + $(MAKE) $(AM_MAKEFLAGS) \ + rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \ + $(RPMBUILD) \ + --define "_tmppath $$rpmbuilddir/TMP" \ + --define "_topdir $$rpmbuilddir" \ + --define "_sourcedir $(top_srcdir)" \ + $(DKMS_SERVER) \ + --bs $(PACKAGE)-dkms.spec || exit 1; \ + cp $$rpmbuilddir/SRPMS/*.src.rpm $(top_srcdir) || exit 1; \ + rm -rf $$rpmbuilddir + +dkms-rpm: dkms-srpm + rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \ + $(RPMBUILD) \ + --define "_tmppath $$rpmbuilddir/TMP" \ + --define "_topdir $$rpmbuilddir" \ + @RPMBUILD_BINARY_ARGS@ \ + --rebuild $(DKMS_PACKAGE)-dkms-*.src.rpm || exit 1; \ + cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \ + rm -rf $$rpmbuilddir + rpms: srpm rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \ $(MAKE) $(AM_MAKEFLAGS) \ @@ -130,32 +171,25 @@ srpm: @PACKAGE_TARNAME@.spec dist Makefile rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \ $(MAKE) $(AM_MAKEFLAGS) \ rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \ + cp $(top_srcdir)/rpm/* $(top_srcdir); \ $(RPMBUILD) \ --define "_tmppath $$rpmbuilddir/TMP" \ --define "_topdir $$rpmbuilddir" \ - --define "build_src_rpm 1" \ --define "dist %{nil}" \ -ts $(distdir).tar.gz || exit 1; \ cp $$rpmbuilddir/SRPMS/$(distdir)-*.src.rpm $(top_srcdir) || exit 1; \ rm -rf $$rpmbuilddir # In the debs target, first make sure what's in the changelog reflects -# the software version. Here's how we could dig the version out of the -# autoconf version file directly: -# lversion=$$(sed -ne 's/m4_define(\[LUSTRE_[A-Z][A-Z]*\],\[\([0-9][0-9]*\)\])$$/\1/p' -# lustre/autoconf/lustre-version.ac | tr '\n' '.' | sed -e 's/.$//'); -# -# However, one cannot really run "make debs" without having done a -# configure first, so we could use the easier method of digging the -# version out of the config.h file. -debs: - lversion=$$(sed -ne 's/^#define VERSION "\(.*\)"$$/\1/p' config.h); \ +# the software version. +debs: undef.h + lversion=$$(echo @VERSION@ | tr '_' '-'); \ cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \ if [ "$$lversion" != "$$cversion" ]; then \ echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n * Automated changelog entry update\n\n -- Brian J. Murrell $$(date -R)\n\n.\nwq" | ed debian/changelog; \ fi; \ rm -rf debs - dpkg-buildpackage -I.git -I\*.out[0-9]\* -I\*.swp || { \ + dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \ rc=$${PIPESTATUS[0]}; \ [ $${rc} -gt 1 ] && exit $${rc}; \ exit 0; \ @@ -175,8 +209,13 @@ debs: echo "lustre" > usr_share_modass/compliant.list && \ export MA_DIR=$$(pwd)/usr_share_modass && \ KVERS=$${KVERS:-$(LINUXRELEASE)} && \ - [ "x@ENABLEO2IB@" != "x" ] && \ - export IB_OPTIONS="--with-o2ib=@O2IBPATHS@" && \ + if test "x@ENABLEO2IB@" = "xno"; then \ + export IB_OPTIONS="--with-o2ib=no"; \ + else \ + if test -n "@O2IBPATH@"; then \ + export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \ + fi; \ + fi; \ export KSRC_TREE=$(LINUX) && \ KSRC=$${KSRC:-$(LINUX_OBJ)} && \ m-a build $${KSRC:+-k $$KSRC} $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \ @@ -189,38 +228,10 @@ debs: ../lustre_$${VER}_*.changes ../lustre_$${VER}.tar.gz \ ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/ -EXTRA_DIST += config.h.in - if USES_DPKG EXTRA_DIST += debian/* endif -module-symvers-zfs: -if ZFS_ENABLED - @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ - cat @SPL_OBJ@/@SPL_SYMBOLS@ >>@SYMVERFILE@; \ - elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \ - cat @SPL_OBJ@/module/@SPL_SYMBOLS@ >>@SYMVERFILE@; \ - else \ - echo -e "\n" \ - "*** Missing spl symbols. Ensure you have built spl:\n" \ - "*** - @SPL_OBJ@/@SYMVERFILE@\n"; \ - exit 1; \ - fi - @if [ -f @ZFS_OBJ@/@ZFS_SYMBOLS@ ]; then \ - cat @ZFS_OBJ@/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \ - elif [ -f @ZFS_OBJ@/module/@ZFS_SYMBOLS@ ]; then \ - cat @ZFS_OBJ@/module/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \ - else \ - echo -e "\n" \ - "*** Missing zfs symbols. Ensure you have built zfs:\n" \ - "*** - @ZFS_OBJ@/@SYMVERFILE@\n"; \ - exit 1; \ - fi -endif # ZFS_ENABLED - -module-symvers: module-symvers-zfs - CSTK=/tmp/checkstack CSTKO=/tmp/checkstack.orig @@ -236,16 +247,3 @@ checkstack-update: checkstack-clean: rm -f ${CSTK} ${CSTKO} - -module-dist-hook: - @if [ -d .git ]; then \ - perl lustre/scripts/version_tag.pl \ - --make_META > $(distdir)/META; \ - elif [ -f META ]; then \ - cp META $(distdir)/META; \ - else \ - echo -e "\n" \ - "*** I have no idea how to create a META file in $(distdir).\n"\ - "*** Please file a bug at https://jira.hpdd.intel.com/\n"; \ - exit 1; \ - fi