X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=3448fc387757268f676daacd65420fadedeb42b8;hp=d39d16aa70308a1a6eafec92a4f2c14279ea4796;hb=0829256bd48c6b9bb1503d6c94d90ea391f696cb;hpb=f785fcaa7b7fe600bd29efe0ce509beea7ac2095;ds=sidebyside diff --git a/autoMakefile.am b/autoMakefile.am index d39d16a..3448fc3 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -1,14 +1,14 @@ SUBDIRS := @LDISKFS_SUBDIR@ \ . \ @LUSTREIOKIT_SUBDIR@ \ - @LIBCFS_SUBDIR@ \ + libcfs \ @SNMP_SUBDIR@ \ lnet \ lustre DIST_SUBDIRS := ldiskfs \ lustre-iokit \ - @LIBCFS_SUBDIR@ \ + libcfs \ @SNMP_DIST_SUBDIR@ \ lnet \ lustre \ @@ -74,7 +74,7 @@ all-am: modules 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)' \ + LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC)$$(building_out_of_srctree),-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 @@ -101,7 +101,9 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec \ lustre-dkms_post-build.sh \ LUSTRE-VERSION-GEN \ LUSTRE-VERSION-FILE \ - undef.h + undef.h \ + autogen.sh \ + config/lustre-version.m4 # contrib is a directory. Putting a directory in EXTRA_DIST # recursively includes the entire directory contents in the @@ -206,6 +208,9 @@ dkms-rpms: dkms-rpm rpms: srpm rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \ + if test "x@CONFIG_CACHE_FILE@" != "x"; then \ + export CONFIG_CACHE_FILE="@CONFIG_CACHE_FILE@"; \ + fi; \ $(MAKE) $(AM_MAKEFLAGS) \ rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \ $(RPMBUILD) \ @@ -229,13 +234,24 @@ srpm: @PACKAGE_TARNAME@.spec dist Makefile cp $$rpmbuilddir/SRPMS/$(distdir)-*.src.rpm $(top_srcdir) || exit 1; \ rm -rf $$rpmbuilddir +debs_common: + export SRC_GIT_HASH=$$(git log --oneline | head -1 | cut -d' ' -f1); \ + rm -f /usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2; \ + if test -f /usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2; then \ + echo "************************************************************" ; \ + echo "WARNING: move or remove /usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2" ; \ + echo "************************************************************" ; \ + exit 1 ; \ + fi # In the debs target, first make sure what's in the changelog reflects # the software version. -debs: undef.h +debs: undef.h debs_common + cp -v debian/changelog.in debian/changelog ; \ + export SRC_GIT_HASH=$$(git log --oneline | head -1 | cut -d' ' -f1); \ 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 \ @@ -254,21 +270,59 @@ debs: undef.h echo "SPL: $${SPL_SRC}"; \ echo "ZFS: $${ZFS_SRC}"; \ fi; \ + if test "x@ENABLEO2IB@" != "xno"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} o2ib"; \ + export O2IB_SRC="@O2IBPATH@"; \ + fi; \ + if test "x@CONFIG_CACHE_FILE@" != "x"; then \ + export CONFIG_CACHE_FILE="@CONFIG_CACHE_FILE@"; \ + fi; \ if test "x@ENABLE_GSS@" = "xyes"; then \ export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} gss"; \ + debiantmp=$$(mktemp -t -d debbuild-$$USER-XXXXXXXX) ; \ + cp debian/control $$debiantmp/control.bkp ; \ + cp debian/control.main $$debiantmp/control.main.bkp ; \ + cp debian/control.modules.in $$debiantmp/control.modules.in.bkp ; \ + sed -i "s+^\(Build-Depends: .*\)$$+\1, libkrb5-dev, libssl-dev+" debian/control.main ; \ + awk 'BEGIN{change=0} $$1 == "Package:" {if (($$2 == "lustre-client-utils") || ($$2 == "lustre-server-utils")) change=1; else change=0; fi } {if (($$1 == "Depends:") && change) print $$0 ", libgssapi-krb5-2, libkrb5-3, libssl1.1|libssl3"; else print; fi}' debian/control.main > $$debiantmp/control.main && mv $$debiantmp/control.main debian/control.main ; \ + sed -i "s+^\(Build-Depends: .*\)$$+\1, libkrb5-dev, libssl-dev+" debian/control.modules.in ; \ elif test "x@ENABLE_GSS@" = "xno"; then \ export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nogss"; \ fi; \ + if test "x@ENABLE_CRYPTO@" = "xyes"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} crypto"; \ + elif test "x@ENABLE_CRYPTO@" = "xno"; then \ + export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nocrypto"; \ + 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]}; \ + cp $$debiantmp/control.bkp debian/control || true && \ + cp $$debiantmp/control.main.bkp debian/control.main || true && \ + cp $$debiantmp/control.modules.in.bkp debian/control.modules.in || true && \ [ $${rc} -gt 1 ] && exit $${rc}; \ exit 0; \ }; \ + cp $$debiantmp/control.bkp debian/control || true && \ + cp $$debiantmp/control.main.bkp debian/control.main || true && \ + cp $$debiantmp/control.modules.in.bkp debian/control.modules.in || true && \ export KPKG_DEST_DIR="$$(pwd)/.." && \ version=$$(sed -ne '1s/^lustre (\(.*\)).*$$/\1/p' debian/changelog) && \ rm -rf debian/tmp/modules-deb && \ @@ -276,7 +330,7 @@ debs: undef.h pushd debian/tmp/modules-deb && \ dpkg -x ../../../../lustre-source_$${version}_all.deb $$(pwd) && \ mkdir usr_src/ && \ - tar -C usr_src/ -xjf usr/src/lustre.tar.bz2 && \ + tar -C usr_src/ -xjf usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2 && \ chmod 755 usr_src/modules/lustre/debian/rules && \ mkdir -p usr_share_modass && \ ln -s /usr/share/modass/include/ usr_share_modass/ && \ @@ -284,18 +338,9 @@ 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 "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)} && \ + TARBALL=$$(realpath usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2) \ 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) && \ @@ -310,7 +355,9 @@ debs: undef.h ../lustre_$${VER}.tar.gz ../lustre-*-modules-$${KVERS}_$${VER}_*.deb \ debs/ -dkms-debs: undef.h +dkms-debs: undef.h debs_common + cp -v debian/changelog.in debian/changelog ; \ + export SRC_GIT_HASH=$$(git log --oneline | head -1 | cut -d' ' -f1); \ lversion=$$(echo @VERSION@ | tr '_' '-'); \ cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \ if [ "$$lversion" != "$$cversion" ]; then \