From: Minh Diep Date: Fri, 24 Jun 2022 06:22:31 +0000 (-0700) Subject: LU-15968 build: update libssl3 X-Git-Tag: 2.15.1-RC1~14 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e9aa270f76f326ff3e83ecfa35c3f6e9c84c47c8 LU-15968 build: update libssl3 In Ubuntu 22.04 libssl1.1 has been superceded by libssl3 Lustre-change: https://review.whamcloud.com/47751 Lustre-commit: 0829256bd48c6b9bb1503d6c94d90ea391f696cb Test-Parameters: trivial clientdistro=ubuntu2004 Change-Id: Ic2504c3a40d5c756c2da7b81edb1501fb6b44712 Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/47752 Tested-by: jenkins Reviewed-by: Yang Sheng Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- diff --git a/autoMakefile.am b/autoMakefile.am index c6fc7d2..3448fc3 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -284,7 +284,7 @@ debs: undef.h debs_common 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"; \