From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 12 Jan 2023 13:48:21 +0000 (+0100)
Subject: fedora: Remove keys for EOL releases
X-Git-Tag: v15~367^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1304%2Fhead;p=thirdparty%2Fmkosi.git

fedora: Remove keys for EOL releases
---

diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 3653f9b93..53e3a21c3 100644
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -23,35 +23,6 @@ from mkosi.mounts import mount_api_vfs
 from mkosi.remove import unlink_try_hard
 
 FEDORA_KEYS_MAP = {
-    "7":  "CAB44B996F27744E86127CDFB44269D04F2A6FD2",
-    "8":  "4FFF1F04010DEDCAE203591D62AEC3DC6DF2196F",
-    "9":  "4FFF1F04010DEDCAE203591D62AEC3DC6DF2196F",
-    "10": "61A8ABE091FF9FBBF4B07709BF226FCC4EBFC273",
-    "11": "AEE40C04E34560A71F043D7C1DC5C758D22E77F2",
-    "12": "6BF178D28A789C74AC0DC63B9D1CC34857BBCCBA",
-    "13": "8E5F73FF2A1817654D358FCA7EDC6AD6E8E40FDE",
-    "14": "235C2936B4B70E61B373A020421CADDB97A1071F",
-    "15": "25DBB54BDED70987F4C10042B4EBF579069C8460",
-    "16": "05A912AC70457C3DBC82D352067F00B6A82BA4B7",
-    "17": "CAC43FB774A4A673D81C5DE750E94C991ACA3465",
-    "18": "7EFB8811DD11E380B679FCEDFF01125CDE7F38BD",
-    "19": "CA81B2C85E4F4D4A1A3F723407477E65FB4B18E6",
-    "20": "C7C9A9C89153F20183CE7CBA2EB161FA246110C1",
-    "21": "6596B8FBABDA5227A9C5B59E89AD4E8795A43F54",
-    "22": "C527EA07A9349B589C35E1BF11ADC0948E1431D5",
-    "23": "EF45510680FB02326B045AFB32474CF834EC9CBA",
-    "24": "5048BDBBA5E776E547B09CCC73BDE98381B46521",
-    "25": "C437DCCD558A66A37D6F43724089D8F2FDB19C98",
-    "26": "E641850B77DF435378D1D7E2812A6B4B64DAB85D",
-    "27": "860E19B0AFA800A1751881A6F55E7430F5282EE4",
-    "28": "128CF232A9371991C8A65695E08E7E629DB62FB1",
-    "29": "5A03B4DD8254ECA02FDA1637A20AA56B429476B4",
-    "30": "F1D8EC98F241AAF20DF69420EF3C111FCFC659B9",
-    "31": "7D22D5867F2A4236474BF7B850CB390B3C3359C4",
-    "32": "97A1AE57C3A2372CCA3A4ABA6C13026D12C944D0",
-    "33": "963A2BEB02009608FE67EA4249FD77499570FF31",
-    "34": "8C5BA6990BDB26E19F2A1A801161AE6945719A39",
-    "35": "787EA6AE1147EEE56C40B30CDB4639719867C58F",
     "36": "53DED2CB922D8B8D9E63FD18999F7CBF38AB71F4",
     "37": "ACB5EE4E831C74BB7C168D27F55AD3FB5323552A",
     "38": "6A51BBABBA3D5467B6171221809A8D7CEB10B464",
@@ -109,13 +80,7 @@ def install_fedora(state: MkosiState) -> None:
         updates_url = None
 
     if releasever in FEDORA_KEYS_MAP:
-        key = FEDORA_KEYS_MAP[releasever]
-
-        # The website uses short identifiers for Fedora < 35: https://pagure.io/fedora-web/websites/issue/196
-        if int(releasever) < 35:
-            key = FEDORA_KEYS_MAP[releasever][-8:]
-
-        gpgid = f"keys/{key}.txt"
+        gpgid = f"keys/{FEDORA_KEYS_MAP[releasever]}.txt"
     else:
         gpgid = "fedora.gpg"