X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=4cddecbb69144d24b4bd9c61cee4ab1f433b521d;hp=96d3b397900678e88d947e35190de0adce42bec6;hb=1eeb1455c2770edc92b2d127d5a2a22efe213773;hpb=666c7580c8a6585479c5eecc316060a19142149d diff --git a/autoMakefile.am b/autoMakefile.am index 96d3b39..4cddecb 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -1,5 +1,18 @@ -SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre -DIST_SUBDIRS := ldiskfs @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre config contrib +SUBDIRS := @LDISKFS_SUBDIR@ \ + . \ + @LUSTREIOKIT_SUBDIR@ \ + @LIBCFS_SUBDIR@ \ + @SNMP_SUBDIR@ \ + lnet \ + lustre + +DIST_SUBDIRS := ldiskfs \ + lustre-iokit \ + @LIBCFS_SUBDIR@ \ + @SNMP_DIST_SUBDIR@ \ + lnet \ + lustre \ + config AUTOMAKE_OPTIONS = foreign @@ -48,71 +61,209 @@ 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 -I$$(srctree)/arch/$$(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)' \ + 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 endif # MODULES -dist-hook: +all: undef.h + +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 .#* | xargs rm -rf - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - module-dist-hook + -name .#* -exec rm -rf {} \; 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 \ + 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) + +if SERVER +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)" \ + --with servers --with zfs -without ldiskfs \ + --bs $(PACKAGE)-dkms.spec || exit 1; \ + $(RPMBUILD) \ + --define "_tmppath $$rpmbuilddir/TMP" \ + --define "_topdir $$rpmbuilddir" \ + --define "_sourcedir $(top_srcdir)" \ + --with servers --without zfs --with ldiskfs \ + --bs $(PACKAGE)-dkms.spec || exit 1; \ + $(RPMBUILD) \ + --define "_tmppath $$rpmbuilddir/TMP" \ + --define "_topdir $$rpmbuilddir" \ + --define "_sourcedir $(top_srcdir)" \ + --with servers --with zfs --with ldiskfs \ + --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@ \ + --with servers --with zfs --without ldiskfs \ + --rebuild $(PACKAGE)-zfs-dkms-*.src.rpm || exit 1; \ + $(RPMBUILD) \ + --define "_tmppath $$rpmbuilddir/TMP" \ + --define "_topdir $$rpmbuilddir" \ + @RPMBUILD_BINARY_ARGS@ \ + --with servers --without zfs --with ldiskfs \ + --rebuild $(PACKAGE)-ldiskfs-dkms-*.src.rpm || exit 1; \ + $(RPMBUILD) \ + --define "_tmppath $$rpmbuilddir/TMP" \ + --define "_topdir $$rpmbuilddir" \ + @RPMBUILD_BINARY_ARGS@ \ + --with servers --with zfs --with ldiskfs \ + --rebuild $(PACKAGE)-all-dkms-*.src.rpm || exit 1; \ + cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \ + rm -rf $$rpmbuilddir +else + +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)" \ + --without servers \ + --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@ \ + --without servers \ + --rebuild $(PACKAGE)-client-dkms-*.src.rpm || exit 1; \ + cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \ + rm -rf $$rpmbuilddir + +endif -rpms: @PACKAGE_TARNAME@.spec dist Makefile - rpmbuild @RPMBUILD_BINARY_ARGS@ -ta $(distdir).tar.gz +dkms-srpms: dkms-srpm + +dkms-rpms: dkms-rpm + +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 - rpmbuild @RPMBUILD_SOURCE_ARGS@ -ts $(distdir).tar.gz + 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 "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 || { \ + rm -rf debs; \ + if test "x@ENABLE_SERVER@" = "xyes"; then \ + DEB_BUILD_PROFILES="server"; \ + else \ + DEB_BUILD_PROFILES="client"; \ + fi; \ + if test "x@ENABLE_LDISKFS@" = "xyes"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} ldiskfs"; \ + fi; \ + if test "x@ENABLE_ZFS@" = "xyes"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} zfs"; \ + export SPL_SRC="@SPL@"; \ + export ZFS_SRC="@ZFS@"; \ + echo "ZFS support is enabled. Will expect pre-compiled SPL and ZFS sources in:"; \ + echo "SPL: $${SPL_SRC}"; \ + echo "ZFS: $${ZFS_SRC}"; \ + fi; \ + export KERNEL_CFG="$(LINUX_CONFIG)"; \ + export KERNEL_SRC="$(LINUX)"; \ + echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \ + echo "Kernel Source: $${KERNEL_SRC}"; \ + echo "Kernel Config: $${KERNEL_CFG}"; \ + dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \ rc=$${PIPESTATUS[0]}; \ [ $${rc} -gt 1 ] && exit $${rc}; \ exit 0; \ - } + }; \ export KPKG_DEST_DIR="$$(pwd)/.." && \ version=$$(sed -ne '1s/^lustre (\(.*\)).*$$/\1/p' debian/changelog) && \ rm -rf debian/tmp/modules-deb && \ @@ -127,44 +278,62 @@ 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)} && \ + if test "x@ENABLEO2IB@" = "xno"; then \ + export IB_OPTIONS="--with-o2ib=no"; \ + else \ + if test "x@ENABLEO2IB@" != "xyes" && \ + test -n "@O2IBPATH@"; then \ + export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \ + else \ + export IB_OPTIONS="--with-o2ib=yes"; \ + fi; \ + fi; \ + 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) && \ + if test "x@ENABLE_SERVER@" = "xyes"; then \ + DEB_SERVER_PKG="../lustre-resource-agents_$${VER}_*.deb"; \ + fi; \ 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/ - -EXTRA_DIST += config.h.in + mv ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb \ + ../lustre-iokit_$${VER}_*.deb ../lustre-tests_$${VER}_*.deb \ + ../lustre-*-utils_$${VER}_*.deb $${DEB_SERVER_PKG} \ + ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes \ + ../lustre_$${VER}.tar.gz ../lustre-*-modules-$${KVERS}_$${VER}_*.deb \ + debs/ + +dkms-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; \ + export DEB_BUILD_PROFILES="client"; \ + export KERNEL_CFG="$(LINUX_CONFIG)"; \ + export KERNEL_SRC="$(LINUX)"; \ + echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \ + echo "Kernel Source: $${KERNEL_SRC}"; \ + echo "Kernel Config: $${KERNEL_CFG}"; \ + export BUILD_DKMS="true" && \ + dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \ + rc=$${PIPESTATUS[0]}; \ + [ $${rc} -gt 1 ] && exit $${rc}; \ + exit 0; \ + }; \ + VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog) && \ + mkdir -p debs && \ + mv ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb \ + ../lustre-iokit_$${VER}_*.deb ../lustre-tests_$${VER}_*.deb \ + ../lustre-*-utils_$${VER}_*.deb \ + ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes \ + ../lustre_$${VER}.tar.gz ../lustre-*-modules-dkms_$${VER}_*.deb \ + debs/ -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 @@ -174,20 +343,10 @@ checkstack: { for MOD in $$(find . -name "*.ko"); do \ 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} 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 "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \ - exit 1; \ - fi