From 48beb814f5fe6e9bf5f41681f4e4023bab4d2110 Mon Sep 17 00:00:00 2001
From: Iain Scott <iscott@cantab.net>
Date: Fri, 28 May 2021 21:53:52 +0100
Subject: [PATCH] Use more generic linux-x64 for NuGet rid instead of specific
 ubuntu, debian, etc. (#5310)

---
 scripts/mk_nuget_release.py | 10 ++++------
 scripts/mk_nuget_task.py    | 12 ++++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/scripts/mk_nuget_release.py b/scripts/mk_nuget_release.py
index d872645a6..3f20e5368 100644
--- a/scripts/mk_nuget_release.py
+++ b/scripts/mk_nuget_release.py
@@ -43,13 +43,13 @@ def download_installs():
         sys.stdout.flush()
         urllib.request.urlretrieve(url, "packages/%s" % name)
 
-os_info = {"z64-ubuntu-14" : ('so', 'ubuntu.14.04-x64'),
-           'ubuntu-16' : ('so', 'ubuntu-x64'),
+os_info = {"z64-ubuntu-14" : ('so', 'linux-x64'),
+           'ubuntu-16' : ('so', 'linux-x64'),
            'x64-win' : ('dll', 'win-x64'),
 # Skip x86 as I can't get dotnet build to produce AnyCPU TargetPlatform           
 #          'x86-win' : ('dll', 'win-x86'),
            'osx' : ('dylib', 'osx-x64'),
-           'debian' : ('so', 'debian.8-x64') }
+           'debian' : ('so', 'linux-x64') }
 
 def classify_package(f):
     for os_name in os_info:
@@ -66,9 +66,7 @@ def unpack():
     # +- runtimes
     #    +- win-x64
     #    +- win-x86
-    #    +- ubuntu.16.04-x64
-    #    +- ubuntu.14.04-x64
-    #    +- debian.8-x64
+    #    +- linux-x64
     #    +- osx-x64
     # +
     for f in os.listdir("packages"):
diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py
index dcb1a358b..69b67abc9 100644
--- a/scripts/mk_nuget_task.py
+++ b/scripts/mk_nuget_task.py
@@ -22,14 +22,14 @@ def mk_dir(d):
         os.makedirs(d)
 
 
-os_info = {"z64-ubuntu-14" : ('so', 'ubuntu.14.04-x64'),
-           'ubuntu-18' : ('so', 'ubuntu-x64'),
-           'ubuntu-20' : ('so', 'ubuntu-x64'),
-           'glibc-2.31' : ('so', 'ubuntu-x64'),
+os_info = {"z64-ubuntu-14" : ('so', 'linux-x64'),
+           'ubuntu-18' : ('so', 'linux-x64'),
+           'ubuntu-20' : ('so', 'linux-x64'),
+           'glibc-2.31' : ('so', 'linux-x64'),
            'x64-win' : ('dll', 'win-x64'),
            'x86-win' : ('dll', 'win-x86'),
            'osx' : ('dylib', 'osx-x64'),
-           'debian' : ('so', 'debian.8-x64') }
+           'debian' : ('so', 'linux-x64') }
 
 def classify_package(f):
     for os_name in os_info:
@@ -51,7 +51,7 @@ def unpack(packages, symbols):
     # +- runtimes
     #    +- win-x64
     #    +- win-x86
-    #    +- ubuntu-x64
+    #    +- linux-x64
     #    +- osx-x64
     # +
     tmp = "tmp" if not symbols else "tmpsym"