X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=0c2a878699ed47de530994d8546eadf66aa2ab7e;hp=aaa832893d03b06cdc89650f78822c323ef1bcfe;hb=32e51ef6c3bef2ae6afe6a872fb50f46f06fc1e4;hpb=e41bdca755954beeb47ee6653ed9e140b7338e96 diff --git a/autoMakefile.am b/autoMakefile.am index aaa8328..0c2a878 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 @@ -235,7 +237,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 \ @@ -254,16 +256,56 @@ 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"; \ + 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"; 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 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]}; \ + 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 && \ @@ -279,32 +321,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 "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) && \ + 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 \ + ../lustre-*-utils_$${VER}_*.deb $${DEB_SERVER_PKG} \ ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes \ ../lustre_$${VER}.tar.gz ../lustre-*-modules-$${KVERS}_$${VER}_*.deb \ debs/ -if USES_DPKG +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 ../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/ + EXTRA_DIST += debian/* -endif CSTK=/tmp/checkstack CSTKO=/tmp/checkstack.orig