diff --git a/apple/t2/pkgs/linux-t2/latest.json b/apple/t2/pkgs/linux-t2/latest.json index 4ed6b186..d02a40eb 100644 --- a/apple/t2/pkgs/linux-t2/latest.json +++ b/apple/t2/pkgs/linux-t2/latest.json @@ -1,5 +1,5 @@ { - "base_url": "https://raw.githubusercontent.com/t2linux/linux-t2-patches/4109f2144b626097a34b21def849a5d8cbcf3f7c/", + "base_url": "https://raw.githubusercontent.com/t2linux/linux-t2-patches/60a2912ad2d05f8a2d6c68a94641d912c3a555fd/", "patches": [ { "name": "1001-Add-apple-bce-driver.patch", @@ -43,11 +43,11 @@ }, { "name": "1015-drm-tiny-add-driver-for-Apple-Touch-Bars-in-x86-Macs.patch", - "hash": "sha256-zFeDJeoM/XS+Ds3DBLEcv4JbUhlEk9z4rHQ4t6XaghA=" + "hash": "sha256-Ga0LlaS1jWTXSKh1ClcETPJctAymC6jYBQK9wwDU4Xs=" }, { "name": "2008-i915-4-lane-quirk-for-mbp15-1.patch", - "hash": "sha256-f/PTDwRGEyVkGHFyypTKi+gIni3R4TmcsOneGc7Ay5A=" + "hash": "sha256-Ui9tK4IGSWfEscmD92emX/NfulO0m8zwLc9ivIClCFQ=" }, { "name": "2009-apple-gmux-allow-switching-to-igpu-at-probe.patch", @@ -91,19 +91,27 @@ }, { "name": "4001-asahi-trackpad.patch", - "hash": "sha256-NOuGgUxDQEfFPlij/EnhWmgqeG3/l+j+r2T1YJG7raY=" + "hash": "sha256-yfkTKKokb/+JtTwE0Dzht14S0nrSIwLFAFND90P/Cis=" }, { "name": "4002-HID-quirks-remove-T2-devices-from-hid_mouse_ignore_l.patch", - "hash": "sha256-DdUo4/4254VD+MzEaLI3opSS0Z7+UwsitJaS2lAlpI8=" + "hash": "sha256-0PMCE3IWHekir5YV1BD6Jakc7dOV6Fj2HfIGWZnXZV0=" }, { "name": "4003-HID-apple-ignore-the-trackpad-on-T2-Macs.patch", - "hash": "sha256-PZpdvPKvVsLsg3vx3jmq3QCapBUcUVE35N37usBRb6g=" + "hash": "sha256-JTeYtaBqMyTu5IdGb8x7wbP9ZE1rXT4lpEjudR1ySFI=" }, { "name": "4004-HID-magicmouse-Add-support-for-trackpads-found-on-T2.patch", - "hash": "sha256-pmGR0JdMMwGWG3zwMwMBuSyzltLvvzjTgfi1Ii1cglk=" + "hash": "sha256-HcPX7gY3hnlwM/tY06pbtXnch04AqwHgC596E8ZqGY8=" + }, + { + "name": "4005-HID-apple-Add-necessary-IDs-and-support-for-replacem.patch", + "hash": "sha256-SRKESCbpxSYm7U0VyCmvkmT/er6/GEHhwo8tgJDO6mQ=" + }, + { + "name": "4006-HID-magicmouse-Add-MacBookPro15-1-replacement-trackp.patch", + "hash": "sha256-uAlT/4ADwYyKvbuPQaGwqCjZ2/myruC63etVV6cfFLk=" }, { "name": "7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch", @@ -111,7 +119,7 @@ }, { "name": "8001-Add-APFS-driver.patch", - "hash": "sha256-T0ZmO99nmnpNVLjlzMRc7wrkBON7w2F6HaPk4pQVV7A=" + "hash": "sha256-py4DNKBsUWvw6o730ApmNdUlSyabOFnFDoAPrF40DNE=" }, { "name": "8002-Necessary-modifications-to-build-APFS-with-the-kerne.patch", diff --git a/apple/t2/pkgs/linux-t2/latest.nix b/apple/t2/pkgs/linux-t2/latest.nix index 7ab2e41b..70145fdb 100644 --- a/apple/t2/pkgs/linux-t2/latest.nix +++ b/apple/t2/pkgs/linux-t2/latest.nix @@ -1,6 +1,6 @@ -{ callPackage, linux_6_13, ... }@args: +{ callPackage, linux_6_14, ... }@args: callPackage ./generic.nix args { - kernel = linux_6_13; + kernel = linux_6_14; patchesFile = ./latest.json; } diff --git a/apple/t2/pkgs/linux-t2/stable.json b/apple/t2/pkgs/linux-t2/stable.json index 0426662f..3a788c72 100644 --- a/apple/t2/pkgs/linux-t2/stable.json +++ b/apple/t2/pkgs/linux-t2/stable.json @@ -1,5 +1,5 @@ { - "base_url": "https://raw.githubusercontent.com/t2linux/linux-t2-patches/dd2e78d234fc289d3ebadf1852d761498e668a02/", + "base_url": "https://raw.githubusercontent.com/t2linux/linux-t2-patches/0543a832ecf1400798e8aef6727110ec21c3484a/", "patches": [ { "name": "1001-Add-apple-bce-driver.patch", @@ -95,15 +95,23 @@ }, { "name": "4002-HID-quirks-remove-T2-devices-from-hid_mouse_ignore_l.patch", - "hash": "sha256-DdUo4/4254VD+MzEaLI3opSS0Z7+UwsitJaS2lAlpI8=" + "hash": "sha256-0PMCE3IWHekir5YV1BD6Jakc7dOV6Fj2HfIGWZnXZV0=" }, { "name": "4003-HID-apple-ignore-the-trackpad-on-T2-Macs.patch", - "hash": "sha256-PZpdvPKvVsLsg3vx3jmq3QCapBUcUVE35N37usBRb6g=" + "hash": "sha256-JTeYtaBqMyTu5IdGb8x7wbP9ZE1rXT4lpEjudR1ySFI=" }, { "name": "4004-HID-magicmouse-Add-support-for-trackpads-found-on-T2.patch", - "hash": "sha256-pmGR0JdMMwGWG3zwMwMBuSyzltLvvzjTgfi1Ii1cglk=" + "hash": "sha256-HcPX7gY3hnlwM/tY06pbtXnch04AqwHgC596E8ZqGY8=" + }, + { + "name": "4005-HID-apple-Add-necessary-IDs-and-support-for-replacem.patch", + "hash": "sha256-SRKESCbpxSYm7U0VyCmvkmT/er6/GEHhwo8tgJDO6mQ=" + }, + { + "name": "4006-HID-magicmouse-Add-MacBookPro15-1-replacement-trackp.patch", + "hash": "sha256-uAlT/4ADwYyKvbuPQaGwqCjZ2/myruC63etVV6cfFLk=" }, { "name": "7001-drm-i915-fbdev-Discard-BIOS-framebuffers-exceeding-h.patch", @@ -111,7 +119,7 @@ }, { "name": "8001-Add-APFS-driver.patch", - "hash": "sha256-xjB7lqE4bweUvDa6Tx6LurxWlUlX4nUN+DbTRQb5bQI=" + "hash": "sha256-1VHKrO2haBqXDCef2xt2fHfCCPv2q/AhFmmM4Xxu24E=" }, { "name": "8002-Necessary-modifications-to-build-APFS-with-the-kerne.patch", diff --git a/apple/t2/pkgs/linux-t2/update-patches.py b/apple/t2/pkgs/linux-t2/update-patches.py index 28d46b13..7b907293 100755 --- a/apple/t2/pkgs/linux-t2/update-patches.py +++ b/apple/t2/pkgs/linux-t2/update-patches.py @@ -7,6 +7,7 @@ import re import subprocess import sys from tempfile import NamedTemporaryFile +from concurrent.futures import ThreadPoolExecutor, as_completed import requests @@ -50,6 +51,11 @@ def get_sri_hash(data: bytes): ) return proc.stdout.decode("utf8").strip() +def download_task(patch: dict): + patch_content = requests.get(patch["download_url"]) + patch_hash = get_sri_hash(patch_content.content) + print(f"{patch['name']}: {patch_hash}") + return {"name": patch["name"], "hash": patch_hash} def main(): args = parser.parse_args() @@ -73,13 +79,13 @@ def main(): patches = filter(lambda e: PATCH_PATTERN.match(e.get("name")), contents) patches_with_hash = [] - for patch in patches: - patch_content = requests.get(patch["download_url"]) - patch_hash = get_sri_hash(patch_content.content) - print(f"{patch['name']}: {patch_hash}") - patches_with_hash.append({"name": patch["name"], "hash": patch_hash}) + with ThreadPoolExecutor() as executor: + futures = {executor.submit(download_task, patch) for patch in patches} - result = {"base_url": base_url, "patches": patches_with_hash} + for future in as_completed(futures): + patches_with_hash.append(future.result()) + + result = {"base_url": base_url, "patches": sorted(patches_with_hash, key=lambda p: p["name"])} with open(args.filename, "w+") as f: json.dump(result, f, indent=2)