X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=064c317dea081ed3f5c17548604f7fb6d783a940;hp=0311095e214e0ab1cd20422e15661892fd96df19;hb=624364420970f5df04aad5354566bce2b362e4b1;hpb=027a7237b560489099ba490db925db17a554f37d diff --git a/autoMakefile.am b/autoMakefile.am index 0311095..064c317 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -81,6 +81,8 @@ endif # LINUX endif # MODULES +all: undef.h + undef.h: config.h.in grep -v config.h.in config.h.in > $@ @@ -123,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) \ @@ -140,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 @@ -151,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) \ @@ -186,7 +235,7 @@ 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; \ + 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 \ @@ -205,11 +254,33 @@ debs: undef.h echo "SPL: $${SPL_SRC}"; \ echo "ZFS: $${ZFS_SRC}"; \ fi; \ - export KERNEL_CFG="$(LINUX_CONFIG)"; \ + 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 Config: $${KERNEL_CFG}"; \ + 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}; \ @@ -230,29 +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-*-modules-$${KVERS}_$${VER}_*.deb \ + 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