From 24c16d4f3f365c035bd07d4d1c887e389b9e857c Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 14 Jul 2021 14:51:59 +0200 Subject: [PATCH 1/2] fix(build): use RHEL for s390x/ppc64le mongocryptd MONGOSH-897 We need to use the mongocryptd from RHEL for s390x/ppc64le because that is the only platform where these architectures are supported by the 5.x server. --- packages/build/src/packaging/download-mongocryptd.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/build/src/packaging/download-mongocryptd.ts b/packages/build/src/packaging/download-mongocryptd.ts index 8af6dd17b8..ef114df449 100644 --- a/packages/build/src/packaging/download-mongocryptd.ts +++ b/packages/build/src/packaging/download-mongocryptd.ts @@ -26,6 +26,14 @@ export async function downloadMongocrypt(variant: BuildVariant): Promise // eslint-disable-next-line complexity function lookupReleaseDistro(variant: BuildVariant): string { + switch (getArch(variant)) { + case 'ppc64le': + return 'rhel81'; + case 's390x': + return 'rhel72'; // TODO: switch to rhel80 once available + default: + break; + } switch (getDistro(variant)) { case 'win32': case 'win32msi': @@ -43,10 +51,6 @@ function lookupReleaseDistro(variant: BuildVariant): string { switch (getArch(variant)) { case 'x64': return 'rhel70'; - case 'ppc64le': - return 'rhel81'; - case 's390x': - return 'rhel72'; // TODO: switch to rhel80 once available case 'arm64': return 'rhel82'; default: From c058a7d0f9679abe90c646ed7ef0943dfbb17621 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 14 Jul 2021 16:02:17 +0200 Subject: [PATCH 2/2] fixup: debian 9 needs a lower glibc now? --- packages/build/src/packaging/download-mongocryptd.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/build/src/packaging/download-mongocryptd.ts b/packages/build/src/packaging/download-mongocryptd.ts index ef114df449..7c63368b08 100644 --- a/packages/build/src/packaging/download-mongocryptd.ts +++ b/packages/build/src/packaging/download-mongocryptd.ts @@ -42,7 +42,7 @@ function lookupReleaseDistro(variant: BuildVariant): string { return 'darwin'; case 'linux': case 'debian': - return 'ubuntu1804'; + return 'debian92'; case 'suse': return 'suse12'; case 'amzn2':