pyrox.dev
linux/hardened: adjust update script to mainline rewrite
related to: 662a2c460d7316c8bed626d420646373da467185
+8
-15
pkgs/os-specific/linux/kernel/hardened/update.py
+8
-15
pkgs/os-specific/linux/kernel/hardened/update.py
···
193
194
# Get the set of currently packaged kernel versions.
195
kernel_versions = {}
196
-
for filename in os.listdir(NIXPKGS_KERNEL_PATH):
197
-
filename_match = re.fullmatch(r"linux-(\d+)\.(\d+)\.nix", filename)
198
-
if filename_match:
199
-
nix_version_expr = f"""
200
-
with import {NIXPKGS_PATH} {{}};
201
-
(callPackage {NIXPKGS_KERNEL_PATH / filename} {{}}).version
202
-
"""
203
-
kernel_version_json = run(
204
-
"nix-instantiate", "--eval", "--system", "x86_64-linux", "--json", "--expr", nix_version_expr,
205
-
).stdout
206
-
kernel_version = parse_version(json.loads(kernel_version_json))
207
-
if kernel_version < MIN_KERNEL_VERSION:
208
-
continue
209
-
kernel_key = major_kernel_version_key(kernel_version)
210
-
kernel_versions[kernel_key] = kernel_version
211
212
# Remove patches for unpackaged kernel versions.
213
for kernel_key in sorted(patches.keys() - kernel_versions.keys()):
···
193
194
# Get the set of currently packaged kernel versions.
195
kernel_versions = {}
196
+
with open(NIXPKGS_KERNEL_PATH / "kernels-org.json") as kernel_versions_json:
197
+
kernel_versions = json.load(kernel_versions_json)
198
+
for kernel_branch_str in kernel_versions:
199
+
if kernel_branch_str == "testing": continue
200
+
kernel_branch = [int(i) for i in kernel_branch_str.split(".")]
201
+
if kernel_branch < MIN_KERNEL_VERSION: continue
202
+
kernel_version = [int(i) for i in kernel_versions[kernel_branch_str]["version"].split(".")]
203
+
kernel_versions[kernel_branch_str] = kernel_version
204
205
# Remove patches for unpackaged kernel versions.
206
for kernel_key in sorted(patches.keys() - kernel_versions.keys()):