LU-15968 build: update libssl3

[fs/lustre-release.git] / autoMakefile.am

diff --git a/autoMakefile.am b/autoMakefile.am
index 0c2a878..3448fc3 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -208,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) \
@@ -231,9 +234,20 @@ 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 \
@@ -260,6 +274,9 @@ debs: undef.h
                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) ; \
@@ -267,7 +284,7 @@ debs: undef.h
                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 ; \
+               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"; \
@@ -313,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/ && \
@@ -323,6 +340,7 @@ debs: undef.h
        KVERS=$${KVERS:-$(LINUXRELEASE)} && \
        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) && \
@@ -337,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 \