From 5333b17e06da1654583f5024c8a6ed0a3ab3c915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Thu, 29 Feb 2024 10:14:42 +0200
Subject: [PATCH] orangepi5plus kernel: fix versioning

---
 shared/platform/orangepi5plus.nix             | 34 ++++++++-----------
 ...v6.8-rc1.patch => rk3588-v6.8.0-rc1.patch} |  0
 2 files changed, 15 insertions(+), 19 deletions(-)
 rename shared/platform/orangepi5plus/{rk3588-v6.8-rc1.patch => rk3588-v6.8.0-rc1.patch} (100%)

diff --git a/shared/platform/orangepi5plus.nix b/shared/platform/orangepi5plus.nix
index c03a757..57bac84 100644
--- a/shared/platform/orangepi5plus.nix
+++ b/shared/platform/orangepi5plus.nix
@@ -8,27 +8,23 @@
   crossPkgs = pkgs.pkgsCross.aarch64-multiplatform;
 in {
   boot = {
-    kernelPackages = let
-      branch = "6.8";
-      version = "${branch}.0-rc1";
-    in
-      crossPkgs.linuxPackagesFor (crossPkgs.buildLinux {
-        inherit version;
-        modDirVersion = version;
+    kernelPackages = crossPkgs.linuxPackagesFor (crossPkgs.buildLinux {
+      version = "6.8.0-rc1";
+      modDirVersion = "6.8.0-rc1";
 
-        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;
-          }
-        ];
+      src = builtins.fetchTarball {
+        url = "https://git.kernel.org/torvalds/t/linux-6.8-rc1.tar.gz";
+        sha256 = "0rnrd1iy73vkrablx6rqlmxv9bv9zjfh6zj09aqca9rr5h8iz1p3";
+      };
+      kernelPatches = [
+        {
+          name = "orangepi-5-plus-collabora-v6.8.0-rc1";
+          patch = ./orangepi5plus/rk3588-v6.8.0-rc1.patch;
+        }
+      ];
 
-        extraMeta.branch = branch;
-      });
+      extraMeta.branch = "6.8";
+    });
 
     loader = {
       grub.enable = false;
diff --git a/shared/platform/orangepi5plus/rk3588-v6.8-rc1.patch b/shared/platform/orangepi5plus/rk3588-v6.8.0-rc1.patch
similarity index 100%
rename from shared/platform/orangepi5plus/rk3588-v6.8-rc1.patch
rename to shared/platform/orangepi5plus/rk3588-v6.8.0-rc1.patch