kernel: fetch from upstream, apply patch

flake.nix

@@ -54,11 +54,6 @@
       };
     };
 
-    #linux-rockchip-collabora = {
-    #  url = "git+https://git.jakstys.lt/motiejus/linux?ref=rk3588";
-    #  flake = false;
-    #};
-
     e11sync = {
       url = "git+https://git.jakstys.lt/motiejus/e11sync";
       inputs = {

hosts/op5p/configuration.nix

@@ -8,7 +8,7 @@
   ...
 }: {
   imports = [
-    ../../shared/platform/orangepi5.nix
+    ../../shared/platform/orangepi5plus.nix
   ];
 
   users.users = {

shared/platform/orangepi5plus.nix

@@ -8,25 +8,27 @@
   crossPkgs = pkgs.pkgsCross.aarch64-multiplatform;
 in {
   boot = {
-    kernelPackages = crossPkgs.linuxPackagesFor (crossPkgs.buildLinux {
-      version = "6.8.0-rc1";
-      modDirVersion = "6.8.0-rc1";
+    kernelPackages = let
+      branch = "6.8";
+      version = "${branch}-rc1";
+    in
+      crossPkgs.linuxPackagesFor (crossPkgs.buildLinux {
+        inherit version;
+        modDirVersion = version;
 
-      #src = linux-rockchip-collabora;
-      #src = builtins.fetchUrl {
-      #  url = "https://git.jakstys.lt/motiejus/linux/archive/rk3588.tar.gz";
-      #  sha256 = "869adb5236254e705b51f3bcd22c0ac2498ca661c44c5a25a737bb067bc5a635";
-      #};
-      src = builtins.fetchGit {
-        url = "https://git.jakstys.lt/motiejus/linux";
-        rev = "eadcef24731e0f1ddb86dc7c9c859387b5b029a2";
-        ref = "rk3588";
-        shallow = true;
-      };
-      kernelPatches = [];
+        src = builtins.fetchTarball {
+          url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
+          sha256 = "0rnrd1iy73vkrablx6rqlmxv9bv9zjfh6zj09aqca9rr5h8iz1p3";
+        };
+        kernelPatches = [
+          {
+            name = "orangepi-5-plus-collabora-v${version}";
+            patch = ./orangepi5plus/rk3588-v${version}.patch;
+          }
+        ];
 
-      extraMeta.branch = "6.8";
-    });
+        extraMeta.branch = branch;
+      });
 
     loader = {
       grub.enable = false;