Fix symbolic links on Debian 10 packages (PowerShell#11474)

adityapatwardhan · TravisEz13 · commit 0b97d6d5cf73 · 2020-01-07T16:54:03.000-08:00
diff --git a/build.psm1 b/build.psm1
@@ -502,6 +502,7 @@ Fix steps:
     }
 
     if ($Environment.IsRedHatFamily -or $Environment.IsDebian) {
+        # Symbolic links added here do NOT affect packaging as we do not build on Debian.
         # add two symbolic links to system shared libraries that libmi.so is dependent on to handle
         # platform specific changes. This is the only set of platforms needed for this currently
         # as Ubuntu has these specific library files in the platform and macOS builds for itself
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
@@ -1261,11 +1261,11 @@ function New-AfterScripts
             # add two symbolic links to system shared libraries that libmi.so is dependent on to handle
             # platform specific changes. This appears to be a change in Debian 9; Debian 8 did not need these
             # symlinks.
-            'debian\.(9|10)' {
+            'debian\.9' {
                 New-Item -Force -ItemType SymbolicLink -Target "/usr/lib/x86_64-linux-gnu/libssl.so.1.0.2" -Path "$Staging/libssl.so.1.0.0" > $null
                 New-Item -Force -ItemType SymbolicLink -Target "/usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.2" -Path "$Staging/libcrypto.so.1.0.0" > $null
             }
-            'debian\.11' {
+            'debian\.(10|11)' {
                 New-Item -Force -ItemType SymbolicLink -Target "/usr/lib/x86_64-linux-gnu/libssl.so.1.1" -Path "$Staging/libssl.so.1.0.0" > $null
                 New-Item -Force -ItemType SymbolicLink -Target "/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1" -Path "$Staging/libcrypto.so.1.0.0" > $null
             }

Original file line number	Diff line number	Diff line change
`@@ -502,6 +502,7 @@ Fix steps:`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`if ($Environment.IsRedHatFamily -or $Environment.IsDebian) {`
	`505`	`+ # Symbolic links added here do NOT affect packaging as we do not build on Debian.`
`505`	`506`	`# add two symbolic links to system shared libraries that libmi.so is dependent on to handle`
`506`	`507`	`# platform specific changes. This is the only set of platforms needed for this currently`
`507`	`508`	`# as Ubuntu has these specific library files in the platform and macOS builds for itself`
Original file line number	Diff line number	Diff line change
`@@ -1261,11 +1261,11 @@ function New-AfterScripts`
`1261`	`1261`	`# add two symbolic links to system shared libraries that libmi.so is dependent on to handle`
`1262`	`1262`	`# platform specific changes. This appears to be a change in Debian 9; Debian 8 did not need these`
`1263`	`1263`	`# symlinks.`
`1264`		`- 'debian\.(9\|10)' {`
	`1264`	`+ 'debian\.9' {`
`1265`	`1265`	`New-Item -Force -ItemType SymbolicLink -Target "/usr/lib/x86_64-linux-gnu/libssl.so.1.0.2" -Path "$Staging/libssl.so.1.0.0" > $null`
`1266`	`1266`	`New-Item -Force -ItemType SymbolicLink -Target "/usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.2" -Path "$Staging/libcrypto.so.1.0.0" > $null`
`1267`	`1267`	`}`
`1268`		`- 'debian\.11' {`
	`1268`	`+ 'debian\.(10\|11)' {`
`1269`	`1269`	`New-Item -Force -ItemType SymbolicLink -Target "/usr/lib/x86_64-linux-gnu/libssl.so.1.1" -Path "$Staging/libssl.so.1.0.0" > $null`
`1270`	`1270`	`New-Item -Force -ItemType SymbolicLink -Target "/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1" -Path "$Staging/libcrypto.so.1.0.0" > $null`
`1271`	`1271`	`}`