X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=064c317dea081ed3f5c17548604f7fb6d783a940;hp=1a44bf2a2b0ef72892fe9f76f40e202d46ac8520;hb=2b7af478bdbf5c6701e0e49aefe34597bdee3126;hpb=ddb28333258d23bd40b21278901841499dd4f198 diff --git a/autoMakefile.am b/autoMakefile.am index 1a44bf2..064c317 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -12,7 +12,7 @@ DIST_SUBDIRS := ldiskfs \ @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: undef.h ldiskfs-sources lustre-sources - $(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,6 +81,8 @@ endif # LINUX endif # MODULES +all: undef.h + undef.h: config.h.in grep -v config.h.in config.h.in > $@ @@ -93,17 +92,23 @@ dist-hook: undef.h -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 \ echo -e "\n" \ @@ -120,15 +125,55 @@ rpm-local: $(MKDIR_P) $(rpmbuilddir)/SOURCES) if SERVER -DKMS_PACKAGE=$(PACKAGE) -DKMS_SERVER=--with servers +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_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) \ @@ -137,7 +182,7 @@ dkms-srpm: $(PACKAGE)-dkms.spec dist Makefile --define "_tmppath $$rpmbuilddir/TMP" \ --define "_topdir $$rpmbuilddir" \ --define "_sourcedir $(top_srcdir)" \ - $(DKMS_SERVER) \ + --without servers \ --bs $(PACKAGE)-dkms.spec || exit 1; \ cp $$rpmbuilddir/SRPMS/*.src.rpm $(top_srcdir) || exit 1; \ rm -rf $$rpmbuilddir @@ -148,10 +193,17 @@ dkms-rpm: dkms-srpm --define "_tmppath $$rpmbuilddir/TMP" \ --define "_topdir $$rpmbuilddir" \ @RPMBUILD_BINARY_ARGS@ \ - --rebuild $(DKMS_PACKAGE)-dkms-*.src.rpm || exit 1; \ + --without servers \ + --rebuild $(PACKAGE)-client-dkms-*.src.rpm || exit 1; \ cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \ rm -rf $$rpmbuilddir +endif + +dkms-srpms: dkms-srpm + +dkms-rpms: dkms-rpm + rpms: srpm rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \ $(MAKE) $(AM_MAKEFLAGS) \ @@ -168,36 +220,72 @@ 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. +# the software version. debs: undef.h - lversion=$$(sed -ne 's/^#define VERSION "\(.*\)"$$/\1/p' config.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; \ + echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n * Automated changelog entry update\n\n -- Andreas Dilger $$(date -R)\n\n.\nwq" | ed debian/changelog; \ + fi; \ + 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; \ - rm -rf debs - dpkg-buildpackage -I.git -I\*.out[0-9]\* -I\*.swp || { \ + if test "x@ENABLEO2IB@" != "xno"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} o2ib"; \ + export O2IB_SRC="@O2IBPATH@"; \ + fi; \ + if test "x@ENABLE_GSS@" = "xyes"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} gss"; \ + elif test "x@ENABLE_GSS@" = "xno"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nogss"; \ + fi; \ + if test "x@systemdsystemunitdir@" != "x"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} systemd"; \ + fi; \ + export KERNEL_OBJ="$(LINUX_OBJ)"; \ + export KERNEL_SRC="$(LINUX)"; \ + echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \ + echo "Kernel Source: $${KERNEL_SRC}"; \ + echo "Kernel Object: $${KERNEL_OBJ}"; \ + 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; \ + 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 && \ @@ -213,28 +301,51 @@ debs: undef.h echo "lustre" > usr_share_modass/compliant.list && \ export MA_DIR=$$(pwd)/usr_share_modass && \ KVERS=$${KVERS:-$(LINUXRELEASE)} && \ - 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 && \ popd && \ 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 ../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_OBJ="$(LINUX_OBJ)"; \ + export KERNEL_SRC="$(LINUX)"; \ + echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \ + echo "Kernel Source: $${KERNEL_SRC}"; \ + echo "Kernel Object: $${KERNEL_OBJ}"; \ + 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 ../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/ + 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 CSTK=/tmp/checkstack CSTKO=/tmp/checkstack.orig @@ -251,16 +362,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