diff options
| author | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2025-02-11 15:07:35 -0300 |
|---|---|---|
| committer | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2025-02-11 15:07:35 -0300 |
| commit | 4cb8841196d0625dfa3825aa326f071cd27c7b8b (patch) | |
| tree | 1682a647d4463397c119183369ae6f750d5fdcff /buildscripts/packager.py | |
| parent | aa03c6362cbaa767638e6eed9b031d86dd2643d1 (diff) | |
| parent | 8f0827553e09872941945a093b647a4211a9db7f (diff) | |
Update upstream source from tag 'upstream/6.0.0'master
Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322
Diffstat (limited to 'buildscripts/packager.py')
| -rwxr-xr-x | buildscripts/packager.py | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/buildscripts/packager.py b/buildscripts/packager.py index 3aab408008f..d90f0c80489 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -44,7 +44,7 @@ import time ARCH_CHOICES = ["x86_64", "arm64", "aarch64", "s390x"] # Made up names for the flavors of distribution we package for. -DISTROS = ["suse", "debian", "redhat", "ubuntu", "amazon", "amazon2", "amazon2023"] +DISTROS = ["suse", "debian", "redhat", "ubuntu", "amazon", "amazon2"] class Spec(object): @@ -291,8 +291,6 @@ class Distro(object): return "2013.03" elif self.dname == 'amazon2': return "2017.12" - elif self.dname == 'amazon2023': - return "2023.0" elif self.dname == 'ubuntu': if build_os == 'ubuntu1204': return "precise" @@ -304,8 +302,6 @@ class Distro(object): return "bionic" elif build_os == 'ubuntu2004': return "focal" - elif build_os == 'ubuntu2204': - return "jammy" else: raise Exception("unsupported build_os: %s" % build_os) elif self.dname == 'debian': @@ -345,18 +341,8 @@ class Distro(object): if re.search("(suse)", self.dname): return ["suse11", "suse12", "suse15"] elif re.search("(redhat|fedora|centos)", self.dname): - return [ - "rhel90", - "rhel82", - "rhel80", - "rhel70", - "rhel71", - "rhel72", - "rhel62", - "rhel55", - "rhel67", - ] - elif self.dname in ['amazon', 'amazon2', 'amazon2023']: + return ["rhel82", "rhel80", "rhel70", "rhel71", "rhel72", "rhel62", "rhel55", "rhel67"] + elif self.dname in ['amazon', 'amazon2']: return [self.dname] elif self.dname == 'ubuntu': return [ @@ -365,7 +351,6 @@ class Distro(object): "ubuntu1604", "ubuntu1804", "ubuntu2004", - "ubuntu2204", ] elif self.dname == 'debian': return ["debian81", "debian92", "debian10", "debian11"] @@ -384,8 +369,6 @@ class Distro(object): return 'amzn1' elif self.dname == 'amazon2': return 'amzn2' - elif self.dname == 'amazon2023': - return 'amzn2023' return re.sub(r'^rh(el\d).*$', r'\1', build_os) |