X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=78f31ac61ae418efe3b0fecb91bed1c970258805;hp=77d98895c271f562138f886fb7bd450f8ba59ccf;hb=4c25ec609bc2ecc31d014689c2498c4df60dddd2;hpb=55f0949551ecc7707cf2330673ed3d951d13c3ad diff --git a/autoMakefile.am b/autoMakefile.am index 77d9889..78f31ac 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -1,31 +1,25 @@ -SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre -DIST_SUBDIRS := @LDISKFS_DIST_SUBDIR@ @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre -SOURCES_SUBDIRS := @LIBCFS_SUBDIR@ lnet lustre -RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@ -MODULE_SYMVERS_DEPS = module-symvers - -@TESTS_TRUE@BUILD_TESTS = true -@TESTS_FALSE@BUILD_TESTS = false -@SERVER_TRUE@BUILD_SERVER = true -@SERVER_FALSE@BUILD_SERVER = false -@CLIENT_TRUE@BUILD_CLIENT = true -@CLIENT_FALSE@BUILD_CLIENT = false +SUBDIRS := @LDISKFS_SUBDIR@ \ + . \ + @SNMP_SUBDIR@ \ + @LUSTREIOKIT_SUBDIR@ \ + @LIBCFS_SUBDIR@ \ + lnet \ + lustre + +DIST_SUBDIRS := ldiskfs \ + @SNMP_DIST_SUBDIR@ \ + lustre-iokit \ + @LIBCFS_SUBDIR@ \ + lnet \ + lustre \ + config contrib AUTOMAKE_OPTIONS = foreign FIND_TAG_FILES_CMD = find $(top_srcdir) \ - -path $(top_srcdir)/ldiskfs/ldiskfs/linux-stage \ + -path $(top_srcdir)/ldiskfs/linux-stage \ -prune -false -o -type f -name '*.[hc]' -MAKEEACHSUBDIR = \ - for subdir in $(RPM_SUBDIRS) ; do \ - echo "Making $@ in $$subdir" ; \ - cd $$subdir ; \ - $(MAKE) $(AM_MAKEFLAGS) $@ ; \ - cd - ; \ - echo "Finished $@ in $$subdir" ; \ - done - # these empty rules are needed so that automake doesn't add its own # recursive rules etags-recursive: @@ -64,23 +58,26 @@ mkid: doxygen: doxygen-api doxygen-ref doxygen-%: build/doxyfile.% - doxygen $< + doxygen $< if MODULES -sources: all-sources +.PHONY: ldiskfs-sources lustre-sources + +ldiskfs-sources: +if LDISKFS_ENABLED + $(MAKE) sources -C @LDISKFS_SUBDIR@ || exit $$? +endif -all-sources: $(MODULE_SYMVERS_DEPS) - for dir in $(SOURCES_SUBDIRS) ; do \ - $(MAKE) sources -C $$dir || exit $$? ; \ - done +lustre-sources: + $(MAKE) sources -C lustre || exit $$? if LINUX all-am: modules -modules: $(DEP) all-sources - $(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ) \ +modules: ldiskfs-sources lustre-sources module-symvers + $(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ) \ -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \ - LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include $(CONFIG_INCLUDE)' \ + 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 \ include/config/MARKER $@ endif # LINUX @@ -88,66 +85,59 @@ endif # LINUX endif # MODULES dist-hook: - $(RM) $(distdir)/ldiskfs/*.spec - $(RM) $(distdir)/lustre-iokit/*.spec find $(distdir) -name .deps -o \ -name CVS -o \ -name .svn -o \ -name .git -o \ - -name .#* | xargs rm -rf + -name .#* -exec rm -rf {} \; $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - module-dist-hook - -EXTRA_DIST = @PACKAGE_TARNAME@.spec \ - build/Makefile build/lbuild* \ - build/Rules.in \ - build/update_oldconfig \ - build/autoconf/lustre-build-linux.m4 \ - build/autoconf/lustre-build-darwin.m4 \ - build/autoconf/lustre-build-ldiskfs.m4 \ - build/autoconf/lustre-build.m4 build/rdac_spec \ - build/mptlinux.spec.patch build/patches \ - build/funcs.sh build/find_linux_rpms build/exit_traps.sh - -rpms-real: @PACKAGE_TARNAME@.spec dist Makefile - CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | \ - sed -re 's/--(en|dis)able-tests//'); \ - if [ -n "@LINUX@" ]; then \ - CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | \ - sed -re 's/--with-linux=[^ ][^ ]*//'); \ - RPMARGS="--define \"kdir @LINUX@\""; \ - CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | \ - sed -re 's/--with-linux-obj=[^ ][^ ]*//'); \ - if [ -n "@LINUX_OBJ@" -a "@LINUX_OBJ@" != "@LINUX@" ]; then \ - RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \ - fi; \ - fi; \ - CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | \ - sed -re 's/--with-release=[^ ][^ ]*//'); \ - RPMARGS="$$RPMARGS --define \"configure_args $$CONFIGURE_ARGS\""; \ - if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \ - RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \ - fi; \ - if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \ - RPMARGS="$$RPMARGS --define \"lustre_name lustre-client\""; \ - fi; \ - echo "Building Lustre RPM with $$RPMARGS"; \ - eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz - -srpm-real: @PACKAGE_TARNAME@.spec dist Makefile - if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \ - RPMARGS="--define \"build_lustre_tests 0\""; \ - fi; \ - eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + module-dist-hook -rpms: - @$(MAKEEACHSUBDIR) - $(MAKE) $(AM_MAKEFLAGS) rpms-real +EXTRA_DIST = @PACKAGE_TARNAME@.spec \ + build/Makefile \ + build/Rules.in \ + build/gen_filelist.sh -srpm: - @$(MAKEEACHSUBDIR) - $(MAKE) $(AM_MAKEFLAGS) srpm-real +rpm-local: + @(if test -z "$(RPMBUILD)"; then \ + echo -e "\n" \ + "*** Required util 'rpmbuild' missing. Please install the\n" \ + "*** package for your distribution which provides 'rpmbuild',\n" \ + "*** re-run configure, and try again.\n"; \ + exit 1; \ + fi; \ + $(MKDIR_P) $(rpmbuilddir)/TMP && \ + $(MKDIR_P) $(rpmbuilddir)/BUILD && \ + $(MKDIR_P) $(rpmbuilddir)/RPMS && \ + $(MKDIR_P) $(rpmbuilddir)/SRPMS && \ + $(MKDIR_P) $(rpmbuilddir)/SPECS && \ + $(MKDIR_P) $(rpmbuilddir)/SOURCES) + +rpms: srpm + 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" \ + @RPMBUILD_BINARY_ARGS@ \ + --rebuild $(distdir)-*.src.rpm || exit 1; \ + cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \ + rm -rf $$rpmbuilddir + +srpm: @PACKAGE_TARNAME@.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 "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 @@ -184,12 +174,20 @@ debs: ln -s /usr/share/modass/packages/ usr_share_modass/ && \ echo "lustre" > usr_share_modass/compliant.list && \ export MA_DIR=$$(pwd)/usr_share_modass && \ - KVERS=$${KVERS:-$(LINUXRELEASE)}; \ - m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \ + KVERS=$${KVERS:-$(LINUXRELEASE)} && \ + [ "x@ENABLEO2IB@" != "x" ] && \ + export IB_OPTIONS="--with-o2ib=@O2IBPATHS@" && \ + export KSRC_TREE=$(LINUX) && \ + KSRC=$${KSRC:-$(LINUX_OBJ)} && \ + m-a build $${KSRC:+-k $$KSRC} $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \ popd && \ - VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog); \ + VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog) && \ mkdir -p debs && \ - mv ../liblustre_$${VER}_*.deb ../linux-patch-lustre_$${VER}_all.deb ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb ../lustre-tests_$${VER}_*.deb ../lustre-utils_$${VER}_*.deb ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes ../lustre_$${VER%-[0-9]*}.orig.tar.gz ../lustre_$${VER}.diff.gz ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/ + mv ../linux-patch-lustre_$${VER}_all.deb ../lustre-dev_$${VER}_*.deb \ + ../lustre-source_$${VER}_all.deb ../lustre-tests_$${VER}_*.deb \ + ../lustre-utils_$${VER}_*.deb ../lustre_$${VER}.dsc \ + ../lustre_$${VER}_*.changes ../lustre_$${VER}.tar.gz \ + ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/ EXTRA_DIST += config.h.in @@ -197,20 +195,6 @@ if USES_DPKG EXTRA_DIST += debian/* endif -module-symvers-ldiskfs: -if LDISKFS_ENABLED - @if [ -f @LDISKFS_DIR@/@SYMVERFILE@ ]; then \ - cat @LDISKFS_DIR@/@SYMVERFILE@ >>@SYMVERFILE@; \ - elif [ -f @LDISKFS_DIR@/ldiskfs/@SYMVERFILE@ ]; then \ - cat @LDISKFS_DIR@/ldiskfs/@SYMVERFILE@ >>@SYMVERFILE@; \ - else \ - echo -e "\n" \ - "*** Missing ldiskfs symbols. Ensure you have built ldiskfs:\n"\ - "*** - @LDISKFS_OBJ@/ldiskfs/@SYMVERFILE@\n"; \ - exit 1; \ - fi -endif # LDISKFS_ENABLED - module-symvers-zfs: if ZFS_ENABLED @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \ @@ -235,7 +219,7 @@ if ZFS_ENABLED fi endif # ZFS_ENABLED -module-symvers: module-symvers-ldiskfs module-symvers-zfs +module-symvers: module-symvers-zfs CSTK=/tmp/checkstack CSTKO=/tmp/checkstack.orig @@ -243,9 +227,9 @@ CSTKO=/tmp/checkstack.orig checkstack: [ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true { for MOD in $$(find . -name "*.ko"); do \ - objdump -d $$MOD | perl build/checkstack.pl; \ + objdump -d $$MOD | perl contrib/scripts/checkstack.pl; \ done } | grep -v " bug " | sort -nr | uniq > ${CSTK} - [ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK} + [ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -n 30 ${CSTK} checkstack-update: [ -f ${CSTK} ] && mv -f ${CSTK} ${CSTKO} @@ -254,16 +238,14 @@ checkstack-clean: rm -f ${CSTK} ${CSTKO} module-dist-hook: - if [ -d CVS -o -d .git ]; then \ - perl lustre/scripts/make_META.pl > $(distdir)/META; \ + @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 "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \ + 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 -if LDISKFS_ENABLED - if [ -f $(distdir)/META -a -d $(distdir)/ldiskfs ]; then \ - cp $(distdir)/META $(distdir)/ldiskfs/META; \ - fi -endif