From 8120e271b7920ce4140883e708aac8eb9aa46db9 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 29 Jan 2021 11:45:14 -0800 Subject: [PATCH 1/2] test changes based on deb spec --- tools/packaging/packaging.psm1 | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index aaaee8688d0..005842fe872 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -1270,17 +1270,11 @@ function Get-PackageDependencies "libgssapi-krb5-2", "liblttng-ust0", "libstdc++6", - "zlib1g" + "zlib1g", + "libicu72|libicu71|libicu70|libicu69|libicu68|libicu67|libicu66|libicu65|libicu63|libicu60|libicu57|libicu55|libicu52", + "libssl1.0.0|libssl1.1|libssl1.02" ) - switch -regex ($Distribution) { - "ubuntu\.16\.04" { $Dependencies += @("libssl1.0.0", "libicu55") } - "ubuntu\.18\.04" { $Dependencies += @("libssl1.0.0", "libicu60") } - "ubuntu\.20\.04" { $Dependencies += @("libssl1.1", "libicu66") } - "debian\.9" { $Dependencies += @("libssl1.0.2", "libicu57") } - "debian\.(10|11)" { $Dependencies += @("libssl1.1", "libicu63") } - default { throw "Debian distro '$Distribution' is not supported." } - } } elseif ($Environment.IsRedHatFamily) { $Dependencies = @( "openssl-libs", From a8f82e56696839ae5991cc45e5097daf8ab5a72f Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 29 Jan 2021 12:33:27 -0800 Subject: [PATCH 2/2] Update tools/packaging/packaging.psm1 --- tools/packaging/packaging.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index 005842fe872..5aa95e77555 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -1272,7 +1272,7 @@ function Get-PackageDependencies "libstdc++6", "zlib1g", "libicu72|libicu71|libicu70|libicu69|libicu68|libicu67|libicu66|libicu65|libicu63|libicu60|libicu57|libicu55|libicu52", - "libssl1.0.0|libssl1.1|libssl1.02" + "libssl1.1|libssl1.0.2|libssl1.0.0" ) } elseif ($Environment.IsRedHatFamily) {