From 153b4dcdfe6398b67a01b1ba1ac3caac23b44001 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Wed, 8 Jun 2022 10:43:14 -0700 Subject: [PATCH] EX-5347 build: update libssl3 In Ubuntu 22.04 libssl1.1 has been superceded by libssl3 Test-Parameters: trivial clientdistro=ubuntu2004 Change-Id: Ic2504c3a40d5c756c2da7b81edb1501fb6b44712 Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/47556 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Colin Faber Reviewed-by: Jian Yu Reviewed-by: Andreas Dilger --- autoMakefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoMakefile.am b/autoMakefile.am index e4ce7ef..1325df1 100644 --- a/autoMakefile.am +++ b/autoMakefile.am @@ -276,7 +276,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"; \ -- 1.8.3.1